Skip to content

Commit

Permalink
Jetty 12.0.x dependencies upgrade (#12376)
Browse files Browse the repository at this point in the history 
* some dependencies upgrade
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
  • Loading branch information
@olamy
olamy authored Oct 17, 2024
1 parent 4ff0e17 commit 14b277b
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 30 deletions.
2 changes: 1 addition & 1 deletion jetty-core/jetty-http-spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<bundle-symbolic-name>${project.groupId}.http.spi</bundle-symbolic-name>
<jacoco.skip>true</jacoco.skip>
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
<jakarta.xml.jaxws.impl.version>4.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.3</jakarta.xml.jaxws.impl.version>
<spotbugs.onlyAnalyze>org.eclipse.jetty.http.spi.*</spotbugs.onlyAnalyze>
</properties>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<description>The common Jetty security implementation</description>

<properties>
<apache.directory.api.version>2.1.6</apache.directory.api.version>
<apache.directory.api.version>2.1.7</apache.directory.api.version>
<apacheds.version>2.0.0.AM27</apacheds.version>
<bundle-symbolic-name>${project.groupId}.security</bundle-symbolic-name>
<spotbugs.onlyAnalyze>org.eclipse.jetty.security.*</spotbugs.onlyAnalyze>
Expand Down
2 changes: 0 additions & 2 deletions ...e10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-pojo-base</artifactId>
<version>7.1.1.Final</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions jetty-ee10/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
<jakarta.xml.bind.api.version>4.0.2</jakarta.xml.bind.api.version>
<jakarta.xml.bind.impl.version>4.0.5</jakarta.xml.bind.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.2</jakarta.xml.jaxws.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.3</jakarta.xml.jaxws.impl.version>
<jakarta.xml.ws.api.version>4.0.2</jakarta.xml.ws.api.version>
<jersey.version>3.1.7</jersey.version>
<jersey.version>3.1.9</jersey.version>

<jsp.impl.version>10.1.31</jsp.impl.version>
<mail.impl.version>2.0.1</mail.impl.version>

<sonar.skip>true</sonar.skip>
<weld.version>5.1.2.Final</weld.version>
<weld.version>5.1.3.Final</weld.version>
</properties>

<dependencyManagement>
Expand Down
1 change: 0 additions & 1 deletion jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
49 changes: 27 additions & 22 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,18 @@

<properties>
<alpn.agent.version>2.0.10</alpn.agent.version>
<ant.version>1.10.14</ant.version>
<ant.version>1.10.15</ant.version>
<apache.avro.version>1.11.3</apache.avro.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<apache.httpcore.version>4.4.16</apache.httpcore.version>
<asm.version>9.7</asm.version>
<awaitility.version>4.2.1</awaitility.version>
<asm.version>9.7.1</asm.version>
<awaitility.version>4.2.2</awaitility.version>
<bndlib.version>7.0.0</bndlib.version>
<build-helper.maven.plugin.version>3.6.0</build-helper.maven.plugin.version>
<build-support.version>1.5</build-support.version>
<buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version>
<checkstyle.version>10.17.0</checkstyle.version>
<commons-codec.version>1.17.0</commons-codec.version>
<commons-codec.version>1.17.1</commons-codec.version>
<commons-io.version>2.16.1</commons-io.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.26.2</commons.compress.version>
Expand All @@ -192,31 +193,31 @@
<gson.version>2.11.0</gson.version>
<guava.version>33.2.1-jre</guava.version>
<guice.version>7.0.0</guice.version>
<hamcrest.version>2.2</hamcrest.version>
<hamcrest.version>3.0</hamcrest.version>
<hazelcast.version>5.5.0</hazelcast.version>
<hibernate.search.version>7.1.1.Final</hibernate.search.version>
<hibernate.search.version>7.1.2.Final</hibernate.search.version>
<infinispan.docker.image.name>infinispan/server</infinispan.docker.image.name>
<infinispan.docker.image.version>15.0.5.Final</infinispan.docker.image.version>
<infinispan.protostream.version>5.0.5.Final</infinispan.protostream.version>
<infinispan.version>15.0.5.Final</infinispan.version>
<infinispan.protostream.version>5.0.12.Final</infinispan.protostream.version>
<infinispan.version>15.0.10.Final</infinispan.version>
<injection.bundle.version>1.2</injection.bundle.version>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
<jackson.version>2.17.1</jackson.version>
<jackson.version>2.18.0</jackson.version>
<jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
<javadoc.verbose>false</javadoc.verbose>
<jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>
<jboss-threads.version>3.6.1.Final</jboss-threads.version>
<jboss.logging.annotations.version>2.2.1.Final</jboss.logging.annotations.version>
<jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
<jboss.logging.version>3.6.0.Final</jboss.logging.version>
<jboss.logging.version>3.6.1.Final</jboss.logging.version>
<jetty-assembly-descriptors.version>1.1</jetty-assembly-descriptors.version>
<jetty-quiche-native.version>0.22.0</jetty-quiche-native.version>
<jetty-test-policy.version>1.2</jetty-test-policy.version>
<jetty-version.maven.plugin.version>2.7</jetty-version.maven.plugin.version>
<jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>
<jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -Djava.io.tmpdir=${project.build.directory} -showversion -Xmx6g -Xms4g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
<jetty.test.version>6.2</jetty.test.version>
<jetty.test.version>6.3</jetty.test.version>
<jetty.testtracker.log>true</jetty.testtracker.log>
<jetty.unixdomain.dir>/tmp</jetty.unixdomain.dir>
<jetty.url>https://jetty.org/</jetty.url>
Expand All @@ -226,7 +227,7 @@
<jffi.version>1.3.13</jffi.version>
<jmh.version>1.37</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name>
<jna.version>5.14.0</jna.version>
<jna.version>5.15.0</jna.version>
<json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.5.1</json-smart.version>
<junit.jupiter.execution.parallel.config.fixed.parallelism>2</junit.jupiter.execution.parallel.config.fixed.parallelism>
Expand All @@ -235,15 +236,15 @@
<junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
<junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled>
<junit.version>5.10.3</junit.version>
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
<junit.version>5.11.2</junit.version>
<kerb-simplekdc.version>2.1.0</kerb-simplekdc.version>
<license.maven.plugin.version>4.5</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.23.1</log4j2.version>
<log4j2.version>2.24.1</log4j2.version>
<logback.version>1.5.6</logback.version>
<lucene.version>9.9.2</lucene.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.4.0</mariadb.version>
<mariadb.version>3.4.1</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
<maven-build-cache.version>1.2.0</maven-build-cache.version>
<maven-plugin.plugin.version>3.13.1</maven-plugin.plugin.version>
Expand Down Expand Up @@ -296,31 +297,31 @@
<osgi-util-tracker-version>1.5.4</osgi-util-tracker-version>
<osgi-util-version>3.7.300</osgi-util-version>
<osgi-util-xml-version>1.0.2</osgi-util-xml-version>
<osgi-version>3.20.0</osgi-version>
<osgi-version>3.21.0</osgi-version>
<osgi.slf4j.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.slf4j.import.packages>
<pax.exam.version>4.13.5</pax.exam.version>
<pax.url.version>2.6.14</pax.url.version>
<plexus-classworlds.version>2.8.0</plexus-classworlds.version>
<plexus-component-annotations.version>2.2.0</plexus-component-annotations.version>
<plexus-utils.version>4.0.1</plexus-utils.version>
<plexus-utils.version>4.0.2</plexus-utils.version>
<plexus-xml.version>4.0.4</plexus-xml.version>
<project.build.outputTimestamp>2023-06-05T23:12:49Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<reactive-streams.version>1.0.4</reactive-streams.version>
<settingsPath>src/it/settings.xml</settingsPath>
<sisu.plexus.version>0.9.0.M3</sisu.plexus.version>
<slf4j.version>2.0.13</slf4j.version>
<slf4j.version>2.0.16</slf4j.version>
<spifly.version>1.3.7</spifly.version>
<spotbugs.maven.plugin.version>4.8.6.0</spotbugs.maven.plugin.version>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<swissbox.version>1.8.3</swissbox.version>
<testcontainers.version>1.19.8</testcontainers.version>
<testcontainers.version>1.20.2</testcontainers.version>
<testng.version>7.10.2</testng.version>
<tinybundles.version>3.0.0</tinybundles.version>
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.4.2.Final</wildfly.elytron.version>
<wildfly.elytron.version>2.6.0.Final</wildfly.elytron.version>
<xmemcached.version>2.4.8</xmemcached.version>
</properties>

Expand Down Expand Up @@ -2415,8 +2416,12 @@
</goals>
<phase>verify</phase>
<configuration>
<!-- safe to ignore org.apache -->
<!-- Works with approval for Hazelcast https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15797 -->
<excludeGroupIds>com.hazelcast</excludeGroupIds>
<!-- infinispan protostream https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/16633 -->
<!-- https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/16634 -> https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/16665 -->
<excludeGroupIds>org.apache,com.hazelcast,org.testcontainers,org.infinispan.protostream</excludeGroupIds>
<excludeScope>test</excludeScope>
<failWhenReviewNeeded>true</failWhenReviewNeeded>
</configuration>
</execution>
Expand Down

0 comments on commit 14b277b

Please sign in to comment.