Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2024-06-18 13:06:44 -05:00
commit d764ed92c7
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
4 changed files with 19 additions and 19 deletions

View File

@ -17,7 +17,7 @@
</modules>
<properties>
<gcloud.version>2.19.1</gcloud.version>
<gcloud.version>2.20.1</gcloud.version>
</properties>
</project>

View File

@ -32,7 +32,7 @@
<osgi-service-cm-version>1.6.1</osgi-service-cm-version>
<osgi-service-component-version>1.5.1</osgi-service-component-version>
<osgi-service-event-version>1.4.1</osgi-service-event-version>
<osgi-services-version>3.12.0</osgi-services-version>
<osgi-services-version>3.12.100</osgi-services-version>
<osgi-util-function-version>1.2.0</osgi-util-function-version>
<osgi-util-measurement-version>1.0.2</osgi-util-measurement-version>
<osgi-util-position-version>1.0.1</osgi-util-position-version>
@ -40,7 +40,7 @@
<osgi-util-tracker-version>1.5.4</osgi-util-tracker-version>
<osgi-util-version>3.7.300</osgi-util-version>
<osgi-util-xml-version>1.0.2</osgi-util-xml-version>
<osgi-version>3.19.0</osgi-version>
<osgi-version>3.20.0</osgi-version>
</properties>
<dependencyManagement>

View File

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

30
pom.xml
View File

@ -207,10 +207,10 @@
<build-helper.maven.plugin.version>3.6.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.16.0</checkstyle.version>
<checkstyle.version>10.17.0</checkstyle.version>
<commons-codec.version>1.17.0</commons-codec.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.26.1</commons.compress.version>
<commons.compress.version>1.26.2</commons.compress.version>
<commons.io.version>2.16.1</commons.io.version>
<compiler.release>11</compiler.release>
<compiler.source>11</compiler.source>
@ -221,21 +221,21 @@
<felix.version>7.0.5</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
<google.errorprone.version>2.27.0</google.errorprone.version>
<google.errorprone.version>2.28.0</google.errorprone.version>
<groovy.version>4.0.6</groovy.version>
<grpc.version>1.63.0</grpc.version>
<gson.version>2.10.1</gson.version>
<guava.version>33.1.0-jre</guava.version>
<grpc.version>1.64.0</grpc.version>
<gson.version>2.11.0</gson.version>
<guava.version>33.2.1-jre</guava.version>
<guice.version>5.1.0</guice.version>
<h2spec.maven.plugin.version>1.0.10</h2spec.maven.plugin.version>
<hamcrest.version>2.2</hamcrest.version>
<hawtio.version>3.0.1</hawtio.version>
<hazelcast.version>5.3.6</hazelcast.version>
<hawtio.version>3.0.2</hawtio.version>
<hazelcast.version>5.3.7</hazelcast.version>
<infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
<infinispan.version>11.0.19.Final</infinispan.version>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
<jackson.version>2.17.0</jackson.version>
<jackson.version>2.17.1</jackson.version>
<jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
<jakarta.activation.api.version>1.2.2</jakarta.activation.api.version>
<jakarta.annotation.api.version>1.3.5</jakarta.annotation.api.version>
@ -263,7 +263,7 @@
<jboss-threads.version>3.6.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>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jboss.logging.version>3.6.0.Final</jboss.logging.version>
<jetty-assembly-descriptors.version>1.1</jetty-assembly-descriptors.version>
<jetty-quiche-native.version>0.21.0</jetty-quiche-native.version>
<jetty-test-policy.version>1.2</jetty-test-policy.version>
@ -295,16 +295,16 @@
<log4j2.version>2.23.1</log4j2.version>
<logback.version>1.3.14</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.3.3</mariadb.version>
<mariadb.version>3.4.0</mariadb.version>
<maven-plugin.plugin.version>3.13.1</maven-plugin.plugin.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
<maven.checkstyle.plugin.version>3.4.0</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.13.0</maven.compiler.plugin.version>
<maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
<maven.dependency.plugin.version>3.7.0</maven.dependency.plugin.version>
<maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
<maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.3.0</maven.exec.plugin.version>
@ -335,7 +335,7 @@
<osgi.slf4j.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.slf4j.import.packages>
<plexus-component-annotations.version>2.2.0</plexus-component-annotations.version>
<plexus-utils.version>4.0.1</plexus-utils.version>
<plexus-xml.version>4.0.3</plexus-xml.version>
<plexus-xml.version>4.0.4</plexus-xml.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<settingsPath>src/it/settings.xml</settingsPath>
<slf4j.version>2.0.9</slf4j.version>
@ -348,7 +348,7 @@
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
<weld.version>3.1.9.Final</weld.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.4.1.Final</wildfly.elytron.version>
<wildfly.elytron.version>2.4.2.Final</wildfly.elytron.version>
<xmemcached.version>2.4.8</xmemcached.version>
</properties>