Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jetty-11.0.x' into jetty-12.0.x

This commit is contained in:
Joakim Erdfelt 2023-12-06 15:21:13 -06:00
parent 8638d80bd5 1e8cbbee98
commit 271b1ee2df
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build-resources/pom.xml
View File

@ -16,10 +16,12 @@
<!-- versions for these plugins are not based on parent pom --> <!-- versions for these plugins are not based on parent pom -->
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version> <maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<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.javadoc.skip>true</maven.javadoc.skip>
<maven.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version> <maven.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.1</maven.surefire.plugin.version> <maven.surefire.plugin.version>3.2.2</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>

2
jetty-core/jetty-keystore/pom.xml
View File

@ -12,7 +12,7 @@
<description>Test keystore with self-signed SSL Certificate.</description> <description>Test keystore with self-signed SSL Certificate.</description>
<properties> <properties>
<bouncycastle.version>1.76</bouncycastle.version> <bouncycastle.version>1.77</bouncycastle.version>
<bundle-symbolic-name>${project.groupId}.keystore</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.keystore</bundle-symbolic-name>
</properties> </properties>

3
jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml
View File

@ -15,12 +15,15 @@
<!-- too many duplicates with osgi jars... --> <!-- too many duplicates with osgi jars... -->
<duplicate-finder.skip>true</duplicate-finder.skip> <duplicate-finder.skip>true</duplicate-finder.skip>
<injection.bundle.version>1.2</injection.bundle.version> <injection.bundle.version>1.2</injection.bundle.version>
<injection.bundle.version>1.2</injection.bundle.version>
<jetty-orbit-url>https://download.eclipse.org/jetty/orbit/</jetty-orbit-url> <jetty-orbit-url>https://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<pax.exam.version>4.13.5</pax.exam.version> <pax.exam.version>4.13.5</pax.exam.version>
<pax.url.version>2.6.14</pax.url.version> <pax.url.version>2.6.14</pax.url.version>
<spifly.version>1.3.6</spifly.version> <spifly.version>1.3.6</spifly.version>
<spifly.version>1.3.7</spifly.version>
<swissbox.version>1.8.3</swissbox.version> <swissbox.version>1.8.3</swissbox.version>
<tinybundles.version>3.0.0</tinybundles.version> <tinybundles.version>3.0.0</tinybundles.version>
</properties> </properties>

27
pom.xml
View File

@ -167,9 +167,9 @@
<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.6.0</checkstyle.version> <checkstyle.version>10.6.0</checkstyle.version>
<commons-codec.version>1.16.0</commons-codec.version> <commons-codec.version>1.16.0</commons-codec.version>
<commons-lang3.version>3.13.0</commons-lang3.version> <commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.24.0</commons.compress.version> <commons.compress.version>1.25.0</commons.compress.version>
<commons.io.version>2.15.0</commons.io.version> <commons.io.version>2.15.1</commons.io.version>
<compiler.release>17</compiler.release> <compiler.release>17</compiler.release>
<compiler.source>17</compiler.source> <compiler.source>17</compiler.source>
<compiler.target>17</compiler.target> <compiler.target>17</compiler.target>
@ -254,13 +254,14 @@
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version> <kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
<license.maven.plugin.version>4.1</license.maven.plugin.version> <license.maven.plugin.version>4.1</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath> <localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.21.1</log4j2.version> <log4j2.version>2.22.0</log4j2.version>
<logback.version>1.4.11</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.2.0</mariadb.version> <mariadb.version>3.2.0</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version> <maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
<maven-build-cache.version>1.1.0</maven-build-cache.version> <maven-build-cache.version>1.1.0</maven-build-cache.version>
<maven-plugin.plugin.version>3.10.1</maven-plugin.plugin.version> <maven-plugin.plugin.version>3.10.1</maven-plugin.plugin.version>
<maven-plugin.plugin.version>3.10.2</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>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version> <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
@ -272,16 +273,16 @@
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version> <maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.deps.version>3.9.4</maven.deps.version> <maven.deps.version>3.9.4</maven.deps.version>
<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version> <maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.1.0</maven.exec.plugin.version> <maven.exec.plugin.version>3.1.1</maven.exec.plugin.version>
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version> <maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
<maven.install.plugin.version>3.1.1</maven.install.plugin.version> <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
<maven.invoker.plugin.version>3.6.0</maven.invoker.plugin.version> <maven.invoker.plugin.version>3.6.0</maven.invoker.plugin.version>
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version> <maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.6.0</maven.javadoc.plugin.version> <maven.javadoc.plugin.version>3.6.2</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.10.1</maven.plugin-tools.version> <maven.plugin-tools.version>3.10.2</maven.plugin-tools.version>
<maven.release.plugin.version>3.0.1</maven.release.plugin.version> <maven.release.plugin.version>3.0.1</maven.release.plugin.version>
<maven.remote-resources-plugin.version>3.1.0</maven.remote-resources-plugin.version> <maven.remote-resources-plugin.version>3.1.0</maven.remote-resources-plugin.version>
<maven.resolver.version>1.9.16</maven.resolver.version> <maven.resolver.version>1.9.18</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.5.1</maven.shade.plugin.version> <maven.shade.plugin.version>3.5.1</maven.shade.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version> <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
@ -326,12 +327,12 @@
<swissbox.version>1.8.3</swissbox.version> <swissbox.version>1.8.3</swissbox.version>
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version> <taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version> <taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
<testcontainers.version>1.19.1</testcontainers.version> <testcontainers.version>1.19.3</testcontainers.version>
<tinybundles.version>3.0.0</tinybundles.version> <tinybundles.version>3.0.0</tinybundles.version>
<versions.maven.plugin.version>2.14.2</versions.maven.plugin.version> <versions.maven.plugin.version>2.14.2</versions.maven.plugin.version>
<wildfly.common.version>1.6.0.Final</wildfly.common.version> <wildfly.common.version>1.7.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.2.2.Final</wildfly.elytron.version> <wildfly.elytron.version>2.2.2.Final</wildfly.elytron.version>
<xmemcached.version>2.4.7</xmemcached.version> <xmemcached.version>2.4.8</xmemcached.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -2529,7 +2530,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<cbi-plugins.version>1.4.2</cbi-plugins.version> <cbi-plugins.version>1.4.3</cbi-plugins.version>
</properties> </properties>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>