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

This commit is contained in:
Olivier Lamy 2024-03-01 15:56:13 +10:00
commit 1fab188d7f
No known key found for this signature in database
GPG Key ID: 873A8E86B4372146
3 changed files with 21 additions and 14 deletions

View File

@ -12,7 +12,7 @@
<description>Jetty JAAS support</description> <description>Jetty JAAS support</description>
<properties> <properties>
<apache.directory.api.version>2.1.5</apache.directory.api.version> <apache.directory.api.version>2.1.6</apache.directory.api.version>
<apacheds.version>2.0.0.AM27</apacheds.version> <apacheds.version>2.0.0.AM27</apacheds.version>
<bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name>
<spotbugs.onlyAnalyze>org.eclipse.jetty.jaas.*</spotbugs.onlyAnalyze> <spotbugs.onlyAnalyze>org.eclipse.jetty.jaas.*</spotbugs.onlyAnalyze>

View File

@ -11,7 +11,7 @@
<name>Jetty :: P2</name> <name>Jetty :: P2</name>
<description>Generates a (maven based) P2 Updatesite</description> <description>Generates a (maven based) P2 Updatesite</description>
<properties> <properties>
<tycho-version>4.0.5</tycho-version> <tycho-version>4.0.6</tycho-version>
</properties> </properties>
<dependencies> <dependencies>
<!-- This dependency is to make sure this projects is build after all relevant <!-- This dependency is to make sure this projects is build after all relevant

31
pom.xml
View File

@ -207,10 +207,10 @@
<build-helper.maven.plugin.version>3.5.0</build-helper.maven.plugin.version> <build-helper.maven.plugin.version>3.5.0</build-helper.maven.plugin.version>
<build-support.version>1.5</build-support.version> <build-support.version>1.5</build-support.version>
<buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version> <buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version>
<checkstyle.version>10.13.0</checkstyle.version> <checkstyle.version>10.14.0</checkstyle.version>
<commons-codec.version>1.16.1</commons-codec.version> <commons-codec.version>1.16.1</commons-codec.version>
<commons-lang3.version>3.14.0</commons-lang3.version> <commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.25.0</commons.compress.version> <commons.compress.version>1.24.0</commons.compress.version>
<commons.io.version>2.15.1</commons.io.version> <commons.io.version>2.15.1</commons.io.version>
<compiler.release>11</compiler.release> <compiler.release>11</compiler.release>
<compiler.source>11</compiler.source> <compiler.source>11</compiler.source>
@ -221,9 +221,9 @@
<felix.version>7.0.5</felix.version> <felix.version>7.0.5</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version> <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<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.24.1</google.errorprone.version> <google.errorprone.version>2.25.0</google.errorprone.version>
<groovy.version>4.0.6</groovy.version> <groovy.version>4.0.6</groovy.version>
<grpc.version>1.61.1</grpc.version> <grpc.version>1.62.2</grpc.version>
<gson.version>2.10.1</gson.version> <gson.version>2.10.1</gson.version>
<guava.version>33.0.0-jre</guava.version> <guava.version>33.0.0-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>
@ -279,25 +279,27 @@
<jetty.testtracker.log>false</jetty.testtracker.log> <jetty.testtracker.log>false</jetty.testtracker.log>
<jetty.unixdomain.dir>/tmp</jetty.unixdomain.dir> <jetty.unixdomain.dir>/tmp</jetty.unixdomain.dir>
<jetty.url>https://eclipse.dev/jetty/</jetty.url> <jetty.url>https://eclipse.dev/jetty/</jetty.url>
<jffi.version>1.3.13</jffi.version>
<jmh.version>1.37</jmh.version> <jmh.version>1.37</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name> <jmhjar.name>benchmarks</jmhjar.name>
<jna.version>5.14.0</jna.version> <jna.version>5.14.0</jna.version>
<jnr-constants.version>0.10.4</jnr-constants.version> <jnr-constants.version>0.10.4</jnr-constants.version>
<jnr-enxio.version>0.32.16</jnr-enxio.version> <jnr-enxio.version>0.32.17</jnr-enxio.version>
<jnr-ffi.version>2.2.15</jnr-ffi.version> <jnr-ffi.version>2.2.16</jnr-ffi.version>
<jnr-posix.version>3.1.18</jnr-posix.version> <jnr-posix.version>3.1.19</jnr-posix.version>
<jnr-unixsocket.version>0.38.21</jnr-unixsocket.version> <jnr-unixsocket.version>0.38.22</jnr-unixsocket.version>
<jolokia.version>1.7.2</jolokia.version>
<json-simple.version>1.1.1</json-simple.version> <json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.5.0</json-smart.version> <json-smart.version>2.5.0</json-smart.version>
<jsp.impl.version>10.0.27</jsp.impl.version> <jsp.impl.version>9.0.83.1</jsp.impl.version>
<junit.version>5.10.1</junit.version> <junit.version>5.10.2</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.3</license.maven.plugin.version> <license.maven.plugin.version>4.3</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath> <localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.22.1</log4j2.version> <log4j2.version>2.23.0</log4j2.version>
<logback.version>1.4.14</logback.version> <logback.version>1.4.14</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version> <mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.3.2</mariadb.version> <mariadb.version>3.3.3</mariadb.version>
<maven-plugin.plugin.version>3.11.0</maven-plugin.plugin.version> <maven-plugin.plugin.version>3.11.0</maven-plugin.plugin.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version> <maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version> <maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
@ -401,6 +403,11 @@
<artifactId>logback-core</artifactId> <artifactId>logback-core</artifactId>
<version>${logback.version}</version> <version>${logback.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jffi</artifactId>
<version>${jffi.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.github.jnr</groupId> <groupId>com.github.jnr</groupId>
<artifactId>jnr-constants</artifactId> <artifactId>jnr-constants</artifactId>