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

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:
Eric Anderson 2017-02-24 17:07:08 -08:00
parent 2131dfe6f4
commit e67b6027af
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -195,7 +195,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 alpnagent
tcnative
} }
dependencies { dependencies {
@ -205,9 +204,6 @@ subprojects {
// Configuration for modules that use Jetty ALPN agent // Configuration for modules that use Jetty ALPN agent
alpnagent libraries.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 // The ErrorProne plugin defaults to the latest, which would break our
// build if error prone releases a new version with a new check // build if error prone releases a new version with a new check
errorprone 'com.google.errorprone:error_prone_core:2.0.15' errorprone 'com.google.errorprone:error_prone_core:2.0.15'

21
interop-testing/build.gradle
View File

@ -23,19 +23,6 @@ test {
jvmArgs "-javaagent:" + configurations.alpnagent.asPath 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). // 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. // 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" mainClassName = "io.grpc.testing.integration.TestServiceClient"
applicationName = "test-client" applicationName = "test-client"
outputDir = new File(project.buildDir, 'tmp') 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) { task test_server(type: CreateStartScripts) {
mainClassName = "io.grpc.testing.integration.TestServiceServer" mainClassName = "io.grpc.testing.integration.TestServiceServer"
applicationName = "test-server" applicationName = "test-server"
outputDir = new File(project.buildDir, 'tmp') 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) { task reconnect_test_client(type: CreateStartScripts) {
mainClassName = "io.grpc.testing.integration.ReconnectTestClient" mainClassName = "io.grpc.testing.integration.ReconnectTestClient"
applicationName = "reconnect-test-client" applicationName = "reconnect-test-client"
outputDir = new File(project.buildDir, 'tmp') 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) { task stresstest_client(type: CreateStartScripts) {
mainClassName = "io.grpc.testing.integration.StressTestClient" mainClassName = "io.grpc.testing.integration.StressTestClient"
applicationName = "stresstest-client" applicationName = "stresstest-client"
outputDir = new File(project.buildDir, 'tmp') 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"] defaultJvmOpts = ["-verbose:gc", "-XX:+PrintFlagsFinal"]
} }