clean up some non-shadow stragglers (apache#11917)

yirutang · Jul 23, 2020 · 0586136 · 0586136
1 parent 0573e44
commit 0586136
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
@@ -64,5 +64,5 @@ dependencies {
   testCompile library.java.junit
   testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version"
   testRuntimeOnly library.java.slf4j_jdk14
-  testRuntimeOnly project(":runners:direct-java")
+  testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
 }
diff --git a/sdks/java/io/thrift/build.gradle b/sdks/java/io/thrift/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     testCompile "com.google.code.gson:gson:2.8.6"
     testCompile "commons-io:commons-io:2.6"
     testRuntimeOnly library.java.slf4j_jdk14
-    testRuntimeOnly project(":runners:direct-java")
+    testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
 }
 /*
 Removed due to lack of Thrift on Jenkins workers.

diff --git a/sdks/java/testing/load-tests/build.gradle b/sdks/java/testing/load-tests/build.gradle
@@ -41,6 +41,7 @@ def runnerDependency = (project.hasProperty(runnerProperty)
 
 def shouldProvideSpark = ":runners:spark".equals(runnerDependency)
 def isDataflowRunner = ":runners:google-cloud-dataflow-java".equals(runnerDependency)
+def runnerConfiguration = ":runners:direct-java".equals(runnerDependency) ? "shadow" : null
 
 if (isDataflowRunner) {
   /*
@@ -70,7 +71,7 @@ dependencies {
   compile project(":sdks:java:io:kinesis")
 
   gradleRun project(project.path)
-  gradleRun project(runnerDependency)
+  gradleRun project(path: runnerDependency, configuration: runnerConfiguration)
 
   // The Spark runner requires the user to provide a Spark dependency. For self-contained
   // runs with the Spark runner, we can provide such a dependency. This is deliberately phrased

diff --git a/sdks/java/testing/nexmark/build.gradle b/sdks/java/testing/nexmark/build.gradle
@@ -35,6 +35,7 @@ def nexmarkRunnerDependency = project.findProperty(nexmarkRunnerProperty)
         ?: ":runners:direct-java"
 def shouldProvideSpark = ":runners:spark".equals(nexmarkRunnerDependency)
 def isDataflowRunner = ":runners:google-cloud-dataflow-java".equals(nexmarkRunnerDependency)
+def runnerConfiguration = ":runners:direct-java".equals(nexmarkRunnerDependency) ? "shadow" : null
 
 if (isDataflowRunner) {
   /*
@@ -77,7 +78,7 @@ dependencies {
   testCompile library.java.hamcrest_library
 
   gradleRun project(project.path)
-  gradleRun project(nexmarkRunnerDependency)
+  gradleRun project(path: nexmarkRunnerDependency, configuration: runnerConfiguration)
 
   // The Spark runner requires the user to provide a Spark dependency. For self-contained
   // runs with the Spark runner, we can provide such a dependency. This is deliberately phrased