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

This commit is contained in:
Olivier Lamy 2023-06-02 22:02:45 +10:00
commit 38029b36d1
1 changed files with 11 additions and 6 deletions

17
pom.xml
View File

@ -28,7 +28,7 @@
<apache.avro.version>1.11.1</apache.avro.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<apache.httpcore.version>4.4.16</apache.httpcore.version>
<asciidoctorj-diagram.version>2.2.7</asciidoctorj-diagram.version>
<asciidoctorj-diagram.version>2.2.8</asciidoctorj-diagram.version>
<asciidoctorj.version>2.5.6</asciidoctorj.version>
<mina.core.version>2.2.1</mina.core.version>
<asm.version>9.5</asm.version>
@ -38,7 +38,7 @@
<checkstyle.version>10.3.4</checkstyle.version>
<commons-codec.version>1.15</commons-codec.version>
<commons.compress.version>1.23.0</commons.compress.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.io.version>2.12.0</commons.io.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<conscrypt.version>2.5.2</conscrypt.version>
<disruptor.version>3.4.2</disruptor.version>
@ -97,7 +97,7 @@
<jnr-posix.version>3.1.15</jnr-posix.version>
<jnr-unixsocket.version>0.38.17</jnr-unixsocket.version>
<json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.4.10</json-smart.version>
<json-smart.version>2.4.11</json-smart.version>
<jsp.impl.version>10.0.14</jsp.impl.version>
<junit.version>5.9.1</junit.version>
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
@ -119,14 +119,19 @@
<springboot.version>2.1.1.RELEASE</springboot.version>
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
<<<<<<< HEAD
<testcontainers.version>1.18.0</testcontainers.version>
<weld.version>4.0.3.Final</weld.version>
=======
<testcontainers.version>1.18.3</testcontainers.version>
<weld.version>3.1.9.Final</weld.version>
>>>>>>> jetty-10.0.x
<wildfly.common.version>1.6.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.1.0.Final</wildfly.elytron.version>
<xmemcached.version>2.4.7</xmemcached.version>
<!-- some maven plugins versions -->
<asciidoctor.maven.plugin.version>2.2.3</asciidoctor.maven.plugin.version>
<asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
<build-helper.maven.plugin.version>3.3.0</build-helper.maven.plugin.version>
<buildnumber.maven.plugin.version>3.0.0</buildnumber.maven.plugin.version>
<depends.maven.plugin.version>1.4.0</depends.maven.plugin.version>
@ -141,7 +146,7 @@
<maven.clean.plugin.version>3.2.0</maven.clean.plugin.version>
<maven.checkstyle.plugin.version>3.2.2</maven.checkstyle.plugin.version>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.5.0</maven.dependency.plugin.version>
<maven.dependency.plugin.version>3.6.0</maven.dependency.plugin.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.enforcer.plugin.version>3.3.0</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.1.0</maven.exec.plugin.version>
@ -151,7 +156,7 @@
<groovy.version>4.0.6</groovy.version>
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.8.2</maven.plugin-tools.version>
<maven.plugin-tools.version>3.9.0</maven.plugin-tools.version>
<maven-plugin.plugin.version>3.8.2</maven-plugin.plugin.version>
<maven.release.plugin.version>3.0.0</maven.release.plugin.version>
<maven.remote-resources-plugin.version>3.0.0</maven.remote-resources-plugin.version>