Merge pull request #527 from dhalperi/cherry-pick-properties

Cherry pick properties and update for release.

Author: davorbonaci

pom.xml

@@ -78,6 +78,10 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 
     <beam.version>0.4.0</beam.version>
+
+    <dataflow.release_name>Google Cloud Dataflow SDK for Java</dataflow.release_name>
+    <dataflow.container_version>${project.version}</dataflow.container_version>
+    <dataflow.environment_major_version>6</dataflow.environment_major_version>
   </properties>
 
   <packaging>pom</packaging>

sdk/src/main/resources/org/apache/beam/runners/dataflow/dataflow.properties

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-environment.major.version=6
+environment.major.version=${dataflow.environment_major_version}
 
-worker.image.batch=dataflow.gcr.io/v1beta3/beam-java-batch:${project.version}-20170103
-worker.image.streaming=dataflow.gcr.io/v1beta3/beam-java-streaming:${project.version}-20170103
+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}

sdk/src/main/resources/org/apache/beam/sdk/sdk.properties

@@ -12,6 +12,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-name=Google Cloud Dataflow SDK for Java
+name=${dataflow.release_name}
 version=${pom.version}
 build.date=${timestamp}