You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/11/17 22:29:50 UTC
[19/50] [abbrv] beam git commit: Filter resources to set dataflow
environrment versions in beam-runners-google-cloud-dataflow-java
Filter resources to set dataflow environrment versions in beam-runners-google-cloud-dataflow-java
Matching maven behavior
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/348e660b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/348e660b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/348e660b
Branch: refs/heads/master
Commit: 348e660bf0ee3ca81d5341c85f3bd0c8edd4f554
Parents: 23b9d02
Author: Anton Kedin <ke...@google.com>
Authored: Thu Nov 2 16:19:07 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:15 2017 -0800
----------------------------------------------------------------------
runners/google-cloud-dataflow-java/build.gradle | 8 ++++++++
.../org/apache/beam/runners/dataflow/dataflow.properties | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/348e660b/runners/google-cloud-dataflow-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 829f939..08c3273 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -33,6 +33,14 @@ evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-google-cloud-platform-core")
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
+processResources {
+ filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
+ 'dataflow.legacy_environment_major_version' : '6',
+ 'dataflow.fnapi_environment_major_version' : '1',
+ 'dataflow.container_version' : 'beam-master-20170926'
+ ]
+}
+
dependencies {
compile project(":beam-model-parent:beam-model-pipeline")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
http://git-wip-us.apache.org/repos/asf/beam/blob/348e660b/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties b/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
index ac68970..7d4bdf0 100644
--- a/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
+++ b/runners/google-cloud-dataflow-java/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
@@ -16,6 +16,6 @@
#
# Dataflow runtime properties
-legacy.environment.major.version=${dataflow.legacy_environment_major_version}
-fnapi.environment.major.version=${dataflow.fnapi_environment_major_version}
-container.version=${dataflow.container_version}
+legacy.environment.major.version=@dataflow.legacy_environment_major_version@
+fnapi.environment.major.version=@dataflow.fnapi_environment_major_version@
+container.version=@dataflow.container_version@