[
https://issues.apache.org/jira/browse/BEAM-5695?focusedWorklogId=153004&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-153004
]
ASF GitHub Bot logged work on BEAM-5695:
----------------------------------------
Author: ASF GitHub Bot
Created on: 10/Oct/18 00:56
Start Date: 10/Oct/18 00:56
Worklog Time Spent: 10m
Work Description: herohde closed pull request #6624: [BEAM-5695] Make
worker use beam project as build dependencies rather…
URL: https://github.com/apache/beam/pull/6624
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle
b/runners/google-cloud-dataflow-java/worker/build.gradle
index 3ec6df1e265..0a9a21f6476 100644
--- a/runners/google-cloud-dataflow-java/worker/build.gradle
+++ b/runners/google-cloud-dataflow-java/worker/build.gradle
@@ -55,10 +55,6 @@ def getWorkerRelocatedPath = { String suffix ->
// Following listed dependencies will be shaded only in fnapi worker, not
legacy
// worker
def sdk_provided_dependencies = [
- "org.apache.beam:beam-runners-google-cloud-dataflow-java:$version",
- "org.apache.beam:beam-sdks-java-core:$version",
-
"org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:$version",
- "org.apache.beam:beam-sdks-java-io-google-cloud-platform:$version",
google_api_services_dataflow,
library.java.avro,
library.java.google_api_client,
@@ -70,6 +66,13 @@ def sdk_provided_dependencies = [
library.java.joda_time,
]
+def sdk_provided_project_dependencies = [
+ ":beam-runners-google-cloud-dataflow-java",
+ ":beam-sdks-java-core",
+ ":beam-sdks-java-extensions-google-cloud-platform-core",
+ ":beam-sdks-java-io-google-cloud-platform",
+]
+
// Exclude unneeded dependencies when building jar
def excluded_dependencies = [
"com.google.auto.service:auto-service", // Provided scope added from
applyJavaNature
@@ -93,6 +96,9 @@ applyJavaNature(validateShadowJar: false, shadowClosure:
DEFAULT_SHADOW_CLOSURE
sdk_provided_dependencies.each {
exclude(dependency(it))
}
+ sdk_provided_project_dependencies.each {
+ exclude(project(path: it))
+ }
excluded_dependencies.each {
exclude(dependency(it))
}
@@ -159,6 +165,22 @@ configurations {
}
}
+def common_compile_project_dependencies = [
+ ":beam-model-fn-execution",
+ ":beam-model-pipeline",
+ ":beam-runners-core-construction-java",
+ ":beam-runners-core-java",
+ ":beam-runners-java-fn-execution",
+ ":beam-sdks-java-fn-execution",
+ ":beam-runners-google-cloud-dataflow-java-windmill",
+]
+
+def common_test_compile_project_dependencies = [
+ ":beam-runners-core-java",
+ ":beam-sdks-java-core",
+ ":beam-sdks-java-extensions-google-cloud-platform-core",
+]
+
dependencies {
// Set dependencies to shadow scope by default, but in a property so they can
// be downgraded when building a legacy (non-FnAPI) worker.
@@ -166,19 +188,21 @@ dependencies {
sdk_provided_dependencies.each {
provided(it)
}
+ sdk_provided_project_dependencies.each {
+ provided project(path: it, configuration: "shadow")
+ }
} else {
sdk_provided_dependencies.each {
shadow(it)
}
+ sdk_provided_project_dependencies.each {
+ shadow project(path: it, configuration: "shadow")
+ }
}
- compile "org.apache.beam:beam-model-fn-execution:$version"
- compile "org.apache.beam:beam-model-pipeline:$version"
- compile "org.apache.beam:beam-runners-core-construction-java:$version"
- compile "org.apache.beam:beam-runners-core-java:$version"
- compile "org.apache.beam:beam-runners-java-fn-execution:$version"
- compile "org.apache.beam:beam-sdks-java-fn-execution:$version"
- compile project(path: ":beam-runners-google-cloud-dataflow-java-windmill",
configuration: "shadow")
+ common_compile_project_dependencies.each {
+ compile project(path: it, configuration: "shadow")
+ }
compile library.java.guava
compile library.java.slf4j_api
@@ -191,10 +215,11 @@ dependencies {
runtime library.java.slf4j_jdk14
- testCompile "org.apache.beam:beam-runners-core-java:$version:tests"
- testCompile "org.apache.beam:beam-runners-direct-java:$version"
- testCompile "org.apache.beam:beam-sdks-java-core:$version:tests"
- testCompile
"org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:$version:tests"
+ common_test_compile_project_dependencies.each {
+ testCompile project(path: it, configuration: "shadowTest")
+ }
+
+ testCompile project(path: ":beam-runners-direct-java", configuration:
"shadow")
testCompile library.java.guava_testlib
testCompile library.java.hamcrest_core
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 153004)
Time Spent: 20m (was: 10m)
> dataflow worker jar should built against beam project
> -----------------------------------------------------
>
> Key: BEAM-5695
> URL: https://issues.apache.org/jira/browse/BEAM-5695
> Project: Beam
> Issue Type: Bug
> Components: runner-dataflow
> Reporter: Boyuan Zhang
> Assignee: Boyuan Zhang
> Priority: Major
> Time Spent: 20m
> Remaining Estimate: 0h
>
> The purpose is to address what Robert commented inÂ
> https://github.com/apache/beam/pull/6561
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
