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-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2024-04-01 13:06:32 -05:00
parent 95e5ce05bb 4b8e7784b5
commit a836723fa4
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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>
</properties>
</project>

4
jetty-osgi/pom.xml
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.11.200</osgi-services-version>
<osgi-services-version>3.12.0</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.18.600</osgi-version>
<osgi-version>3.19.0</osgi-version>
</properties>
<dependencyManagement>

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

@ -184,6 +184,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
pom.xml
View File

@ -232,7 +232,7 @@
<hawtio.version>3.0.1</hawtio.version>
<hazelcast.version>5.3.6</hazelcast.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>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
<jackson.version>2.17.0</jackson.version>