mirror of https://github.com/grpc/grpc-java.git
Move ALPN Agent configuration to each project needing it
This commit is contained in:
parent
5b838e5284
commit
3b29f74271
|
@ -18,6 +18,10 @@ jmh {
|
||||||
includeTests = true
|
includeTests = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
alpnagent
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':grpc-core'),
|
compile project(':grpc-core'),
|
||||||
project(':grpc-netty'),
|
project(':grpc-netty'),
|
||||||
|
@ -32,6 +36,7 @@ dependencies {
|
||||||
libraries.netty_epoll,
|
libraries.netty_epoll,
|
||||||
libraries.math
|
libraries.math
|
||||||
compileOnly libraries.javax_annotation
|
compileOnly libraries.javax_annotation
|
||||||
|
alpnagent libraries.jetty_alpn_agent
|
||||||
}
|
}
|
||||||
|
|
||||||
import net.ltgt.gradle.errorprone.CheckSeverity
|
import net.ltgt.gradle.errorprone.CheckSeverity
|
||||||
|
|
|
@ -220,8 +220,6 @@ subprojects {
|
||||||
|
|
||||||
// Define a separate configuration for managing the dependency on Jetty ALPN agent.
|
// Define a separate configuration for managing the dependency on Jetty ALPN agent.
|
||||||
configurations {
|
configurations {
|
||||||
alpnagent
|
|
||||||
|
|
||||||
compile {
|
compile {
|
||||||
// Detect Maven Enforcer's dependencyConvergence failures. We only
|
// Detect Maven Enforcer's dependencyConvergence failures. We only
|
||||||
// care for artifacts used as libraries by others.
|
// care for artifacts used as libraries by others.
|
||||||
|
@ -239,9 +237,6 @@ subprojects {
|
||||||
testCompile libraries.junit,
|
testCompile libraries.junit,
|
||||||
libraries.mockito,
|
libraries.mockito,
|
||||||
libraries.truth
|
libraries.truth
|
||||||
|
|
||||||
// Configuration for modules that use Jetty ALPN agent
|
|
||||||
alpnagent libraries.jetty_alpn_agent
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable JavaDoc doclint on Java 8. It's annoying.
|
// Disable JavaDoc doclint on Java 8. It's annoying.
|
||||||
|
|
|
@ -8,6 +8,10 @@ plugins {
|
||||||
description = "gRPC: Integration Testing"
|
description = "gRPC: Integration Testing"
|
||||||
startScripts.enabled = false
|
startScripts.enabled = false
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
alpnagent
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':grpc-alts'),
|
compile project(':grpc-alts'),
|
||||||
project(':grpc-auth'),
|
project(':grpc-auth'),
|
||||||
|
@ -26,6 +30,7 @@ dependencies {
|
||||||
project(':grpc-grpclb')
|
project(':grpc-grpclb')
|
||||||
testCompile project(':grpc-context').sourceSets.test.output,
|
testCompile project(':grpc-context').sourceSets.test.output,
|
||||||
libraries.mockito
|
libraries.mockito
|
||||||
|
alpnagent libraries.jetty_alpn_agent
|
||||||
}
|
}
|
||||||
|
|
||||||
configureProtoCompilation()
|
configureProtoCompilation()
|
||||||
|
|
|
@ -5,6 +5,11 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
description = "gRPC: Netty"
|
description = "gRPC: Netty"
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
alpnagent
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':grpc-core'),
|
compile project(':grpc-core'),
|
||||||
libraries.netty,
|
libraries.netty,
|
||||||
|
@ -18,6 +23,7 @@ dependencies {
|
||||||
libraries.conscrypt,
|
libraries.conscrypt,
|
||||||
libraries.netty_epoll
|
libraries.netty_epoll
|
||||||
signature "org.codehaus.mojo.signature:java17:1.0@signature"
|
signature "org.codehaus.mojo.signature:java17:1.0@signature"
|
||||||
|
alpnagent libraries.jetty_alpn_agent
|
||||||
}
|
}
|
||||||
|
|
||||||
import net.ltgt.gradle.errorprone.CheckSeverity
|
import net.ltgt.gradle.errorprone.CheckSeverity
|
||||||
|
|
Loading…
Reference in New Issue