From 0336a701eb0deae9dc1a9aef60e398f116bf0e12 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 3 Sep 2015 16:28:05 -0700 Subject: [PATCH] Revert "Merge pull request #940 from nmittler/interop_openssl" This reverts commit 2aecb6f02b53ea6c8e63e6ba1f17a1315adaed66, reversing changes made to 5d3459939012b65add792f989c6cbfdea483b5dd. The change broke OkHttp's tests --- interop-testing/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle index 210cc583e5..6c60c38b55 100644 --- a/interop-testing/build.gradle +++ b/interop-testing/build.gradle @@ -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