Repository: beam Updated Branches: refs/heads/master bf9d45429 -> 979c9376f
DataflowRunner: move source for properties into pom Also drop unused properties that are now in the root pom.xml. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e95335f0 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e95335f0 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e95335f0 Branch: refs/heads/master Commit: e95335f0f6a94ebe257d8d5ce82bb82205dca95c Parents: bf9d454 Author: Dan Halperin <[email protected]> Authored: Wed Jan 25 07:50:57 2017 -0800 Committer: Dan Halperin <[email protected]> Committed: Wed Jan 25 10:40:13 2017 -0800 ---------------------------------------------------------------------- runners/google-cloud-dataflow-java/pom.xml | 4 ++-- .../org/apache/beam/runners/dataflow/dataflow.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/e95335f0/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 1d05193..eea5502 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -33,8 +33,8 @@ <packaging>jar</packaging> <properties> - <timestamp>${maven.build.timestamp}</timestamp> - <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format> + <dataflow.container_version>beam-master-20170120</dataflow.container_version> + <dataflow.environment_major_version>6</dataflow.environment_major_version> </properties> <build> http://git-wip-us.apache.org/repos/asf/beam/blob/e95335f0/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 9976ed9..47e316c 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,8 +16,8 @@ # # Dataflow runtime properties -environment.major.version=6 +environment.major.version=${dataflow.environment_major_version} -worker.image.batch=dataflow.gcr.io/v1beta3/beam-java-batch:beam-master-20170120 +worker.image.batch=dataflow.gcr.io/v1beta3/beam-java-batch:${dataflow.container_version} -worker.image.streaming=dataflow.gcr.io/v1beta3/beam-java-streaming:beam-master-20170120 +worker.image.streaming=dataflow.gcr.io/v1beta3/beam-java-streaming:${dataflow.container_version}
