Add alpn.server
Change-Id: I7b28199aa115bb592579857c2313a6de6fd616eb
Signed-off-by: Gunnar Wagenknecht <gunnar@wagenknecht.org>
diff --git a/jetty.bundles.f.source/feature.xml b/jetty.bundles.f.source/feature.xml
index 4274310..39a79e5 100644
--- a/jetty.bundles.f.source/feature.xml
+++ b/jetty.bundles.f.source/feature.xml
@@ -95,8 +95,7 @@
install-size="0"
version="0.0.0"
unpack="false"/-->
-<!-- this must not be loaded by the osgi container
-it has to be on the boot classpath of the JVM -->
+<!-- there is no source for the fragment (its just a manifest) -->
<!--plugin
id="org.eclipse.jetty.osgi.alpn.fragment.source"
download-size="0"
@@ -153,7 +152,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.jetty.rewrite.source"
download-size="0"
@@ -197,6 +196,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.jetty.alpn.server.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jetty.http2.client.source"
download-size="0"
install-size="0"
diff --git a/jetty.bundles.f/feature.xml b/jetty.bundles.f/feature.xml
index 2f34aa6..139f28d 100644
--- a/jetty.bundles.f/feature.xml
+++ b/jetty.bundles.f/feature.xml
@@ -111,8 +111,8 @@
version="0.0.0"
unpack="false"/-->
-<!-- this must not be loaded by the osgi container
-it has to be on the boot classpath of the JVM
+<!-- this must be loaded by the osgi container
+*and* the corresponing alpn jar has to be on the boot classpath of the JVM (-Xbootclasspath)
-->
<plugin
id="org.eclipse.jetty.osgi.alpn.fragment"
@@ -222,6 +222,13 @@
unpack="false"/>
<plugin
+ id="org.eclipse.jetty.alpn.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jetty.http2.client.http"
download-size="0"
install-size="0"
diff --git a/pom.xml b/pom.xml
index 983b32d..e222c0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,11 @@
<version>${jetty-version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-server</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<version>${jetty-version}</version>
@@ -488,6 +493,12 @@
<classifier>sources</classifier>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-server</artifactId>
+ <version>${jetty-version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<version>${jetty-version}</version>
