From e08f5c0a18422afba35ba34ec7d27f0a49ea0313 Mon Sep 17 00:00:00 2001
From: Dan Halperin <dhalperi@google.com>
Date: Tue, 23 May 2017 11:46:07 -0700
Subject: [PATCH] dataflow.properties: update for new configuration in Apache
 Beam 2.0.0

See https://github.com/apache/beam/commit/b6508977e56e18903f2224e3a2a4ad9816ea1c89\#diff-2dcc904003e8cbcbf02e330b8be4c7db
---
 pom.xml                                                    | 3 ++-
 .../org/apache/beam/runners/dataflow/dataflow.properties   | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index db4451e1e6..de3af83152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,8 @@
 
     <dataflow.release_name>Google Cloud Dataflow SDK for Java</dataflow.release_name>
     <dataflow.container_version>${project.version}-20170517</dataflow.container_version>
-    <dataflow.environment_major_version>6</dataflow.environment_major_version>
+    <dataflow.legacy_environment_major_version>6</dataflow.legacy_environment_major_version>
+    <dataflow.fnapi_environment_major_version>1</dataflow.fnapi_environment_major_version>
   </properties>
 
   <packaging>pom</packaging>
diff --git a/sdk/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties b/sdk/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
index d499ad6699..699990047c 100644
--- a/sdk/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
+++ b/sdk/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-environment.major.version=${dataflow.environment_major_version}
-
-worker.image.batch=dataflow.gcr.io/v1beta3/beam-java-batch:${dataflow.container_version}
-worker.image.streaming=dataflow.gcr.io/v1beta3/beam-java-streaming:${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}