Skip to content

Commit

Permalink
XWIKI-20477: Upgrade to Solr 9.4.1 and Lucene 9.8.0
Browse files Browse the repository at this point in the history 
XWIKI-12955: Upgrade to JAX-RS 2.1.6 (JSR370)
XWIKI-21709: Upgrade to Jetty Client 10.0.19
  • Loading branch information
@tmortagne
tmortagne committed Feb 14, 2024
1 parent 6362587 commit 0f57ae8
Show file tree
Hide file tree
Showing 207 changed files with 3,363 additions and 2,962 deletions.
256 changes: 128 additions & 128 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,17 @@
<tika.version>2.9.1</tika.version>
<pdfbox.version>2.0.30</pdfbox.version>
<keypress.version>2.1.5</keypress.version>
<!-- We are stuck at version 9.x until we upgrade to a version of SolrJ which use a more recent version
(or something else) -->
<jetty.client.version>9.4.53.v20231009</jetty.client.version>
<jetty.server.version>10.0.19</jetty.server.version>
<jetty.client.version>${jetty.server.version}</jetty.client.version>
<jetty.version>${jetty.client.version}</jetty.version>
<netty.version>4.1.105.Final</netty.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<dockerJava.version>3.3.4</dockerJava.version>
<cvssCalculator.version>1.4.2</cvssCalculator.version>
<solr.version>8.11.2</solr.version>
<solr.version>9.4.1</solr.version>
<lucene.version>9.8.0</lucene.version>
<jersey.version>2.41</jersey.version>
<hk2.version>2.6.1</hk2.version>
<zookeeper.version>3.9.1</zookeeper.version>

<!-- Versions of other software we need in our functional tests -->
Expand Down Expand Up @@ -746,99 +747,6 @@
<version>4.2.1</version>
</dependency>

<!-- Restlet -->
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jaxrs</artifactId>
<version>${restlet.version}</version>
<exclusions>
<!-- Already part of Java SE 6 -->
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- We use a more accurate and up-to-date JSON framework version -->
<exclusion>
<artifactId>org.restlet.lib.org.json</artifactId>
<groupId>org.restlet.jse</groupId>
</exclusion>
<!-- The recent one have a different id, so we can't rely on dependencyManagement -->
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<!-- Restlet does not declare the right version of JAX-RS API... -->
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
<!-- Restlet does not use the right artifact for JAXB implementation -->
<exclusion>
<artifactId>jaxb-impl</artifactId>
<groupId>com.sun.xml.bind</groupId>
</exclusion>
<!-- Restlet does not use the right artifact for JSON -->
<exclusion>
<artifactId>json</artifactId>
<groupId>org.json</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- We need Jackson for a proper JSON representation of our REST resources.
See XWIKI-9136: Rest API JSON does not retrieve inherited fields -->
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jackson</artifactId>
<version>${restlet.version}</version>
<scope>runtime</scope>
<exclusions>
<!-- Wrong version of Woodstox -->
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- We need a JAXB converter for XML representation because we model our REST resources using JAXB. Jackson (see
above) has a module that understands JAXB annotations but the output of the Restlet Jackson converter is not
very good (missing XML declaration and namespace, attributes serialized as elements) so we prefer to use a
dedicated JAXB converter for XML representation. -->
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jaxb</artifactId>
<version>${restlet.version}</version>
<scope>runtime</scope>
<exclusions>
<!-- Already part of Java SE 6 -->
<exclusion>
<artifactId>stax-api</artifactId>
<groupId>javax.xml.stream</groupId>
</exclusion>
<!-- Restlet does not use the right artifact for JAXB implementation -->
<exclusion>
<artifactId>jaxb-impl</artifactId>
<groupId>com.sun.xml.bind</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.restlet.jse</groupId>
<artifactId>org.restlet</artifactId>
<version>${restlet.version}</version>
</dependency>
<dependency>
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.servlet</artifactId>
<version>${restlet.version}</version>
<exclusions>
<exclusion>
<!-- We use "se" version of the client API -->
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Used by solr-core and closure-compiler -->
<dependency>
<groupId>com.google.re2j</groupId>
Expand Down Expand Up @@ -1009,35 +917,16 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
<exclusions>
<!-- We want a different version of Woodstox and the id changed -->
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<!--
The version of the Jetty client libraries used by solrj often conflict with the version of Jetty used by
XWiki. The reason is generally that upgrading Jetty is always a pain and tend to lack behind.
-->
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>${solr.version}</version>
<exclusions>
<!-- We want a different version of Woodstox and the id changed -->
<!-- Wrong ids -->
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<!-- Exclude the dependencies which are only need by Solr when running as a standalone application -->
<exclusion>
Expand All @@ -1056,10 +945,6 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
</exclusion>
<exclusion>
<groupId>org.restlet.jee</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
Expand All @@ -1069,20 +954,21 @@
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
</exclusion>
<!-- We use slf4j in XWiki -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-backward-codecs</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
Expand Down Expand Up @@ -1120,6 +1006,112 @@
<artifactId>zookeeper-jute</artifactId>
<version>${zookeeper.version}</version>
</dependency>
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>${jersey.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>${jersey.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<version>${hk2.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>${hk2.version}</version>
<exclusions>
<!-- Wrong ids -->
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>1.0</version>
</dependency>

<!-- Database connectors -->
<!-- Exclude optional dependencies -->
Expand Down Expand Up @@ -1509,6 +1501,14 @@
<id>org.apache.groovy:groovy-dateutil</id>
<features>org.codehaus.groovy:groovy-dateutil</features>
</extensionOverride>
<extensionOverride>
<id>javax.inject:javax.inject</id>
<features>org.glassfish.hk2.external:jakarta.inject</features>
</extensionOverride>
<extensionOverride>
<id>aopalliance:aopalliance</id>
<features>org.glassfish.hk2.external:aopalliance-repackaged</features>
</extensionOverride>
</extensionOverrides>
</configuration>
</plugin>
Expand Down
Loading

0 comments on commit 0f57ae8

Please sign in to comment.