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

Revert "Merge pull request #940 from nmittler/interop_openssl" 

This reverts commit 2aecb6f02b, reversing
changes made to 5d34599390.

The change broke OkHttp's tests
This commit is contained in:
Eric Anderson 2015-09-03 16:28:05 -07:00
parent ebe8a0d703
commit 0336a701eb
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
interop-testing/build.gradle
View File

@ -23,8 +23,7 @@ dependencies {
project(':grpc-testing'),
libraries.junit,
libraries.mockito,
libraries.oauth_client,
libraries.netty_tcnative
libraries.oauth_client
}
test {
@ -34,7 +33,6 @@ test {
task test_client(type: CreateStartScripts) {
mainClassName = "io.grpc.testing.integration.TestServiceClient"
applicationName = "test-client"
// Only used when OpenSSL is not available.
defaultJvmOpts = ["-Xbootclasspath/p:" + configurations.alpnboot.asPath]
outputDir = new File(project.buildDir, 'tmp')
classpath = jar.outputs.files + project.configurations.runtime
@ -43,7 +41,6 @@ task test_client(type: CreateStartScripts) {
task test_server(type: CreateStartScripts) {
mainClassName = "io.grpc.testing.integration.TestServiceServer"
applicationName = "test-server"
// Only used when OpenSSL is not available.
defaultJvmOpts = ["-Xbootclasspath/p:" + configurations.alpnboot.asPath]
outputDir = new File(project.buildDir, 'tmp')
classpath = jar.outputs.files + project.configurations.runtime
@ -52,7 +49,6 @@ task test_server(type: CreateStartScripts) {
task reconnect_test_client(type: CreateStartScripts) {
mainClassName = "io.grpc.testing.integration.ReconnectTestClient"
applicationName = "reconnect-test-client"
// Only used when OpenSSL is not available.
defaultJvmOpts = ["-Xbootclasspath/p:" + configurations.alpnboot.asPath]
outputDir = new File(project.buildDir, 'tmp')
classpath = jar.outputs.files + project.configurations.runtime