mirror of https://github.com/grpc/grpc-java.git
interop-testing: Remove useless tcnative configuration
It doesn't do anything, since tcnative has been specified as a normal dependency for a while.
This commit is contained in:
parent
2131dfe6f4
commit
e67b6027af
|
|
@ -195,7 +195,6 @@ subprojects {
|
|||
// Define a separate configuration for managing the dependency on Jetty ALPN agent.
|
||||
configurations {
|
||||
alpnagent
|
||||
tcnative
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
@ -205,9 +204,6 @@ subprojects {
|
|||
// Configuration for modules that use Jetty ALPN agent
|
||||
alpnagent libraries.jetty_alpn_agent
|
||||
|
||||
// Configuration for modules that use Netty tcnative (for OpenSSL).
|
||||
tcnative libraries.netty_tcnative
|
||||
|
||||
// The ErrorProne plugin defaults to the latest, which would break our
|
||||
// build if error prone releases a new version with a new check
|
||||
errorprone 'com.google.errorprone:error_prone_core:2.0.15'
|
||||
|
|
|
|||
|
|
@ -23,19 +23,6 @@ test {
|
|||
jvmArgs "-javaagent:" + configurations.alpnagent.asPath
|
||||
}
|
||||
|
||||
// The application plugin uses the distribution plugin and configures the jars to be
|
||||
// placed into the "lib" folder. Since we don't include netty_tcnative as a dependency,
|
||||
// we have to manually copy it into the lib folder so that it's available to the scripts.
|
||||
distributions {
|
||||
main {
|
||||
contents {
|
||||
from(configurations.tcnative) {
|
||||
into "lib"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// For the generated scripts, use Netty tcnative (i.e. OpenSSL).
|
||||
// Note that OkHttp currently only supports ALPN, so OpenSSL version >= 1.0.2 is required.
|
||||
|
||||
|
|
@ -43,28 +30,28 @@ task test_client(type: CreateStartScripts) {
|
|||
mainClassName = "io.grpc.testing.integration.TestServiceClient"
|
||||
applicationName = "test-client"
|
||||
outputDir = new File(project.buildDir, 'tmp')
|
||||
classpath = jar.outputs.files + configurations.runtime + configurations.tcnative
|
||||
classpath = jar.outputs.files + configurations.runtime
|
||||
}
|
||||
|
||||
task test_server(type: CreateStartScripts) {
|
||||
mainClassName = "io.grpc.testing.integration.TestServiceServer"
|
||||
applicationName = "test-server"
|
||||
outputDir = new File(project.buildDir, 'tmp')
|
||||
classpath = jar.outputs.files + configurations.runtime + configurations.tcnative
|
||||
classpath = jar.outputs.files + configurations.runtime
|
||||
}
|
||||
|
||||
task reconnect_test_client(type: CreateStartScripts) {
|
||||
mainClassName = "io.grpc.testing.integration.ReconnectTestClient"
|
||||
applicationName = "reconnect-test-client"
|
||||
outputDir = new File(project.buildDir, 'tmp')
|
||||
classpath = jar.outputs.files + configurations.runtime + configurations.tcnative
|
||||
classpath = jar.outputs.files + configurations.runtime
|
||||
}
|
||||
|
||||
task stresstest_client(type: CreateStartScripts) {
|
||||
mainClassName = "io.grpc.testing.integration.StressTestClient"
|
||||
applicationName = "stresstest-client"
|
||||
outputDir = new File(project.buildDir, 'tmp')
|
||||
classpath = jar.outputs.files + configurations.runtime + configurations.tcnative
|
||||
classpath = jar.outputs.files + configurations.runtime
|
||||
defaultJvmOpts = ["-verbose:gc", "-XX:+PrintFlagsFinal"]
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue