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

Merge branch 'jetty-11.0.x' into jetty-12.0.x-merge-11

This commit is contained in:
Olivier Lamy 2024-04-02 19:51:51 +10:00
parent e82a513f9f ea18cfe84e
commit 3a66e02053
No known key found for this signature in database
GPG Key ID: 873A8E86B4372146
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@
<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.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.3</maven.surefire.plugin.version>
<maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>

1
jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestOSGiUtil.java
View File

@ -207,6 +207,7 @@ public class TestOSGiUtil
res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.tracker").versionAsInProject());
res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.xml").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.services").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.equinox.http.service.api").versionAsInProject());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject().start());

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

@ -17,7 +17,7 @@
</modules>
<properties>
<gcloud.version>2.18.4</gcloud.version>
<gcloud.version>2.19.0</gcloud.version>
<protobuf.version>3.25.2</protobuf.version>
</properties>

14
pom.xml
View File

@ -158,14 +158,14 @@
<asciidoctor.maven.plugin.version>2.2.6</asciidoctor.maven.plugin.version>
<asciidoctor.skip>false</asciidoctor.skip>
<asciidoctorj-diagram.version>2.3.0</asciidoctorj-diagram.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<asciidoctorj.version>2.5.12</asciidoctorj.version>
<asm.version>9.7</asm.version>
<awaitility.version>4.2.1</awaitility.version>
<bndlib.version>6.4.1</bndlib.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.14.2</checkstyle.version>
<checkstyle.version>10.15.0</checkstyle.version>
<commons-codec.version>1.16.1</commons-codec.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.26.1</commons.compress.version>
@ -191,7 +191,7 @@
<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>
<infinispan.version>11.0.19.Final</infinispan.version>
<injection.bundle.version>1.2</injection.bundle.version>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
@ -199,7 +199,7 @@
<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
<javadoc.verbose>false</javadoc.verbose>
<jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
<jboss-threads.version>3.5.1.Final</jboss-threads.version>
<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>
@ -232,7 +232,7 @@
<kerb-simplekdc.version>2.0.3</kerb-simplekdc.version>
<license.maven.plugin.version>4.3</license.maven.plugin.version>
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.23.0</log4j2.version>
<log4j2.version>2.23.1</log4j2.version>
<logback.version>1.5.3</logback.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.3.3</mariadb.version>
@ -251,9 +251,9 @@
<maven.deps.version>3.9.6</maven.deps.version>
<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
<maven.exec.plugin.version>3.2.0</maven.exec.plugin.version>
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
<maven.gpg.plugin.version>3.2.2</maven.gpg.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.1</maven.invoker.plugin.version>
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.11.0</maven.plugin-tools.version>