Jetty 10.0.x 6423 service provider osgi headers (#6424)

* Issue #6423 Add headers to jetty manifests to expose o.e.j.w.Configuration for osgi ServiceLoader. Add jetty-annotations manifest to expose o.e.j.w.Configuration to ServiceLoader. Add osgi headers to jetty-quickstart for o.e.j.w.Configuration Add osgi serviceloader headers for jetty-cdi Add osgi serviceloader headers to websocket-jetty-client Add osgi serviceloader headers to jetty-ant Add osgi serviceloader headers to websocket-javax-client Add osgi serviceloader headers for websocket-jetty-common Add osgi serviceloader headers for websocket-core-common Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Jun 22, 2021 · 2c2781a · 2c2781a
1 parent 39572ef
commit 2c2781a
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 2 deletions.
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
@@ -31,8 +31,11 @@
         <configuration>
           <instructions>
             <Import-Package>${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",*</Import-Package>
-            <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional
+            <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional
             </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration
+            </Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
@@ -14,6 +14,21 @@
   </properties>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>

diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
@@ -38,6 +38,22 @@
   </dependencies>
   <build>
     <plugins>
+     <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+                osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,
+                osgi.serviceloader; osgi.serviceloader=javax.servlet.ServletContainerInitializer
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml
@@ -14,6 +14,26 @@
     <bundle-symbolic-name>${project.groupId}.quickstart</bundle-symbolic-name>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml
@@ -46,6 +46,12 @@
             <configuration>
               <instructions>
                 <Export-Package>*,org.eclipse.jetty.websocket.core.common.internal.*</Export-Package>
+                <Require-Capability>
+                  osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+                </Require-Capability>
+                <Provide-Capability>
+                  osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.core.Extension
+                </Provide-Capability>
               </instructions>
             </configuration>
           </execution>

diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml
@@ -79,7 +79,8 @@
                   osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
                 </Require-Capability>
                 <Provide-Capability>
-                  osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider
+                    osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider,
+                    osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer
                 </Provide-Capability>
               </instructions>
             </configuration>

diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml
@@ -14,6 +14,26 @@
     <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>

diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml
@@ -14,6 +14,26 @@
     <bundle-symbolic-name>${project.groupId}.common</bundle-symbolic-name>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>