Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BEAM-8602] Use shadow configuration for remaining DirectRunner dependencies #11917

Merged
merged 1 commit into from Jun 4, 2020
Merged

[BEAM-8602] Use shadow configuration for remaining DirectRunner dependencies #11917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle
View file
Open in desktop
Expand Up @@ -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")
}
2 changes: 1 addition & 1 deletion sdks/java/io/thrift/build.gradle
View file
Open in desktop
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion sdks/java/testing/load-tests/build.gradle
View file
Open in desktop
Expand Up @@ -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) {
/*
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion sdks/java/testing/nexmark/build.gradle
View file
Open in desktop
Expand Up @@ -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) {
/*
Expand Down Expand Up @@ -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
Expand Down