Skip to content

Commit

Permalink
Revert "Merge pull request #940 from nmittler/interop_openssl"
Browse files Browse the repository at this point in the history
This reverts commit 2aecb6f, reversing
changes made to 5d34599.

The change broke OkHttp's tests
  • Loading branch information
ejona86 committed Sep 3, 2015
1 parent ebe8a0d commit 0336a70
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions interop-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ dependencies {
project(':grpc-testing'),
libraries.junit,
libraries.mockito,
libraries.oauth_client,
libraries.netty_tcnative
libraries.oauth_client
}

test {
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 0336a70

Please sign in to comment.