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 'origin/jetty-11.0.x' into jetty-12.0.x

This commit is contained in:
Joakim Erdfelt 2024-01-02 10:39:25 -06:00
parent 2505d0e8a6 dcd073af5b
commit e36e12408c
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/dependabot.yml vendored
View File

@ -12,6 +12,9 @@ updates:
# Associate with milestone 10.0.x
milestone: 6
ignore:
# Do not upgrade major versions of dependencies
- dependency-name: "*"
update-types: [ "version-update:semver-major" ]
# Restrict updates in this branch to jetty in the 10.x.x space
- dependency-name: "jakarta.servlet:*"
versions: [ ">=5.0.0" ]
@ -60,6 +63,9 @@ updates:
# Associate with milestone 11.0.x
milestone: 7
ignore:
# Do not upgrade major versions of dependencies
- dependency-name: "*"
update-types: [ "version-update:semver-major" ]
# Restrict updates in this branch to jetty in the 11.x.x space
- dependency-name: "jakarta.activation:*"
versions: [ ">=2.1.0" ]

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

@ -13,15 +13,12 @@
<name>Build :: Resources</name>
<properties>
<!-- versions for these plugins are not based on parent pom -->
<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.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.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.2</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.2.3</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>

2
jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
View File

@ -37,7 +37,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.22.2</version>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

3
jetty-integrations/jetty-gcloud/pom.xml
View File

@ -17,7 +17,8 @@
</modules>
<properties>
<gcloud.version>2.11.4</gcloud.version>
<gcloud.version>2.17.6</gcloud.version>
<protobuf.version>3.25.1</protobuf.version>
</properties>
</project>

46
pom.xml
View File

@ -157,15 +157,15 @@
<apache.httpcore.version>4.4.16</apache.httpcore.version>
<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>
<asciidoctorj.version>2.5.10</asciidoctorj.version>
<asciidoctorj-diagram.version>2.2.14</asciidoctorj-diagram.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asm.version>9.6</asm.version>
<awaitility.version>4.2.0</awaitility.version>
<bndlib.version>6.4.1</bndlib.version>
<build-helper.maven.plugin.version>3.3.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>
<buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version>
<checkstyle.version>10.6.0</checkstyle.version>
<checkstyle.version>10.12.7</checkstyle.version>
<commons-codec.version>1.16.0</commons-codec.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.25.0</commons.compress.version>
@ -180,25 +180,24 @@
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
<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.23.0</google.errorprone.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
<google.errorprone.version>2.24.0</google.errorprone.version>
<groovy.version>4.0.6</groovy.version>
<groovy.version>4.0.6</groovy.version>
<grpc.version>1.59.0</grpc.version>
<grpc.version>1.60.1</grpc.version>
<gson.version>2.10.1</gson.version>
<guava.version>32.1.3-jre</guava.version>
<guava.version>33.0.0-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.5</hazelcast.version>
<hazelcast.version>5.3.6</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>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
<jackson.version>2.15.3</jackson.version>
<jacoco.maven.plugin.version>0.8.10</jacoco.maven.plugin.version>
<jackson.version>2.16.1</jackson.version>
<jacoco.maven.plugin.version>0.8.11</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>
<jakarta.el.api.version>4.0.0</jakarta.el.api.version>
@ -221,7 +220,7 @@
<javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version>
<javax.cdi.api.version>2.0</javax.cdi.api.version>
<javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
<jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>
<jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
<jboss-threads.version>3.5.1.Final</jboss-threads.version>
<jboss.logging.annotations.version>2.2.1.Final</jboss.logging.annotations.version>
<jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
@ -241,7 +240,7 @@
<jettyHomeZipFileName>jetty-home.zip</jettyHomeZipFileName>
<jmh.version>1.37</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name>
<jna.version>5.13.0</jna.version>
<jna.version>5.14.0</jna.version>
<json-simple.version>1.1.1</json-simple.version>
<json-smart.version>2.5.0</json-smart.version>
<junit.jupiter.execution.parallel.config.fixed.parallelism>2</junit.jupiter.execution.parallel.config.fixed.parallelism>
@ -252,15 +251,14 @@
<junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled>
<junit.version>5.10.0</junit.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.3</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.22.0</log4j2.version>
<log4j2.version>2.22.1</log4j2.version>
<logback.version>1.4.14</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.2.0</mariadb.version>
<mariadb.version>3.3.2</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.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.2</maven-plugin.plugin.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
@ -268,7 +266,7 @@
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
<maven.clean.plugin.version>3.3.2</maven.clean.plugin.version>
<maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
<maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.deps.version>3.9.4</maven.deps.version>
@ -278,7 +276,7 @@
<maven.install.plugin.version>3.1.1</maven.install.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.javadoc.plugin.version>3.6.2</maven.javadoc.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.10.2</maven.plugin-tools.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>
@ -292,7 +290,7 @@
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
<mina.core.version>2.2.3</mina.core.version>
<mongo.docker.version>3.2.20</mongo.docker.version>
<mongodb.version>3.12.11</mongodb.version>
<mongodb.version>3.12.14</mongodb.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>
@ -315,13 +313,13 @@
<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>
<plexus-xml.version>4.0.3</plexus-xml.version>
<project.build.outputTimestamp>2023-06-05T23:12:49Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<settingsPath>src/it/settings.xml</settingsPath>
<slf4j.version>2.0.9</slf4j.version>
<spifly.version>1.3.6</spifly.version>
<spotbugs.maven.plugin.version>4.7.3.5</spotbugs.maven.plugin.version>
<spotbugs.maven.plugin.version>4.8.2.0</spotbugs.maven.plugin.version>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<swissbox.version>1.8.3</swissbox.version>
@ -329,7 +327,7 @@
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
<testcontainers.version>1.19.3</testcontainers.version>
<tinybundles.version>3.0.0</tinybundles.version>
<versions.maven.plugin.version>2.14.2</versions.maven.plugin.version>
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.2.2.Final</wildfly.elytron.version>
<xmemcached.version>2.4.8</xmemcached.version>