Skip to content

Commit

Permalink
Merge pull request #10800 from jetty/fix/12.0.x/dependency-updates
Browse files Browse the repository at this point in the history
Jetty 12.0.x - Dependency Updates
  • Loading branch information
joakime authored Oct 27, 2023
2 parents 8ba5ff1 + 6a70a93 commit 7be6c4b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 29 deletions.
2 changes: 1 addition & 1 deletion jetty-core/jetty-http-spi/pom.xml
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.1</jakarta.xml.jaxws.impl.version>
<jakarta.xml.jaxws.impl.version>4.0.2</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-ee10/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<mail.impl.version>2.0.1</mail.impl.version>

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

<dependencyManagement>
Expand Down
34 changes: 7 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,11 @@
</distributionManagement>

<properties>

<!-- dependency versions -->
<alpn.agent.version>2.0.10</alpn.agent.version>
<ant.version>1.10.14</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>

<!-- some maven plugins versions -->
<asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
<asciidoctor.skip>false</asciidoctor.skip>
<asciidoctorj-diagram.version>2.2.13</asciidoctorj-diagram.version>
Expand All @@ -175,7 +171,6 @@
<commons.compress.version>1.24.0</commons.compress.version>
<commons.io.version>2.14.0</commons.io.version>
<compiler.release>17</compiler.release>
<!-- build -->
<compiler.source>17</compiler.source>
<compiler.target>17</compiler.target>
<conscrypt.version>2.5.2</conscrypt.version>
Expand All @@ -185,28 +180,23 @@
<felix.version>7.0.5</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<flatten.maven.plugin.version>1.3.0</flatten.maven.plugin.version>
<google.errorprone.version>2.20.0</google.errorprone.version>
<google.errorprone.version>2.23.0</google.errorprone.version>
<groovy.version>4.0.6</groovy.version>
<groovy.version>4.0.6</groovy.version>
<grpc.version>1.56.1</grpc.version>
<grpc.version>1.59.0</grpc.version>
<gson.version>2.10.1</gson.version>
<guava.version>32.1.2-jre</guava.version>
<guava.version>32.1.3-jre</guava.version>
<guice.version>7.0.0</guice.version>
<h2spec.maven.plugin.version>1.0.11</h2spec.maven.plugin.version>
<hamcrest.version>2.2</hamcrest.version>
<hazelcast.version>5.3.2</hazelcast.version>
<!-- if changing this version please update default in RemoteInfinispanTestSupport/InfinispanSessionDistributionTests
you will get thanks from Eclipse IDE users -->
<!-- but hey we have no more strange people?? :P -->
<hazelcast.version>5.3.5</hazelcast.version>
<infinispan.docker.image.version>11.0.14.Final</infinispan.docker.image.version>
<infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
<infinispan.version>11.0.18.Final</infinispan.version>
<injection.bundle.version>1.2</injection.bundle.version>

<!-- testing -->
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
<jackson.version>2.15.2</jackson.version>
<jackson.version>2.15.3</jackson.version>
<jacoco.maven.plugin.version>0.8.10</jacoco.maven.plugin.version>
<jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
Expand All @@ -219,7 +209,6 @@
<jakarta.servlet.jsp.api.version>3.1.1</jakarta.servlet.jsp.api.version>
<jakarta.servlet.jsp.jstl.api.version>2.0.0</jakarta.servlet.jsp.jstl.api.version>
<jakarta.servlet.jsp.jstl.impl.version>2.0.0</jakarta.servlet.jsp.jstl.impl.version>
<!-- TODO: remove? -->
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.websocket.api.version>2.0.0</jakarta.websocket.api.version>
<jakarta.ws.rs.api.version>3.1.0</jakarta.ws.rs.api.version>
Expand All @@ -229,13 +218,10 @@
<jakarta.xml.ws.api.version>3.0.1</jakarta.xml.ws.api.version>
<javadoc.verbose>false</javadoc.verbose>
<javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version>
<!-- TODO: remove? -->
<javax.cdi.api.version>2.0</javax.cdi.api.version>
<!-- TODO: remove? -->
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
<jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>
<jboss-threads.version>3.5.1.Final</jboss-threads.version>
<!-- TODO: remove? -->
<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.5.3.Final</jboss.logging.version>
Expand All @@ -259,8 +245,6 @@
<json-smart.version>2.5.0</json-smart.version>
<junit.jupiter.execution.parallel.config.fixed.parallelism>2</junit.jupiter.execution.parallel.config.fixed.parallelism>
<junit.jupiter.execution.parallel.config.strategy>fixed</junit.jupiter.execution.parallel.config.strategy>

<!-- execute top-level classes in parallel but methods in same thread -->
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
<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>
Expand All @@ -269,7 +253,7 @@
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
<license.maven.plugin.version>4.1</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.20.0</log4j2.version>
<log4j2.version>2.21.1</log4j2.version>
<logback.version>1.4.11</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.2.0</mariadb.version>
Expand Down Expand Up @@ -304,10 +288,9 @@
<maven.version>3.9.0</maven.version>
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
<mina.core.version>2.2.3</mina.core.version>
<!-- if changing this version please update default in MongoTestHelper you will get thanks from Eclipse IDE users -->
<mongo.docker.version>3.2.20</mongo.docker.version>
<mongodb.version>3.12.11</mongodb.version>
<netty.version>4.1.97.Final</netty.version>
<netty.version>4.1.100.Final</netty.version>
<openpojo.version>0.9.1</openpojo.version>
<org.osgi.annotation.version>8.1.0</org.osgi.annotation.version>
<org.osgi.core.version>8.0.0</org.osgi.core.version>
Expand All @@ -316,20 +299,17 @@
<osgi-service-cm-version>1.6.1</osgi-service-cm-version>
<osgi-service-component-version>1.5.1</osgi-service-component-version>
<osgi-service-event-version>1.4.1</osgi-service-event-version>
<!-- really used -->
<osgi-services-version>3.11.100</osgi-services-version>
<osgi-util-function-version>1.2.0</osgi-util-function-version>
<osgi-util-measurement-version>1.0.2</osgi-util-measurement-version>
<osgi-util-position-version>1.0.1</osgi-util-position-version>
<osgi-util-tracker-version>1.5.4</osgi-util-tracker-version>
<osgi-util-version>3.7.200</osgi-util-version>
<osgi-util-xml-version>1.0.2</osgi-util-xml-version>

<osgi-version>3.18.500</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-component-annotations.version>2.1.1</plexus-component-annotations.version>
<plexus-utils.version>4.0.0</plexus-utils.version>
<plexus-xml.version>4.0.2</plexus-xml.version>
Expand Down

0 comments on commit 7be6c4b

Please sign in to comment.