From 48662bf41d84a763c324d4fe3376ba0cc2d202b0 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Thu, 27 Aug 2015 13:32:21 -0700 Subject: [PATCH] Build fails with java 1.8_u60 Motivation: The alpn / npn dependency versions are dependent on java version. If a java version 1.8+ is used that is not explicitly listed in the pom file then ALPN tests will fail because the java 1.7 version of alpn will be loaded by out pom file. Modifications: - Ensure there is a latest version to fall back up for npn 1.7+ - Ensure there is a latest version to fall back upon from alpn 1.8+ Result: Build can complete despite having a newer jdk which is not listed in our pom file. --- pom.xml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 308e5d68a0..9cd5d0df52 100644 --- a/pom.xml +++ b/pom.xml @@ -180,28 +180,31 @@ See: http://www.eclipse.org/jetty/documentation/current/alpn-chapter.html#alpn-versions --> - npn-alpn-7 + alpn-7latest - - java.version - 1.7 - + [1.7,1.8) - ${jetty.npn.version.latest} - ${jetty.alpn.version.latest7} + 7.1.3.v20150130 - alpn-8 + npn-latest - - java.version - 1.8 - + + [1.7,) - ${jetty.alpn.version.latest8} + 1.1.11.v20150415 + + + + alpn-8latest + + [1.8,) + + + 8.1.4.v20150727 @@ -588,12 +591,7 @@ UTF-8 UTF-8 1.3.18.GA - 1.1.11.v20150415 - 7.1.3.v20150130 - 8.1.4.v20150727 - ${jetty.npn.version.latest} ${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${jetty.npn.version}/npn-boot-${jetty.npn.version}.jar - ${jetty.alpn.version.latest7} ${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${jetty.alpn.version}/alpn-boot-${jetty.alpn.version}.jar -server