Showing 1,000 changed files with 9,874 additions and 3,447 deletions.
18 changes: 9 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.xwiki.commons</groupId>
<artifactId>xwiki-commons-pom</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-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
Expand All @@ -41,32 +41,32 @@
<artifactId>xwiki-platform</artifactId>
<name>XWiki Platform - Parent POM</name>
<packaging>pom</packaging>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
<description>XWiki Platform - Parent POM</description>
<properties>
<!-- Versions of XWiki dependencies used in Platform modules -->
<rendering.version>${commons.version}</rendering.version>
<!-- Useful for external Maven projects that extend the Platform POM. Must not be used by Platform project! -->
<platform.version>${commons.version}</platform.version>
<!-- Versions of XWiki dependencies used in Platform modules -->
<rendering.version>${platform.version}</rendering.version>

<!-- Dependencies versions -->
<bootstrap.version>3.4.1</bootstrap.version>
<batik.version>1.17</batik.version>
<restlet.version>2.3.12</restlet.version>
<tika.version>2.9.1</tika.version>
<pdfbox.version>2.0.30</pdfbox.version>
<pdfbox.version>2.0.31</pdfbox.version>
<keypress.version>2.1.5</keypress.version>
<jetty.server.version>10.0.20</jetty.server.version>
<jetty.client.version>${jetty.server.version}</jetty.client.version>
<jetty.version>${jetty.client.version}</jetty.version>
<netty.version>4.1.107.Final</netty.version>
<netty.version>4.1.108.Final</netty.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<dockerJava.version>3.3.6</dockerJava.version>
<cvssCalculator.version>1.4.2</cvssCalculator.version>
<solr.major.version>9</solr.major.version>
<solr.version>9.4.1</solr.version>
<lucene.version>9.8.0</lucene.version>
<jersey.version>2.41</jersey.version>
<jersey.version>2.42</jersey.version>
<hk2.version>2.6.1</hk2.version>
<zookeeper.version>3.9.2</zookeeper.version>

Expand Down Expand Up @@ -117,7 +117,7 @@
<derby.version>10.14.2.0</derby.version>
<pgsql.groupId>org.postgresql</pgsql.groupId>
<pgsql.artifactId>postgresql</pgsql.artifactId>
<pgsql.version>42.7.2</pgsql.version>
<pgsql.version>42.7.3</pgsql.version>
<oracle.groupId>com.oracle.database.jdbc</oracle.groupId>
<oracle.artifactId>ojdbc11</oracle.artifactId>
<oracle.version>21.11.0.0</oracle.version>
Expand Down Expand Up @@ -179,7 +179,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>4.26.0</version>
<version>4.27.0</version>
<exclusions>
<!-- Not the right id -->
<exclusion>
Expand Down
124 changes: 6 additions & 118 deletions xwiki-platform-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-core</artifactId>
<name>XWiki Platform - Core - Parent POM</name>
Expand Down Expand Up @@ -138,123 +138,11 @@
Single justification example:
-->
<revapi.differences>
<justification>Was never meant to be an API.</justification>
<criticality>highlight</criticality>
<differences>
<item>
<ignore>true</ignore>
<code>java.field.removed</code>
<old>field org.xwiki.search.solr.AbstractSolrCoreInitializer.fields</old>
</item>
<item>
<ignore>true</ignore>
<code>java.field.removed</code>
<old>field org.xwiki.search.solr.AbstractSolrCoreInitializer.types</old>
</item>
<item>
<ignore>true</ignore>
<code>java.field.visibilityReduced</code>
<old>field org.xwiki.search.solr.AbstractSolrCoreInitializer.solrSchemaUtils</old>
<new>field org.xwiki.search.solr.AbstractSolrCoreInitializer.solrSchemaUtils</new>
<oldVisibility>protected</oldVisibility>
<newVisibility>private</newVisibility>
</item>
</differences>
</revapi.differences>
<revapi.differences>
<justification>Should have never been public in the first place and is deprecated since 9.8RC1.</justification>
<criticality>highlight</criticality>
<differences>
<item>
<ignore>true</ignore>
<code>java.class.removed</code>
<old>class org.xwiki.rest.Constants</old>
</item>
</differences>
</revapi.differences>
<revapi.differences>
<justification>Not runtime breakages from REST API point of view and not supposed to be called in Java</justification>
<criticality>highlight</criticality>
<differences>
<item>
<ignore>true</ignore>
<code>java.method.numberOfParametersChanged</code>
<old>method javax.ws.rs.core.Response org.xwiki.notifications.rest.NotificationsResource::postNotifications() throws java.lang.Exception</old>
<new>method javax.ws.rs.core.Response org.xwiki.notifications.rest.NotificationsResource::postNotifications(java.lang.String, java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws java.lang.Exception</new>
</item>
<item>
<ignore>true</ignore>
<code>java.method.returnTypeChanged</code>
<old>method java.util.Map&lt;java.lang.String, java.lang.String&gt; org.xwiki.image.style.rest.ImageStylesResource::getDefaultStyleIdentifier(java.lang.String, java.lang.String) throws org.xwiki.image.style.ImageStyleException</old>
<new>method javax.ws.rs.core.Response org.xwiki.image.style.rest.ImageStylesResource::getDefaultStyleIdentifier(java.lang.String, java.lang.String) throws org.xwiki.image.style.ImageStyleException</new>
</item>
<item>
<ignore>true</ignore>
<code>java.annotation.added</code>
<old>parameter javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, ===javax.mail.Multipart===, java.lang.Boolean, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</old>
<new>parameter javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, ===java.lang.Boolean===, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</new>
<annotation>@javax.ws.rs.DefaultValue("false")</annotation>
</item>
<item>
<ignore>true</ignore>
<code>java.annotation.added</code>
<old>parameter javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, ===javax.mail.Multipart===, java.lang.Boolean, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</old>
<new>parameter javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, ===java.lang.Boolean===, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</new>
<annotation>@javax.ws.rs.QueryParam("prettyNames")</annotation>
</item>
<item>
<ignore>true</ignore>
<code>java.annotation.attributeValueChanged</code>
<old>parameter javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, javax.mail.Multipart, ===java.lang.Boolean===, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</old>
<new>parameter javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, ===java.lang.Boolean===) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</new>
<annotationType>javax.ws.rs.QueryParam</annotationType>
<attribute>value</attribute>
<oldValue>"prettyNames"</oldValue>
<newValue>"createPage"</newValue>
</item>
<item>
<ignore>true</ignore>
<code>java.method.numberOfParametersChanged</code>
<old>method javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, javax.mail.Multipart, java.lang.Boolean, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</old>
<new>method javax.ws.rs.core.Response org.xwiki.rest.resources.attachments.AttachmentsResource::addAttachment(java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.lang.Boolean) throws org.xwiki.rest.XWikiRestException, org.xwiki.attachment.validation.AttachmentValidationException</new>
</item>
</differences>
</revapi.differences>
<revapi.differences>
<justification>Very specific to Restlet and not supposed to be called in Java</justification>
<criticality>highlight</criticality>
<differences>
<item>
<ignore>true</ignore>
<code>java.method.removed</code>
<old>method java.lang.String org.xwiki.rest.XWikiResource::getUriTemplate()</old>
</item>
</differences>
</revapi.differences>
<revapi.differences>
<justification>Was never meant to be public</justification>
<criticality>highlight</criticality>
<differences>
<item>
<ignore>true</ignore>
<code>java.class.removed</code>
<old>class org.xwiki.captcha.script.CaptchaScriptSafeProvider</old>
</item>
<item>
<ignore>true</ignore>
<code>java.class.removed</code>
<old>class org.xwiki.captcha.script.WrappedScriptCaptcha</old>
</item>
<item>
<regex>true</regex>
<ignore>true</ignore>
<code>java.field.typeChanged</code>
<old>field org.xwiki.extension.script.AbstractExtensionScriptService.scriptProvider.*</old>
<new>field org.xwiki.extension.script.AbstractExtensionScriptService.scriptProvider.*</new>
</item>
</differences>
</revapi.differences>





</analysisConfiguration>
</configuration>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-core</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-activeinstalls2</artifactId>
<name>XWiki Platform - Active Installs 2 - Parent POM</name>
<packaging>pom</packaging>
<description>Parent POM for the Active Installs 2 modules</description>
<properties>
<!-- Tag for the ElasticSearch docker image to use from https://hub.docker.com/_/elasticsearch -->
<elasticsearch.version>8.12.2</elasticsearch.version>
<elasticsearch.version>8.13.0</elasticsearch.version>
</properties>
<build>
<pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion ...i-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-activeinstalls2</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-activeinstalls2-api</artifactId>
<name>XWiki Platform - Active Installs 2 - API</name>
Expand Down
2 changes: 1 addition & 1 deletion ...-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-activeinstalls2</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-activeinstalls2-test</artifactId>
<name>XWiki Platform - Active Installs 2 - Tests - Parent POM</name>
Expand Down
2 changes: 1 addition & 1 deletion ...s2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-activeinstalls2-test</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-activeinstalls2-test-docker</artifactId>
<name>XWiki Platform - Active Installs 2 - Tests - Functional Docker Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion xwiki-platform-core/xwiki-platform-administration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-core</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-administration</artifactId>
<name>XWiki Platform - Administration - Parent POM</name>
Expand Down
2 changes: 1 addition & 1 deletion xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-administration</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-administration-test</artifactId>
<name>XWiki Platform - Administration - Tests - Parent POM</name>
Expand Down
12 changes: 1 addition & 11 deletions ...tion/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-administration-test</artifactId>
<version>16.2.0-SNAPSHOT</version>
<version>16.3.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-administration-test-docker</artifactId>
<name>XWiki Platform - Administration - Tests - Functional Docker Tests</name>
Expand Down Expand Up @@ -86,16 +86,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-flamingo-skin-test-pageobjects</artifactId>
Expand Down
12 changes: 0 additions & 12 deletions ...atform-administration-test-docker/src/test/it/org/xwiki/administration/test/ui/AllIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ class NestedAdministrationIT extends AdministrationIT
{
}

@Nested
@DisplayName("Reset Password")
class NestedResetPasswordIT extends ResetPasswordIT
{
}

@Nested
@DisplayName("ConfigurableClass")
class NestedConfigurableClassIT extends ConfigurableClassIT
Expand All @@ -56,12 +50,6 @@ class NestedUsersGroupsRightsManagementIT extends UsersGroupsRightsManagementIT
{
}

@Nested
@DisplayName("Forgot Username")
class NestedForgotUsernameIT extends ForgotUsernameIT
{
}

@Nested
@DisplayName("XAR Import")
class NestedXARImportIT extends XARImportIT
Expand Down
Loading