Skip to content

Commit 81d4b6b

Browse files
arjantijmsarjantijms
authored
Merge pull request #42 from Ladicek/new-openjdk-alpn
fix Jetty ALPN usage on newer OpenJDK releases
2 parents edd3ca2 + 99e9e7b commit 81d4b6b

File tree

1 file changed

+96
-3
lines changed

1 file changed

+96
-3
lines changed

‎servlet/http2/pom.xml

+96-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<name>Java EE 8 Samples: Servlet - http2</name>
1515

1616
<properties>
17-
<jetty-version>9.4.11.v20180605</jetty-version>
17+
<jetty-version>9.4.28.v20200408</jetty-version>
1818
</properties>
1919

2020
<dependencies>
@@ -46,25 +46,27 @@
4646
</dependencies>
4747

4848
<!-- ALPN profiles are needed to ensure that the correct ALPN version is used -->
49+
<!-- note that 8u251 and above have ALPN support built-in and the Jetty ALPN JAR should not be present -->
4950
<profiles>
5051
<profile>
5152
<id>alpn-when-jdk8</id>
5253
<activation>
5354
<jdk>1.8</jdk>
5455
</activation>
5556
<properties>
56-
<!-- default is the newest possible, supports 8u161 to 8u191 -->
57+
<!-- default is the newest possible, supports 8u191 to 8u242 -->
5758
<alpn.version>8.1.13.v20181017</alpn.version>
5859
<bootclasspathPrefix>
5960
${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
6061
</bootclasspathPrefix>
62+
<surefireArgLine>-Xbootclasspath/p:${bootclasspathPrefix}</surefireArgLine>
6163
</properties>
6264
<build>
6365
<plugins>
6466
<plugin>
6567
<artifactId>maven-surefire-plugin</artifactId>
6668
<configuration>
67-
<argLine>-Xbootclasspath/p:${bootclasspathPrefix}</argLine>
69+
<argLine>${surefireArgLine}</argLine>
6870
</configuration>
6971
<dependencies>
7072
<dependency>
@@ -410,6 +412,97 @@
410412
<alpn.version>8.1.13.v20181017</alpn.version>
411413
</properties>
412414
</profile>
415+
<profile>
416+
<id>alpn-when-jdk8_211</id>
417+
<activation>
418+
<jdk>1.8.0_211</jdk>
419+
</activation>
420+
<properties>
421+
<alpn.version>8.1.13.v20181017</alpn.version>
422+
</properties>
423+
</profile>
424+
<profile>
425+
<id>alpn-when-jdk8_212</id>
426+
<activation>
427+
<jdk>1.8.0_212</jdk>
428+
</activation>
429+
<properties>
430+
<alpn.version>8.1.13.v20181017</alpn.version>
431+
</properties>
432+
</profile>
433+
<profile>
434+
<id>alpn-when-jdk8_221</id>
435+
<activation>
436+
<jdk>1.8.0_221</jdk>
437+
</activation>
438+
<properties>
439+
<alpn.version>8.1.13.v20181017</alpn.version>
440+
</properties>
441+
</profile>
442+
<profile>
443+
<id>alpn-when-jdk8_222</id>
444+
<activation>
445+
<jdk>1.8.0_222</jdk>
446+
</activation>
447+
<properties>
448+
<alpn.version>8.1.13.v20181017</alpn.version>
449+
</properties>
450+
</profile>
451+
<profile>
452+
<id>alpn-when-jdk8_231</id>
453+
<activation>
454+
<jdk>1.8.0_231</jdk>
455+
</activation>
456+
<properties>
457+
<alpn.version>8.1.13.v20181017</alpn.version>
458+
</properties>
459+
</profile>
460+
<profile>
461+
<id>alpn-when-jdk8_232</id>
462+
<activation>
463+
<jdk>1.8.0_232</jdk>
464+
</activation>
465+
<properties>
466+
<alpn.version>8.1.13.v20181017</alpn.version>
467+
</properties>
468+
</profile>
469+
<profile>
470+
<id>alpn-when-jdk8_241</id>
471+
<activation>
472+
<jdk>1.8.0_241</jdk>
473+
</activation>
474+
<properties>
475+
<alpn.version>8.1.13.v20181017</alpn.version>
476+
</properties>
477+
</profile>
478+
<profile>
479+
<id>alpn-when-jdk8_242</id>
480+
<activation>
481+
<jdk>1.8.0_242</jdk>
482+
</activation>
483+
<properties>
484+
<alpn.version>8.1.13.v20181017</alpn.version>
485+
</properties>
486+
</profile>
487+
488+
<profile>
489+
<id>alpn-when-jdk8_251</id>
490+
<activation>
491+
<jdk>1.8.0_251</jdk>
492+
</activation>
493+
<properties>
494+
<surefireArgLine/>
495+
</properties>
496+
</profile>
497+
<profile>
498+
<id>alpn-when-jdk8_252</id>
499+
<activation>
500+
<jdk>1.8.0_252</jdk>
501+
</activation>
502+
<properties>
503+
<surefireArgLine/>
504+
</properties>
505+
</profile>
413506
</profiles>
414507

415508
</project>

0 commit comments

Comments
 (0)