Merge pull request #575 from dhalperi/master

dataflow.properties: update for new configuration in Apache Beam 2.0.0

Author: dhalperi

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>

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}