diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 779bf430b38..f6d31c6a309 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -14,8 +14,7 @@ Jetty :: ALPN :: Conscrypt Client Implementation - ${project.groupId}.alpn.java.client - 1.0.0.RC11 + ${project.groupId}.alpn.conscrypt.client @@ -36,4 +35,24 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + Conscrypt Client ALPN + org.conscrypt;version="${conscrypt.version}",* + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client + <_nouses>true + + + + + + diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index e621401d517..32bcc32ca1e 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -13,7 +13,6 @@ ${project.groupId}.alpn.conscrypt.server - 1.0.0.RC11 @@ -40,4 +39,22 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + Conscrypt ALPN + org.conscrypt;version="${conscrypt.version}",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server + <_nouses>true + + + + + diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 941b382d7e2..7c81dd18a9a 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -10,6 +10,7 @@ jetty-alpn-parent pom Jetty :: ALPN :: Parent + jetty-alpn-server jetty-alpn-client diff --git a/pom.xml b/pom.xml index ff277f9c4fc..732f6e2f6be 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ 4.0.0 undefined + 1.0.0.RC11