[beam] branch release-2.30.0 updated: update tag to 2.30.0 with no prefix for FnAPI

[heejong]

This is an automated email from the ASF dual-hosted git repository.

heejong pushed a commit to branch release-2.30.0
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/release-2.30.0 by this push:
     new 324e366  update tag to 2.30.0 with no prefix for FnAPI
     new 898d1ac  Merge pull request #14884 from emilymye/release-2.30.0
324e366 is described below

commit 324e3668cbc148f709b14ad2f467e57bdb277e35
Author: Emily Ye <emil...@google.com>
AuthorDate: Tue May 25 15:06:29 2021 -0700

    update tag to 2.30.0 with no prefix for FnAPI
---
 release/src/main/scripts/set_version.sh         | 2 +-
 runners/google-cloud-dataflow-java/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/src/main/scripts/set_version.sh 
b/release/src/main/scripts/set_version.sh
index 72af526..8b02d7b 100755
--- a/release/src/main/scripts/set_version.sh
+++ b/release/src/main/scripts/set_version.sh
@@ -77,7 +77,7 @@ if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then
   sed -i -e "s/sdk_version=.*/sdk_version=$TARGET_VERSION/" gradle.properties
   sed -i -e "s/SdkVersion = .*/SdkVersion = \"$TARGET_VERSION\"/" 
sdks/go/pkg/beam/core/core.go
   # TODO: [BEAM-4767]
-  sed -i -e "s/'dataflow.fnapi_container_version' : 
.*/'dataflow.fnapi_container_version' : 'beam-${TARGET_VERSION}'/" 
runners/google-cloud-dataflow-java/build.gradle
+  sed -i -e "s/'dataflow.fnapi_container_version' : 
.*/'dataflow.fnapi_container_version' : '${TARGET_VERSION}'/" 
runners/google-cloud-dataflow-java/build.gradle
   sed -i -e "s/'dataflow.legacy_container_version' : 
.*/'dataflow.legacy_container_version' : 'beam-${TARGET_VERSION}'/" 
runners/google-cloud-dataflow-java/build.gradle
 else
   # For snapshot version:
diff --git a/runners/google-cloud-dataflow-java/build.gradle 
b/runners/google-cloud-dataflow-java/build.gradle
index 6175c30..49c9d8a 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -46,7 +46,7 @@ processResources {
     'dataflow.legacy_environment_major_version' : '8',
     'dataflow.fnapi_environment_major_version' : '8',
     'dataflow.legacy_container_version' : 'beam-2.30.0',
-    'dataflow.fnapi_container_version' : 'beam-2.30.0',
+    'dataflow.fnapi_container_version' : '2.30.0',
     'dataflow.container_base_repository' : 'gcr.io/cloud-dataflow/v1beta3',
   ]
 }