diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index a31d55b2d3..a91c7b26e1 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -18,6 +18,10 @@ jmh { includeTests = true } +configurations { + alpnagent +} + dependencies { compile project(':grpc-core'), project(':grpc-netty'), @@ -32,6 +36,7 @@ dependencies { libraries.netty_epoll, libraries.math compileOnly libraries.javax_annotation + alpnagent libraries.jetty_alpn_agent } import net.ltgt.gradle.errorprone.CheckSeverity diff --git a/build.gradle b/build.gradle index 5360313afd..dbc0da1ee0 100644 --- a/build.gradle +++ b/build.gradle @@ -220,8 +220,6 @@ subprojects { // Define a separate configuration for managing the dependency on Jetty ALPN agent. configurations { - alpnagent - compile { // Detect Maven Enforcer's dependencyConvergence failures. We only // care for artifacts used as libraries by others. @@ -239,9 +237,6 @@ subprojects { testCompile libraries.junit, libraries.mockito, libraries.truth - - // Configuration for modules that use Jetty ALPN agent - alpnagent libraries.jetty_alpn_agent } // Disable JavaDoc doclint on Java 8. It's annoying. diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle index a1709c1964..2178705c43 100644 --- a/interop-testing/build.gradle +++ b/interop-testing/build.gradle @@ -8,6 +8,10 @@ plugins { description = "gRPC: Integration Testing" startScripts.enabled = false +configurations { + alpnagent +} + dependencies { compile project(':grpc-alts'), project(':grpc-auth'), @@ -26,6 +30,7 @@ dependencies { project(':grpc-grpclb') testCompile project(':grpc-context').sourceSets.test.output, libraries.mockito + alpnagent libraries.jetty_alpn_agent } configureProtoCompilation() diff --git a/netty/build.gradle b/netty/build.gradle index 60b7d8a750..2143c3cd47 100644 --- a/netty/build.gradle +++ b/netty/build.gradle @@ -5,6 +5,11 @@ plugins { } description = "gRPC: Netty" + +configurations { + alpnagent +} + dependencies { compile project(':grpc-core'), libraries.netty, @@ -18,6 +23,7 @@ dependencies { libraries.conscrypt, libraries.netty_epoll signature "org.codehaus.mojo.signature:java17:1.0@signature" + alpnagent libraries.jetty_alpn_agent } import net.ltgt.gradle.errorprone.CheckSeverity