grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump Jetty ALPN to 2.0.10 for Java 8u252 

Since Travis in on Java 8u252, we won't actually be testing Jetty ALPN at this
point. We're also not testing the Java 9 ALPN API on Java 8, since our current
version of Netty doesn't support it (but an upgrade is available that does).
This commit is contained in:
Eric Anderson 2020-06-25 07:13:17 -07:00 committed by Eric Anderson
parent e9ea70935b
commit 8400b17200
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -185,7 +185,7 @@ subprojects {
math: 'org.apache.commons:commons-math3:3.6', math: 'org.apache.commons:commons-math3:3.6',
// Jetty ALPN dependencies // Jetty ALPN dependencies
jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.9' jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.10'
] ]
// A util function to config guava dependency with transitive dependencies // A util function to config guava dependency with transitive dependencies

4
netty/src/test/java/io/grpc/netty/TlsTest.java
View File

@ -114,6 +114,10 @@ public class TlsTest {
// Java 9+ // Java 9+
} catch (ClassNotFoundException ignored) { } catch (ClassNotFoundException ignored) {
// Before Java 9 // Before Java 9
// TODO(ejona): remove this assume once we upgrade to Netty 4.1.50.Final. GrpcSslContexts
// detects the Java 9 ALPN API in Java 8 u252, but Netty does not support it in our
// current version
Assume.assumeTrue("Jetty ALPN not found", JettyTlsUtil.isJettyAlpnConfigured());
try { try {
GrpcSslContexts.configure(SslContextBuilder.forClient(), jdkProvider); GrpcSslContexts.configure(SslContextBuilder.forClient(), jdkProvider);
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {