Merge pull request #8642 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.services-3.11.0

jetty-osgi/jetty-osgi-boot/pom.xml

@@ -41,6 +41,18 @@
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.osgi.services</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.cm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.event</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.tracker</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -88,12 +100,13 @@
               javax.transaction.xa;version="1.1.0";resolution:=optional,
               org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional,
               org.osgi.framework,
-              org.osgi.service.cm;version="1.4.0",
-              org.osgi.service.event;version="1.4.0",
+              org.osgi.service.cm;version="${osgi-service-cm-version}",
+              org.osgi.service.component;version="${osgi-service-component-version}",
+              org.osgi.service.event;version="${osgi-service-event-version}",
               org.osgi.service.packageadmin,
               org.osgi.service.startlevel;version="1.0.0",
               org.osgi.service.url;version="1.0.0",
-              org.osgi.util.tracker;version="1.3.0",
+              org.osgi.util.tracker;version="${osgi-util-tracker-version}",
               org.xml.sax,
               org.xml.sax.helpers,
               org.eclipse.jetty.annotations;resolution:=optional,

jetty-osgi/pom.xml

@@ -13,12 +13,16 @@
 
   <properties>
     <osgi-version>3.18.100</osgi-version>
-    <osgi-services-version>3.10.200</osgi-services-version>
+    <osgi-services-version>3.11.0</osgi-services-version>
+    <osgi-service-cm-version>1.6.1</osgi-service-cm-version>
+    <osgi-service-component-version>1.5.0</osgi-service-component-version>
+    <osgi-service-event-version>1.4.1</osgi-service-event-version>
     <osgi-util-version>3.7.100</osgi-util-version>
     <osgi-util-function-version>1.2.0</osgi-util-function-version>
     <osgi-util-promise-version>1.2.0</osgi-util-promise-version>
     <osgi-util-measurement-version>1.0.2</osgi-util-measurement-version>
     <osgi-util-position-version>1.0.1</osgi-util-position-version>
+    <osgi-util-tracker-version>1.5.4</osgi-util-tracker-version>
     <osgi-util-xml-version>1.0.2</osgi-util-xml-version>
     <equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
     <jacoco.skip>true</jacoco.skip>
@@ -91,6 +95,26 @@
         <artifactId>org.eclipse.osgi</artifactId>
         <version>${osgi-version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.cm</artifactId>
+        <version>${osgi-service-cm-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.component</artifactId>
+        <version>${osgi-service-component-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.event</artifactId>
+        <version>${osgi-service-event-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.util.tracker</artifactId>
+        <version>${osgi-util-tracker-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.equinox.http</groupId>
         <artifactId>servlet</artifactId>

jetty-osgi/test-jetty-osgi-context/pom.xml

@@ -58,11 +58,11 @@
               javax.servlet;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))",
               javax.servlet.resources;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))",
               org.osgi.framework,
-              org.osgi.service.cm;version="1.2.0",
+              org.osgi.service.cm;version="${osgi-service-cm-version}",
               org.osgi.service.packageadmin,
               org.osgi.service.startlevel;version="1.0.0",
               org.osgi.service.url;version="1.0.0",
-              org.osgi.util.tracker;version="1.3.0",
+              org.osgi.util.tracker;version="${osgi-util-tracker-version}",
               *
             </Import-Package>
             <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>

jetty-osgi/test-jetty-osgi-server/pom.xml

@@ -48,11 +48,11 @@
             <_nouses>true</_nouses>
             <Import-Package>
               org.osgi.framework,
-              org.osgi.service.cm;version="1.2.0",
+              org.osgi.service.cm;version="${osgi-service-cm-version}",
               org.osgi.service.packageadmin,
               org.osgi.service.startlevel;version="1.0.0",
               org.osgi.service.url;version="1.0.0",
-              org.osgi.util.tracker;version="1.3.0",
+              org.osgi.util.tracker;version="${osgi-util-tracker-version}",
               org.xml.sax,
               org.xml.sax.helpers,
               *

jetty-osgi/test-jetty-osgi/pom.xml

@@ -171,11 +171,13 @@
        <artifactId>slf4j-api</artifactId>
        <scope>test</scope>
      </dependency>
+    <!--
     <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-simple</artifactId>
        <scope>test</scope>
      </dependency>
+     -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java

@@ -132,12 +132,16 @@ public class TestOSGiUtil
             res.add(systemProperty("org.ops4j.pax.url.mvn.settings").value(System.getProperty("settingsFilePath")));
         }
 
+        res.add(mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject().noStart());
+
         /*
          * Jetty 10 uses slf4j 2.0.0 by default, however we want to test with slf4j 1.7.30 for backwards compatibility.
          * To do that, we need to use slf4j-simple as the logging implementation. We make a simplelogger.properties
          * file available so that jetty logging can be configured
          */
-        res.add(mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject().noStart());
+        // BEGIN - slf4j 1.7.x
+        /* slf4j-simple conflicts with both slf4j 1.7.x, and jetty-slf4j-impl. (but in different ways)
+
         TinyBundle simpleLoggingPropertiesBundle = TinyBundles.bundle();
         simpleLoggingPropertiesBundle.add("simplelogger.properties", ClassLoader.getSystemResource("simplelogger.properties"));
         simpleLoggingPropertiesBundle.set(Constants.BUNDLE_SYMBOLICNAME, "simple-logger-properties");
@@ -145,29 +149,33 @@ public class TestOSGiUtil
         simpleLoggingPropertiesBundle.add(FragmentActivator.class);
         res.add(CoreOptions.streamBundle(simpleLoggingPropertiesBundle.build()).noStart());
         res.add(mavenBundle().groupId("org.slf4j").artifactId("slf4j-simple").versionAsInProject().noStart());
+         */
+        // END - slf4j 1.7.x
         
         /*
-         * NOTE: when running with slf4j >= 2.0.0, remove the slf4j simple logger above and uncomment the following lines
-
+         * When running with slf4j >= 2.0.0, remove the slf4j simple logger above and uncomment the following lines
+         */
+        // BEGIN - slf4j 2.x
         TinyBundle loggingPropertiesBundle = TinyBundles.bundle();
         loggingPropertiesBundle.add("jetty-logging.properties", ClassLoader.getSystemResource("jetty-logging.properties"));
         loggingPropertiesBundle.set(Constants.BUNDLE_SYMBOLICNAME, "jetty-logging-properties");
         loggingPropertiesBundle.set(Constants.FRAGMENT_HOST, "org.eclipse.jetty.logging");
         loggingPropertiesBundle.add(FragmentActivator.class);
         res.add(CoreOptions.streamBundle(loggingPropertiesBundle.build()).noStart());
-        //Fix missing ServiceLoader in slf4j-api 2.0.0 manifest
-        res.add(wrappedBundle(mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject()
-            .instructions("Require-Capability=osgi.serviceloader;filter:=\"(osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider)\",osgi.extender;filter:=\"(osgi.extender=osgi.serviceloader.processor)\"")
-            .overwriteManifest(OverwriteMode.MERGE)
-            .start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-slf4j-impl").versionAsInProject().start());
-        */
+        // END - slf4j 2.x
+
         res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-servlet-api").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.util").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.service.cm").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.service.component").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.service.event").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.function").versionAsInProject());
         res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.function").versionAsInProject());
         res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.promise").versionAsInProject());
         res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.measurement").versionAsInProject());
         res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.position").versionAsInProject());
+        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.ow2.asm").artifactId("asm").versionAsInProject().start());