Merge branch 'jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Olivier Lamy 2024-07-15 16:53:42 +10:00
commit 4eb972c529
No known key found for this signature in database
GPG Key ID: 873A8E86B4372146
2 changed files with 9 additions and 9 deletions

View File

@ -19,7 +19,7 @@
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version> <maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version> <maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.3.0</maven.surefire.plugin.version> <maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>

16
pom.xml
View File

@ -223,7 +223,7 @@
<flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version> <flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
<google.errorprone.version>2.28.0</google.errorprone.version> <google.errorprone.version>2.28.0</google.errorprone.version>
<groovy.version>4.0.6</groovy.version> <groovy.version>4.0.6</groovy.version>
<grpc.version>1.64.0</grpc.version> <grpc.version>1.65.1</grpc.version>
<gson.version>2.11.0</gson.version> <gson.version>2.11.0</gson.version>
<guava.version>33.2.1-jre</guava.version> <guava.version>33.2.1-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>
@ -235,7 +235,7 @@
<infinispan.version>11.0.19.Final</infinispan.version> <infinispan.version>11.0.19.Final</infinispan.version>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings> <invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug> <it.debug>false</it.debug>
<jackson.version>2.17.1</jackson.version> <jackson.version>2.17.2</jackson.version>
<jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version> <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
<jakarta.activation.api.version>2.0.1</jakarta.activation.api.version> <jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version> <jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
@ -292,7 +292,7 @@
<json-simple.version>1.1.1</json-simple.version> <json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.5.1</json-smart.version> <json-smart.version>2.5.1</json-smart.version>
<jsp.impl.version>10.0.27</jsp.impl.version> <jsp.impl.version>10.0.27</jsp.impl.version>
<junit.version>5.10.2</junit.version> <junit.version>5.10.3</junit.version>
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version> <kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
<license.maven.plugin.version>4.5</license.maven.plugin.version> <license.maven.plugin.version>4.5</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath> <localRepoPath>${project.build.directory}/local-repo</localRepoPath>
@ -318,13 +318,13 @@
<maven.jar.plugin.version>3.4.2</maven.jar.plugin.version> <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version> <maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.13.1</maven.plugin-tools.version> <maven.plugin-tools.version>3.13.1</maven.plugin-tools.version>
<maven.release.plugin.version>3.1.0</maven.release.plugin.version> <maven.release.plugin.version>3.1.1</maven.release.plugin.version>
<maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version> <maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version>
<maven.resolver.version>1.9.20</maven.resolver.version> <maven.resolver.version>1.9.21</maven.resolver.version>
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version> <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
<maven.shade.plugin.version>3.6.0</maven.shade.plugin.version> <maven.shade.plugin.version>3.6.0</maven.shade.plugin.version>
<maven.source.plugin.version>3.3.1</maven.source.plugin.version> <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
<maven.surefire.plugin.version>3.3.0</maven.surefire.plugin.version> <maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
<maven.version>3.9.6</maven.version> <maven.version>3.9.6</maven.version>
<maven.war.plugin.version>3.4.0</maven.war.plugin.version> <maven.war.plugin.version>3.4.0</maven.war.plugin.version>
<mina.core.version>2.2.3</mina.core.version> <mina.core.version>2.2.3</mina.core.version>
@ -343,7 +343,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<settingsPath>src/it/settings.xml</settingsPath> <settingsPath>src/it/settings.xml</settingsPath>
<slf4j.version>2.0.9</slf4j.version> <slf4j.version>2.0.9</slf4j.version>
<spotbugs.maven.plugin.version>4.8.6.1</spotbugs.maven.plugin.version> <spotbugs.maven.plugin.version>4.8.6.2</spotbugs.maven.plugin.version>
<springboot.version>2.1.1.RELEASE</springboot.version> <springboot.version>2.1.1.RELEASE</springboot.version>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version> <taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
@ -352,7 +352,7 @@
<versions.maven.plugin.version>2.17.0</versions.maven.plugin.version> <versions.maven.plugin.version>2.17.0</versions.maven.plugin.version>
<weld.version>4.0.3.Final</weld.version> <weld.version>4.0.3.Final</weld.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.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.5.0.Final</wildfly.elytron.version>
<xmemcached.version>2.4.8</xmemcached.version> <xmemcached.version>2.4.8</xmemcached.version>
</properties> </properties>