Merge branch 'master' of github.com:xwiki/xwiki-platform into feature-pdf-export

cc3f6855 · Marius Dumitru Florea · 8653977e · 63383990 · cc3f6855 · cc3f6855
Commit cc3f6855 authored 2 years ago by Marius Dumitru Florea
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/gradle-enterprise.xml
@@ -57,6 +57,9 @@
        <!-- Note: Remote cache authentication is handled in the Maven settings.xml file. The id below is the one
       found in settings.xml -->
        <id>gradleEnterpriseCache</id>
+        <!-- We override the default built-in node to use a EU node closer to our CI to reduce the cache lag (and thus
+             to make caching more beneficial vs rebuilding) -->
+        <url>https://eu-build-cache-ge.xwiki.org/cache/</url>
      </server>
    </remote>
  </buildCache>

--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.xwiki.commons</groupId>
    <artifactId>xwiki-commons-pom</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
    <!-- Note: Do NOT set the <relativePath> tag here as this can cause issues. For example imagine you're using
         Jenkins and you have the following directory structure:
             workspace/xwiki-commons
@@ -41,7 +41,7 @@
  <artifactId>xwiki-platform</artifactId>
  <name>XWiki Platform - Parent POM</name>
  <packaging>pom</packaging>
-  <version>14.8-SNAPSHOT</version>
+  <version>14.9-SNAPSHOT</version>
  <description>XWiki Platform - Parent POM</description>
  <properties>
    <!-- Useful for external Maven projects that extend the Platform POM. Must not be used by Platform project! -->
@@ -57,7 +57,7 @@
    <pdfbox.version>2.0.26</pdfbox.version>
    <keypress.version>2.1.5</keypress.version>
    <jetty.version>9.4.48.v20220622</jetty.version>
-    <netty.version>4.1.81.Final</netty.version>
+    <netty.version>4.1.82.Final</netty.version>
    <hibernate.version>5.6.11.Final</hibernate.version>

    <!-- Versions of other software we need in our functional tests -->
@@ -178,7 +178,7 @@
      <dependency>
        <groupId>org.python</groupId>
        <artifactId>jython-slim</artifactId>
-        <version>2.7.2</version>
+        <version>2.7.3</version>
        <exclusions>
          <!-- Not need in the context of XWiki and cause conflict with other dependencies -->
          <exclusion>

--- a/xwiki-platform-core/pom.xml
+++ b/xwiki-platform-core/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-core</artifactId>
  <name>XWiki Platform - Core - Parent POM</name>

--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-core</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-activeinstalls2</artifactId>
  <name>XWiki Platform - Active Installs 2 - Parent POM</name>

--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-activeinstalls2</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-activeinstalls2-api</artifactId>
  <name>XWiki Platform - Active Installs 2 - API</name>

--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-activeinstalls2</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-activeinstalls2-test</artifactId>
  <name>XWiki Platform - Active Installs 2 - Tests - Parent POM</name>

--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-activeinstalls2-test</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-activeinstalls2-test-docker</artifactId>
  <name>XWiki Platform - Active Installs 2 - Tests - Functional Docker Tests</name>

--- a/xwiki-platform-core/xwiki-platform-administration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-core</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-administration</artifactId>
  <name>XWiki Platform - Administration - Parent POM</name>

--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-administration</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-administration-test</artifactId>
  <name>XWiki Platform - Administration - Tests - Parent POM</name>

--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-administration-test</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-administration-test-docker</artifactId>
  <name>XWiki Platform - Administration - Tests - Functional Docker Tests</name>

--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-administration-test</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-administration-test-pageobjects</artifactId>
  <name>XWiki Platform - Administration - Tests - Page Objects</name>

--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-administration</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-administration-ui</artifactId>
  <name>XWiki Platform - Administration - UI</name>

--- a/xwiki-platform-core/xwiki-platform-alerts/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-alerts/pom.xml
@@ -25,10 +25,10 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-core</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-alerts</artifactId>
-  <version>14.8-SNAPSHOT</version>
+  <version>14.9-SNAPSHOT</version>
  <name>XWiki Platform - Alerts - Parent POM</name>
  <packaging>pom</packaging>
  <description>Application that adds an "alert" menu in the skin.</description>

--- a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
@@ -25,10 +25,10 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-alerts</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-alerts-ui</artifactId>
-  <version>14.8-SNAPSHOT</version>
+  <version>14.9-SNAPSHOT</version>
  <name>XWiki Platform - Alerts - UI</name>
  <packaging>xar</packaging>
  <properties>

--- a/xwiki-platform-core/xwiki-platform-annotation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-core</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-annotation</artifactId>
  <name>XWiki Platform - Annotations - Parent POM</name>

--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-annotation</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-annotation-core</artifactId>
  <name>XWiki Platform - Annotations - Core Services</name>

--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-annotation</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-annotation-io</artifactId>
  <name>XWiki Platform - Annotations - XWiki Storage Implementation</name>

--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-annotation</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-annotation-maintainer</artifactId>
  <name>XWiki Platform - Annotations - Maintainer</name>

--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-annotation</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-annotation-reference</artifactId>
  <name>XWiki Platform - Annotations - References Manipulation</name>

--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
@@ -25,7 +25,7 @@
  <parent>
    <groupId>org.xwiki.platform</groupId>
    <artifactId>xwiki-platform-annotation</artifactId>
-    <version>14.8-SNAPSHOT</version>
+    <version>14.9-SNAPSHOT</version>
  </parent>
  <artifactId>xwiki-platform-annotation-rest</artifactId>
  <name>XWiki Platform - Annotations - REST Services</name>