Merge remote-tracking branch 'origin/jetty-9.4.x'

jetty-alpn/jetty-alpn-conscrypt-client/pom.xml

@@ -14,8 +14,7 @@
   <name>Jetty :: ALPN :: Conscrypt Client Implementation</name>
 
   <properties>
-    <bundle-symbolic-name>${project.groupId}.alpn.java.client</bundle-symbolic-name>
-    <conscrypt.version>1.0.0.RC11</conscrypt.version>
+    <bundle-symbolic-name>${project.groupId}.alpn.conscrypt.client</bundle-symbolic-name>
   </properties>
 
   <dependencies>
@@ -36,4 +35,24 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+ <build>
+    <plugins>
+       <plugin>
+         <groupId>org.apache.felix</groupId>
+         <artifactId>maven-bundle-plugin</artifactId>
+         <extensions>true</extensions>
+             <configuration>
+               <instructions>
+                 <Bundle-Description>Conscrypt Client ALPN</Bundle-Description>
+                 <Import-Package>org.conscrypt;version="${conscrypt.version}",*</Import-Package>
+                 <Export-Package>*</Export-Package>
+                 <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+                 <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client</Provide-Capability>
+                 <_nouses>true</_nouses>
+               </instructions>
+             </configuration>
+       </plugin>
+    </plugins>
+  </build>
+
 </project>

jetty-alpn/jetty-alpn-conscrypt-server/pom.xml

@@ -13,7 +13,6 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.alpn.conscrypt.server</bundle-symbolic-name>
-    <conscrypt.version>1.0.0.RC11</conscrypt.version>
   </properties>
 
   <dependencies>
@@ -40,4 +39,22 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+       <plugin>
+         <groupId>org.apache.felix</groupId>
+         <artifactId>maven-bundle-plugin</artifactId>
+         <extensions>true</extensions>
+             <configuration>
+               <instructions>
+                 <Bundle-Description>Conscrypt ALPN</Bundle-Description>
+                 <Import-Package>org.conscrypt;version="${conscrypt.version}",*</Import-Package>
+                 <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+                 <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server</Provide-Capability>
+                 <_nouses>true</_nouses>
+               </instructions>
+             </configuration>
+       </plugin>
+    </plugins>
+  </build>
 </project>

jetty-alpn/pom.xml

@@ -10,6 +10,7 @@
   <artifactId>jetty-alpn-parent</artifactId>
   <packaging>pom</packaging>
   <name>Jetty :: ALPN :: Parent</name>
+
   <modules>
     <module>jetty-alpn-server</module>
     <module>jetty-alpn-client</module>

pom.xml

@@ -25,6 +25,7 @@
     <servlet.schema.version>4.0.0</servlet.schema.version>
     <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
     <alpn.version>undefined</alpn.version>
+    <conscrypt.version>1.0.0.RC11</conscrypt.version>
   </properties>
 
   <licenses>