From 7cfc5105ab3cd3d3b8a6e98eb09e4d5265a9c02c Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Wed, 15 May 2024 20:37:44 +0000
Subject: [PATCH 01/27] chore: adapt `generate-showcase.sh` to hermetic build
 scripts

---
 .../scripts/generate-showcase.sh              | 86 ++++++++++++++++---
 1 file changed, 73 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index cc91c03b04..5635dbd9f9 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -1,5 +1,4 @@
-#!/bin/bash
-set -e
+set -ex
 
 # To VERIFY: ./scripts/generate-showcase.sh
 # To UPDATE: /scripts/generate-showcase.sh -u
@@ -63,28 +62,87 @@ function generate_showcase_spring_starter(){
   fi
 
   # Clone sdk-platform-java (with showcase library)
-  git clone https://github.com/googleapis/sdk-platform-java.git
+  if [[ ! -d "./sdk-platform-java" ]]; then
+    git clone https://github.com/googleapis/sdk-platform-java.git
+  fi
   cd sdk-platform-java && git checkout "v${GAPIC_GENERATOR_JAVA_VERSION}"
 
+  # We will use the generation tools from library_generation
+  pushd library_generation/utils
+  source utilities.sh
+  popd #library_generation/utils
+
   # Install showcase client libraries locally
-  cd showcase && mvn clean install
+  pushd showcase
+  # mvn clean install
   GAPIC_SHOWCASE_CLIENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 
+  pushd gapic-showcase
+  GAPIC_SHOWCASE_SERVER_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
+  popd #showcase/gapic-showcase
+
   # Alternative: if showcase client library is available on Maven Central,
   # Instead of downloading sdk-platform-java/showcase (for client library, and generation setup),
   # Can instead download googleapis (for generation setup) and gapic-showcase (for protos)
 
-  # Modify sdk-platform-java/WORKSPACE
-  modify_workspace_file "../WORKSPACE" ".." "../../scripts/resources/googleapis_modification_string.txt"
-  # Modify sdk-platform-java/showcase/BUILD.bazel
-  buildozer 'new_load @spring_cloud_generator//:java_gapic_spring.bzl java_gapic_spring_library' BUILD.bazel:__pkg__
-  modify_build_file "BUILD.bazel"
+  output_folder=$(get_output_folder)
+  mkdir "${output_folder}"
+  pushd "${output_folder}"
+  protoc_version=$(get_protoc_version "${GAPIC_GENERATOR_JAVA_VERSION}")
+  os_architecture=$(detect_os_architecture)
+  download_protoc "${protoc_version}" "${os_architecture}"
+
+  # We now copy the spring-cloud-generator jar into the output_folder the
+  # sdk-platform-java generation scripts work with.
+  spring_generator_jar_name="spring-cloud-generator-${PROJECT_VERSION}.jar"
+  cp ~/.m2/repository/com/google/cloud/spring-cloud-generator/"${PROJECT_VERSION}/${spring_generator_jar_name}" \
+    "${output_folder}"
+
+  # We download gapic-showcase and prepare the protos in output_folder
+  if [[ ! -d "./gapic-showcase" ]]; then
+    sparse_clone https://github.com/googleapis/gapic-showcase "schema/google/showcase/v1beta1"
+  fi
+  pushd gapic-showcase
+  git checkout "v${GAPIC_SHOWCASE_SERVER_VERSION}"
+  cp -r schema "${output_folder}"
+  popd #gapic-showcase
+
+  # We download googleapis and prepare the protos in output_folder
+  if [[ ! -d "./googleapis" ]]; then
+    sparse_clone https://github.com/googleapis/googleapis "google/iam/v1 google/cloud/location"
+  fi
+  pushd googleapis
+  cp -r google "${output_folder}"
+  popd #gapic-showcase
+
+  # Now we call protoc with a series of arguments we obtain from
+  # sdk-platform-java's utilities.sh and others that are hardcoded (and stable).
+  # Note that --java_gapic_spring_opt uses `get_gapic_opts` which will work
+  # since the BUILD rules take similar arguments
+
+  proto_path="schema/google/showcase/v1beta1"
+  proto_files=$(find "${proto_path}" -type f  -name "*.proto" | LC_COLLATE=C sort)
+  gapic_additional_protos="google/iam/v1/iam_policy.proto google/cloud/location/locations.proto"
+  rest_numeric_enums="false"
+  transport="grpc+rest"
+  gapic_yaml=""
+  service_config="schema/google/showcase/v1beta1/showcase_grpc_service_config.json"
+  service_yaml="schema/google/showcase/v1beta1/showcase_v1beta1.yaml"
+  include_samples="false"
+
+  "${protoc_path}"/protoc \
+    "--experimental_allow_proto3_optional" \
+    "--plugin=protoc-gen-java_gapic_spring=${output_folder}/${spring_generator_jar_name}" \
+    "--java_gapic_spring_out=${output_folder}/showcase_java_gapic_spring_raw.srcjar.zip" \
+    "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \
+    ${proto_files} ${gapic_additional_protos}
+
+  popd #output_folder
+
 
-  # Invoke bazel target for generating showcase-spring-starter
-  bazelisk build --tool_java_language_version=17 --tool_java_runtime_version=remotejdk_17 //showcase:showcase_java_gapic_spring
 
   # Post-process generated modules
-  copy_and_unzip "../bazel-bin/showcase/showcase_java_gapic_spring-spring.srcjar" "showcase_java_gapic_spring-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${SHOWCASE_STARTER_DIR}
+  copy_and_unzip "${output_folder}/showcase_java_gapic_spring-spring.srcjar" "showcase_java_gapic_spring-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${SHOWCASE_STARTER_DIR}
   modify_starter_pom ${SHOWCASE_STARTER_DIR}/pom.xml "com.google.cloud" "gapic-showcase" $PROJECT_VERSION
 
   # Additional pom.xml modifications for showcase starter
@@ -98,7 +156,9 @@ function generate_showcase_spring_starter(){
   run_formatter ${SHOWCASE_STARTER_DIR}
 
   # Remove downloaded repos
-  rm -rf ${SPRING_GENERATOR_DIR}/sdk-platform-java
+  rm -rdf ${SPRING_GENERATOR_DIR}/sdk-platform-java
+  rm -rdf gapic-showcase
+  popd #showcase
 }
 
 if [[ UPDATE -ne 0 ]]; then

From 457e5421d5b3d0d5174323682f04a5c6b6301665 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Wed, 15 May 2024 21:06:37 +0000
Subject: [PATCH 02/27] fix permission issues

---
 .../scripts/generate-showcase.sh                  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 5635dbd9f9..f6119d8350 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -52,7 +52,7 @@ function generate_showcase_spring_starter(){
 
   # Compute the parent project version.
   cd ${SPRING_ROOT_DIR}
-  PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+  export PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
   cd ${SPRING_GENERATOR_DIR}
   GAPIC_GENERATOR_JAVA_VERSION=$(mvn help:evaluate -Dexpression=gapic-generator-java-bom.version -q -DforceStdout)
 
@@ -74,6 +74,8 @@ function generate_showcase_spring_starter(){
 
   # Install showcase client libraries locally
   pushd showcase
+  # For local development, we cleanup any traces of previous runs
+  rm -rdf output
   # mvn clean install
   GAPIC_SHOWCASE_CLIENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 
@@ -92,16 +94,15 @@ function generate_showcase_spring_starter(){
   os_architecture=$(detect_os_architecture)
   download_protoc "${protoc_version}" "${os_architecture}"
 
-  # We now copy the spring-cloud-generator jar into the output_folder the
+  # We now copy the spring-cloud-generator and gapic-generator-java jar into the output_folder the
   # sdk-platform-java generation scripts work with.
   spring_generator_jar_name="spring-cloud-generator-${PROJECT_VERSION}.jar"
   cp ~/.m2/repository/com/google/cloud/spring-cloud-generator/"${PROJECT_VERSION}/${spring_generator_jar_name}" \
     "${output_folder}"
+  chmod 555 ${output_folder}/*.jar
 
   # We download gapic-showcase and prepare the protos in output_folder
-  if [[ ! -d "./gapic-showcase" ]]; then
-    sparse_clone https://github.com/googleapis/gapic-showcase "schema/google/showcase/v1beta1"
-  fi
+  sparse_clone https://github.com/googleapis/gapic-showcase.git "schema/google/showcase/v1beta1"
   pushd gapic-showcase
   git checkout "v${GAPIC_SHOWCASE_SERVER_VERSION}"
   cp -r schema "${output_folder}"
@@ -109,7 +110,7 @@ function generate_showcase_spring_starter(){
 
   # We download googleapis and prepare the protos in output_folder
   if [[ ! -d "./googleapis" ]]; then
-    sparse_clone https://github.com/googleapis/googleapis "google/iam/v1 google/cloud/location"
+    sparse_clone https://github.com/googleapis/googleapis.git "google/iam/v1 google/cloud/location google/api google/longrunning google/rpc google/type"
   fi
   pushd googleapis
   cp -r google "${output_folder}"
@@ -132,7 +133,7 @@ function generate_showcase_spring_starter(){
 
   "${protoc_path}"/protoc \
     "--experimental_allow_proto3_optional" \
-    "--plugin=protoc-gen-java_gapic_spring=${output_folder}/${spring_generator_jar_name}" \
+    "--plugin=protoc-gen-java_gapic_spring=${SPRING_GENERATOR_DIR}/spring-cloud-generator-wrapper" \
     "--java_gapic_spring_out=${output_folder}/showcase_java_gapic_spring_raw.srcjar.zip" \
     "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \
     ${proto_files} ${gapic_additional_protos}

From 9a8b6c3c51dcec119d87b827cce84c21b0eb43ef Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Wed, 15 May 2024 21:12:21 +0000
Subject: [PATCH 03/27] add jar with dependencies and wrapper

---
 spring-cloud-generator/pom.xml                | 22 +++++++++++++++++++
 .../scripts/generate-showcase.sh              |  2 +-
 .../spring-cloud-generator-wrapper            |  6 +++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100755 spring-cloud-generator/spring-cloud-generator-wrapper

diff --git a/spring-cloud-generator/pom.xml b/spring-cloud-generator/pom.xml
index 1631c453a5..f6f8986b28 100644
--- a/spring-cloud-generator/pom.xml
+++ b/spring-cloud-generator/pom.xml
@@ -110,6 +110,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+              <artifactId>maven-assembly-plugin</artifactId>
+              <configuration>
+                <archive>
+                  <manifest>
+                    <mainClass>com.google.cloud.generator.spring.Main</mainClass>
+                  </manifest>
+                </archive>
+                <descriptorRefs>
+                  <descriptorRef>jar-with-dependencies</descriptorRef>
+                </descriptorRefs>
+              </configuration>
+              <executions>
+                <execution>
+                  <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                  <phase>package</phase> <!-- bind to the packaging phase -->
+                  <goals>
+                    <goal>single</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index f6119d8350..72861c685e 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -96,7 +96,7 @@ function generate_showcase_spring_starter(){
 
   # We now copy the spring-cloud-generator and gapic-generator-java jar into the output_folder the
   # sdk-platform-java generation scripts work with.
-  spring_generator_jar_name="spring-cloud-generator-${PROJECT_VERSION}.jar"
+  spring_generator_jar_name="spring-cloud-generator-${PROJECT_VERSION}-jar-with-dependencies.jar"
   cp ~/.m2/repository/com/google/cloud/spring-cloud-generator/"${PROJECT_VERSION}/${spring_generator_jar_name}" \
     "${output_folder}"
   chmod 555 ${output_folder}/*.jar
diff --git a/spring-cloud-generator/spring-cloud-generator-wrapper b/spring-cloud-generator/spring-cloud-generator-wrapper
new file mode 100755
index 0000000000..4e92beb6ad
--- /dev/null
+++ b/spring-cloud-generator/spring-cloud-generator-wrapper
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# Wrap spring-cloud-generator.jar because protoc requires the plugin to be executable.
+exec java -classpath "spring-cloud-generator-${PROJECT_VERSION}-jar-with-dependencies.jar" com.google.cloud.generator.spring.Main

From 57ffaf03e7bbcdb9b9687bee378c787c6d57e65c Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 01:58:04 +0000
Subject: [PATCH 04/27] remove unnecessary comments in pom

---
 spring-cloud-generator/pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-generator/pom.xml b/spring-cloud-generator/pom.xml
index f6f8986b28..f058c4aeb7 100644
--- a/spring-cloud-generator/pom.xml
+++ b/spring-cloud-generator/pom.xml
@@ -124,8 +124,8 @@
               </configuration>
               <executions>
                 <execution>
-                  <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                  <phase>package</phase> <!-- bind to the packaging phase -->
+                  <id>make-assembly</id>
+                  <phase>package</phase>
                   <goals>
                     <goal>single</goal>
                   </goals>
@@ -134,5 +134,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
\ No newline at end of file

From b146141bb7041b0e2e3acb62037057913804d8f8 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 02:11:04 +0000
Subject: [PATCH 05/27] final fixes to showcase script

---
 .../scripts/generate-showcase.sh                  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 72861c685e..685803b04d 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -65,7 +65,8 @@ function generate_showcase_spring_starter(){
   if [[ ! -d "./sdk-platform-java" ]]; then
     git clone https://github.com/googleapis/sdk-platform-java.git
   fi
-  cd sdk-platform-java && git checkout "v${GAPIC_GENERATOR_JAVA_VERSION}"
+  pushd sdk-platform-java
+  git checkout "v${GAPIC_GENERATOR_JAVA_VERSION}"
 
   # We will use the generation tools from library_generation
   pushd library_generation/utils
@@ -130,22 +131,25 @@ function generate_showcase_spring_starter(){
   service_config="schema/google/showcase/v1beta1/showcase_grpc_service_config.json"
   service_yaml="schema/google/showcase/v1beta1/showcase_v1beta1.yaml"
   include_samples="false"
+  output_srcjar_zip_name="showcase_java_gapic_spring_raw.srcjar.zip"
 
   "${protoc_path}"/protoc \
     "--experimental_allow_proto3_optional" \
     "--plugin=protoc-gen-java_gapic_spring=${SPRING_GENERATOR_DIR}/spring-cloud-generator-wrapper" \
-    "--java_gapic_spring_out=${output_folder}/showcase_java_gapic_spring_raw.srcjar.zip" \
+    "--java_gapic_spring_out=${output_folder}/${output_srcjar_zip_name}" \
     "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \
     ${proto_files} ${gapic_additional_protos}
 
-  popd #output_folder
 
 
 
   # Post-process generated modules
-  copy_and_unzip "${output_folder}/showcase_java_gapic_spring-spring.srcjar" "showcase_java_gapic_spring-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${SHOWCASE_STARTER_DIR}
+  unzip ${output_srcjar_zip_name}
+  copy_and_unzip "${output_folder}/temp-codegen-spring.srcjar" "temp-codegen-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${SHOWCASE_STARTER_DIR}
   modify_starter_pom ${SHOWCASE_STARTER_DIR}/pom.xml "com.google.cloud" "gapic-showcase" $PROJECT_VERSION
 
+  popd #output_folder
+
   # Additional pom.xml modifications for showcase starter
   # Add explicit gapic-showcase version
   sed -i'' '/^ *<artifactId>gapic-showcase<\/artifactId>*/a \ \ \ \ \ \ <version>'"$GAPIC_SHOWCASE_CLIENT_VERSION"'</version>' ${SHOWCASE_STARTER_DIR}/pom.xml
@@ -157,9 +161,10 @@ function generate_showcase_spring_starter(){
   run_formatter ${SHOWCASE_STARTER_DIR}
 
   # Remove downloaded repos
+  popd #showcase
+  popd #sdk-platform-java
   rm -rdf ${SPRING_GENERATOR_DIR}/sdk-platform-java
   rm -rdf gapic-showcase
-  popd #showcase
 }
 
 if [[ UPDATE -ne 0 ]]; then

From 495b049be13c8cf53aaee9b74dff11a451691e81 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 02:23:21 +0000
Subject: [PATCH 06/27] reformate

---
 .../scripts/generate-showcase.sh              | 85 ++++++++++---------
 .../spring-cloud-generator-wrapper            |  2 +-
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 685803b04d..2479613557 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -1,12 +1,12 @@
 set -ex
 
-# To VERIFY: ./scripts/generate-showcase.sh
-# To UPDATE: /scripts/generate-showcase.sh -u
-UPDATE=0
+# To verify: ./scripts/generate-showcase.sh
+# To update: /scripts/generate-showcase.sh -u
+update="false"
 while getopts u flag
 do
     case "${flag}" in
-        u) UPDATE=1;;
+        u) update="true";;
     esac
 done
 
@@ -14,33 +14,33 @@ done
 source ./scripts/generate-steps.sh
 
 # If not set, assume working directory is spring-cloud-generator
-if [[ -z "$SPRING_GENERATOR_DIR" ]]; then
-  SPRING_GENERATOR_DIR=`pwd`
+if [[ -z "${SPRING_GENERATOR_DIR}" ]]; then
+  SPRING_GENERATOR_DIR=$(pwd)
 fi
-SPRING_ROOT_DIR=${SPRING_GENERATOR_DIR}/..
-SHOWCASE_STARTER_OLD_DIR=${SPRING_GENERATOR_DIR}/showcase/showcase-spring-starter
-SHOWCASE_STARTER_NEW_DIR=${SPRING_GENERATOR_DIR}/showcase/showcase-spring-starter-generated
+spring_root_dir=${SPRING_GENERATOR_DIR}/..
+showcase_starter_old_dir=${SPRING_GENERATOR_DIR}/showcase/showcase-spring-starter
+showcase_starter_new_dir=${SPRING_GENERATOR_DIR}/showcase/showcase-spring-starter-generated
 
 # Verifies newly generated showcase-spring-starter against goldens
 #
 # $1 - directory containing existing showcase-spring-starter (golden)
 # $2 - directory containing newly generated showcase-spring-starter
 function verify(){
-  OLD_DIR=$1
-  NEW_DIR=$2
-  SHOWCASE_STARTER_DIFF=$(diff -r ${NEW_DIR}/src/main ${OLD_DIR}/src/main)
-  SHOWCASE_STARTER_POM_DIFF=$(diff -r ${NEW_DIR}/pom.xml ${OLD_DIR}/pom.xml)
-  if [ "$SHOWCASE_STARTER_DIFF" != "" ] || [ "$SHOWCASE_STARTER_POM_DIFF" != "" ]
+  old_dir=$1
+  new_dir=$2
+  showcase_starter_diff=$(diff -r ${new_dir}/src/main ${old_dir}/src/main)
+  showcase_starter_pom_diff=$(diff -r ${new_dir}/pom.xml ${old_dir}/pom.xml)
+  if [ "${showcase_starter_diff}" != "" ] || [ "${showcase_starter_pom_diff}" != "" ]
   then
       echo "Differences detected in generated showcase starter module: "
       echo "Diff from src/main: "
-      echo $SHOWCASE_STARTER_DIFF
+      echo "${showcase_starter_diff}"
       echo "Diff from pom.xml: "
-      echo $SHOWCASE_STARTER_POM_DIFF
+      echo "${showcase_starter_pom_diff}"
       exit 1;
   else
       echo "No differences found in showcase-spring-starter"
-      rm -r ${NEW_DIR}
+      rm -r "${new_dir}"
   fi
 }
 
@@ -48,15 +48,15 @@ function verify(){
 #
 # $1 - target directory for generated starter
 function generate_showcase_spring_starter(){
-  SHOWCASE_STARTER_DIR=$1
+  showcase_starter_dir=$1
 
   # Compute the parent project version.
-  cd ${SPRING_ROOT_DIR}
-  export PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-  cd ${SPRING_GENERATOR_DIR}
-  GAPIC_GENERATOR_JAVA_VERSION=$(mvn help:evaluate -Dexpression=gapic-generator-java-bom.version -q -DforceStdout)
+  pushd "${spring_root_dir}"
+  export project_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+  cd "${SPRING_GENERATOR_DIR}"
+  gapic_generator_java_version=$(mvn help:evaluate -Dexpression=gapic-generator-java-bom.version -q -DforceStdout)
 
-  if [[ -z "$GAPIC_GENERATOR_JAVA_VERSION" ]]; then
+  if [[ -z "${gapic_generator_java_version}" ]]; then
     echo "Missing sdk-platform-java commitish to checkout"
     exit 1
   fi
@@ -66,7 +66,7 @@ function generate_showcase_spring_starter(){
     git clone https://github.com/googleapis/sdk-platform-java.git
   fi
   pushd sdk-platform-java
-  git checkout "v${GAPIC_GENERATOR_JAVA_VERSION}"
+  git checkout "v${gapic_generator_java_version}"
 
   # We will use the generation tools from library_generation
   pushd library_generation/utils
@@ -78,10 +78,10 @@ function generate_showcase_spring_starter(){
   # For local development, we cleanup any traces of previous runs
   rm -rdf output
   # mvn clean install
-  GAPIC_SHOWCASE_CLIENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+  gapic_showcase_client_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 
   pushd gapic-showcase
-  GAPIC_SHOWCASE_SERVER_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
+  gapic_showcase_server_version=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
   popd #showcase/gapic-showcase
 
   # Alternative: if showcase client library is available on Maven Central,
@@ -91,21 +91,21 @@ function generate_showcase_spring_starter(){
   output_folder=$(get_output_folder)
   mkdir "${output_folder}"
   pushd "${output_folder}"
-  protoc_version=$(get_protoc_version "${GAPIC_GENERATOR_JAVA_VERSION}")
+  protoc_version=$(get_protoc_version "${gapic_generator_java_version}")
   os_architecture=$(detect_os_architecture)
   download_protoc "${protoc_version}" "${os_architecture}"
 
   # We now copy the spring-cloud-generator and gapic-generator-java jar into the output_folder the
   # sdk-platform-java generation scripts work with.
-  spring_generator_jar_name="spring-cloud-generator-${PROJECT_VERSION}-jar-with-dependencies.jar"
-  cp ~/.m2/repository/com/google/cloud/spring-cloud-generator/"${PROJECT_VERSION}/${spring_generator_jar_name}" \
+  spring_generator_jar_name="spring-cloud-generator-${project_version}-jar-with-dependencies.jar"
+  cp ~/.m2/repository/com/google/cloud/spring-cloud-generator/"${project_version}/${spring_generator_jar_name}" \
     "${output_folder}"
   chmod 555 ${output_folder}/*.jar
 
   # We download gapic-showcase and prepare the protos in output_folder
   sparse_clone https://github.com/googleapis/gapic-showcase.git "schema/google/showcase/v1beta1"
   pushd gapic-showcase
-  git checkout "v${GAPIC_SHOWCASE_SERVER_VERSION}"
+  git checkout "v${gapic_showcase_server_version}"
   cp -r schema "${output_folder}"
   popd #gapic-showcase
 
@@ -138,40 +138,41 @@ function generate_showcase_spring_starter(){
     "--plugin=protoc-gen-java_gapic_spring=${SPRING_GENERATOR_DIR}/spring-cloud-generator-wrapper" \
     "--java_gapic_spring_out=${output_folder}/${output_srcjar_zip_name}" \
     "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \
-    ${proto_files} ${gapic_additional_protos}
+    ${proto_files} ${gapic_additional_protos} # Do not quote because this variable should not be treated as one long string.
 
 
 
 
   # Post-process generated modules
-  unzip ${output_srcjar_zip_name}
-  copy_and_unzip "${output_folder}/temp-codegen-spring.srcjar" "temp-codegen-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${SHOWCASE_STARTER_DIR}
-  modify_starter_pom ${SHOWCASE_STARTER_DIR}/pom.xml "com.google.cloud" "gapic-showcase" $PROJECT_VERSION
+  unzip "${output_srcjar_zip_name}"
+  copy_and_unzip "${output_folder}/temp-codegen-spring.srcjar" "temp-codegen-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${showcase_starter_dir}
+  modify_starter_pom "${showcase_starter_dir}/pom.xml" "com.google.cloud" "gapic-showcase" "${project_version}"
 
   popd #output_folder
 
   # Additional pom.xml modifications for showcase starter
   # Add explicit gapic-showcase version
-  sed -i'' '/^ *<artifactId>gapic-showcase<\/artifactId>*/a \ \ \ \ \ \ <version>'"$GAPIC_SHOWCASE_CLIENT_VERSION"'</version>' ${SHOWCASE_STARTER_DIR}/pom.xml
+  sed -i'' '/^ *<artifactId>gapic-showcase<\/artifactId>*/a \ \ \ \ \ \ <version>'"${gapic_showcase_client_version}"'</version>' "${showcase_starter_dir}/pom.xml"
   # Update relative path to parent pom (different repo structure from starters)
-  RELATIVE_PATH="\ \ \ \ <relativePath>..\/..\/..\/spring-cloud-gcp-starters\/pom.xml<\/relativePath>"
-  sed -i'' 's/^ *<relativePath>.*/'"$RELATIVE_PATH"'/g' ${SHOWCASE_STARTER_DIR}/pom.xml
+  relative_path="\ \ \ \ <relativePath>..\/..\/..\/spring-cloud-gcp-starters\/pom.xml<\/relativePath>"
+  sed -i'' 's/^ *<relativePath>.*/'"${relative_path}"'/g' ${showcase_starter_dir}/pom.xml
 
   # Run google-java-format on generated code
-  run_formatter ${SHOWCASE_STARTER_DIR}
+  run_formatter "${showcase_starter_dir}"
 
   # Remove downloaded repos
   popd #showcase
   popd #sdk-platform-java
   rm -rdf ${SPRING_GENERATOR_DIR}/sdk-platform-java
   rm -rdf gapic-showcase
+  popd #spring_root_dir
 }
 
-if [[ UPDATE -ne 0 ]]; then
+if [[ "${update}" == "true" ]]; then
     echo "Running script to perform showcase-spring-starter update"
-    generate_showcase_spring_starter ${SHOWCASE_STARTER_OLD_DIR}
+    generate_showcase_spring_starter ${showcase_starter_old_dir}
   else
     echo "Running script to perform showcase-spring-starter verification"
-    generate_showcase_spring_starter ${SHOWCASE_STARTER_NEW_DIR}
-    verify ${SHOWCASE_STARTER_OLD_DIR} ${SHOWCASE_STARTER_NEW_DIR}
+    generate_showcase_spring_starter ${showcase_starter_new_dir}
+    verify ${showcase_starter_old_dir} ${showcase_starter_new_dir}
 fi
diff --git a/spring-cloud-generator/spring-cloud-generator-wrapper b/spring-cloud-generator/spring-cloud-generator-wrapper
index 4e92beb6ad..cf22d001b9 100755
--- a/spring-cloud-generator/spring-cloud-generator-wrapper
+++ b/spring-cloud-generator/spring-cloud-generator-wrapper
@@ -3,4 +3,4 @@
 set -ex
 
 # Wrap spring-cloud-generator.jar because protoc requires the plugin to be executable.
-exec java -classpath "spring-cloud-generator-${PROJECT_VERSION}-jar-with-dependencies.jar" com.google.cloud.generator.spring.Main
+exec java -classpath "spring-cloud-generator-${project_version}-jar-with-dependencies.jar" com.google.cloud.generator.spring.Main

From 6ae8d9728c556f293c07b0f3359d27abe713dde5 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 02:24:17 +0000
Subject: [PATCH 07/27] update showcase module

---
 .../ComplianceSpringAutoConfiguration.java    |  2 +-
 .../spring/ComplianceSpringProperties.java    |  2 +-
 .../spring/EchoSpringAutoConfiguration.java   | 23 ++++++++++++++++++-
 .../v1beta1/spring/EchoSpringProperties.java  | 15 +++++++++++-
 .../IdentitySpringAutoConfiguration.java      |  2 +-
 .../spring/IdentitySpringProperties.java      |  2 +-
 .../MessagingSpringAutoConfiguration.java     |  2 +-
 .../spring/MessagingSpringProperties.java     |  2 +-
 ...equenceServiceSpringAutoConfiguration.java |  2 +-
 .../SequenceServiceSpringProperties.java      |  2 +-
 .../TestingSpringAutoConfiguration.java       |  2 +-
 .../spring/TestingSpringProperties.java       |  2 +-
 .../showcase/v1beta1/spring/package-info.java |  2 +-
 13 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
index 0ce3b417bb..308594362d 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringProperties.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringProperties.java
index 718f65f7ce..efaf536aeb 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringProperties.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
index bbfb2c5f1a..45a08766e2 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,6 +159,13 @@ public EchoSettings echoSettings(
               clientSettingsBuilder.echoSettings().getRetrySettings(), serviceRetry);
       clientSettingsBuilder.echoSettings().setRetrySettings(echoRetrySettings);
 
+      RetrySettings echoErrorDetailsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.echoErrorDetailsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .echoErrorDetailsSettings()
+          .setRetrySettings(echoErrorDetailsRetrySettings);
+
       RetrySettings pagedExpandRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.pagedExpandSettings().getRetrySettings(), serviceRetry);
@@ -225,6 +232,20 @@ public EchoSettings echoSettings(
         LOGGER.trace("Configured method-level retry settings for echo from properties.");
       }
     }
+    Retry echoErrorDetailsRetry = clientProperties.getEchoErrorDetailsRetry();
+    if (echoErrorDetailsRetry != null) {
+      RetrySettings echoErrorDetailsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.echoErrorDetailsSettings().getRetrySettings(),
+              echoErrorDetailsRetry);
+      clientSettingsBuilder
+          .echoErrorDetailsSettings()
+          .setRetrySettings(echoErrorDetailsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for echoErrorDetails from properties.");
+      }
+    }
     Retry pagedExpandRetry = clientProperties.getPagedExpandRetry();
     if (pagedExpandRetry != null) {
       RetrySettings pagedExpandRetrySettings =
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringProperties.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringProperties.java
index a4df4c2a24..3a0a47e719 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringProperties.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,11 @@ public class EchoSpringProperties implements CredentialsSupplier {
    * over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry echoRetry;
+  /**
+   * Allow override of retry settings at method-level for echoErrorDetails. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry echoErrorDetailsRetry;
   /**
    * Allow override of retry settings at method-level for pagedExpand. If defined, this takes
    * precedence over service-level retry configurations for that RPC method.
@@ -136,6 +141,14 @@ public void setEchoRetry(Retry echoRetry) {
     this.echoRetry = echoRetry;
   }
 
+  public Retry getEchoErrorDetailsRetry() {
+    return this.echoErrorDetailsRetry;
+  }
+
+  public void setEchoErrorDetailsRetry(Retry echoErrorDetailsRetry) {
+    this.echoErrorDetailsRetry = echoErrorDetailsRetry;
+  }
+
   public Retry getPagedExpandRetry() {
     return this.pagedExpandRetry;
   }
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
index b545e4c783..e9e6485683 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringProperties.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringProperties.java
index 2162fa1997..675c697367 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringProperties.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java
index 491bccb950..7a1070d056 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringProperties.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringProperties.java
index b99ee36abb..9c61201611 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringProperties.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java
index b200a3fd94..571592d0ae 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringProperties.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringProperties.java
index 7ac7a9ce3f..b4e0beb04f 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringProperties.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java
index 0e0bbe227e..7b8a1b9bb4 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringProperties.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringProperties.java
index c7e20def88..03e3bf8b99 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringProperties.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/package-info.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/package-info.java
index 27730b3d94..6907d12b6c 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/package-info.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From edde192ec0fa18fb43089fd16a2ef8984d8bdf99 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 02:27:22 +0000
Subject: [PATCH 08/27] restore clean install

---
 spring-cloud-generator/scripts/generate-showcase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 2479613557..811e72cf78 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -77,7 +77,7 @@ function generate_showcase_spring_starter(){
   pushd showcase
   # For local development, we cleanup any traces of previous runs
   rm -rdf output
-  # mvn clean install
+  mvn clean install
   gapic_showcase_client_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 
   pushd gapic-showcase

From 7bef47a3d50c78df69ce86c76085a10308426825 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 02:28:24 +0000
Subject: [PATCH 09/27] restore workflow

---
 .github/workflows/showcaseTests.yaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/showcaseTests.yaml b/.github/workflows/showcaseTests.yaml
index c26760f4a9..049fe2719d 100644
--- a/.github/workflows/showcaseTests.yaml
+++ b/.github/workflows/showcaseTests.yaml
@@ -1,14 +1,12 @@
 name: Generator - Showcase Tests
 
 on:
-#  Disable auto-triggering until this issue is fixed
-#  https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2214
-#  push:
-#    branches:
-#      - main
-#  pull_request:
-#    paths:
-#      - 'spring-cloud-generator/**'
+ push:
+   branches:
+     - main
+ pull_request:
+   paths:
+     - 'spring-cloud-generator/**'
   workflow_dispatch:
 
 jobs:

From e337c6e8901d3730e939284f70e10be584522423 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 17:00:15 +0000
Subject: [PATCH 10/27] fix yaml syntax

---
 .github/workflows/showcaseTests.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/showcaseTests.yaml b/.github/workflows/showcaseTests.yaml
index 049fe2719d..c42671b02b 100644
--- a/.github/workflows/showcaseTests.yaml
+++ b/.github/workflows/showcaseTests.yaml
@@ -1,16 +1,17 @@
 name: Generator - Showcase Tests
 
 on:
- push:
-   branches:
-     - main
- pull_request:
-   paths:
-     - 'spring-cloud-generator/**'
+  push:
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'spring-cloud-generator/**'
   workflow_dispatch:
 
 jobs:
   showcaseTests:
+
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2

From b444b7c53e8d31b085be451c95a0f148fb3b1474 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 16 May 2024 17:02:48 +0000
Subject: [PATCH 11/27] simplify showcase ci

---
 .github/workflows/showcaseTests.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/showcaseTests.yaml b/.github/workflows/showcaseTests.yaml
index c42671b02b..bf8dc53f64 100644
--- a/.github/workflows/showcaseTests.yaml
+++ b/.github/workflows/showcaseTests.yaml
@@ -19,11 +19,6 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 17
-      - name: Install buildozer
-        run: |
-          go install github.com/bazelbuild/buildtools/buildozer@latest
-          export PATH=$PATH:$(go env GOPATH)/bin
-          buildozer --version
       - name: Install spring-cloud-gcp
         # Installs spring-cloud-gcp from root,
         # including spring-cloud-generator module
@@ -43,8 +38,6 @@ jobs:
         run: |
           set -x
           set -e
-          export PATH=$PATH:$(go env GOPATH)/bin
-          buildozer --version
           bash scripts/generate-showcase.sh
       - name: Unit tests for showcase-spring-starter
         # Runs showcase-spring-starter unit tests

From deb732e05f5cdc5afcfd2b73f422a350647bb73b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 14:32:36 -0400
Subject: [PATCH 12/27] chore(main): release 5.3.0 (#2888)

* chore(main): release 5.3.0

* chore(main): release 5.3.0

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                  | 19 +++++++++++++++++++
 README.adoc                                   |  4 ++--
 docs/pom.xml                                  |  2 +-
 pom.xml                                       |  2 +-
 spring-cloud-gcp-autoconfigure/pom.xml        |  2 +-
 spring-cloud-gcp-bigquery/pom.xml             |  2 +-
 spring-cloud-gcp-cloudfoundry/pom.xml         |  2 +-
 spring-cloud-gcp-core/pom.xml                 |  2 +-
 spring-cloud-gcp-data-datastore/pom.xml       |  2 +-
 spring-cloud-gcp-data-firestore/pom.xml       |  2 +-
 spring-cloud-gcp-data-spanner/pom.xml         |  2 +-
 spring-cloud-gcp-dependencies/pom.xml         |  2 +-
 spring-cloud-gcp-kms/pom.xml                  |  2 +-
 spring-cloud-gcp-logging/pom.xml              |  2 +-
 spring-cloud-gcp-native-support/pom.xml       |  2 +-
 spring-cloud-gcp-pubsub-stream-binder/pom.xml |  2 +-
 spring-cloud-gcp-pubsub/pom.xml               |  2 +-
 spring-cloud-gcp-samples/pom.xml              |  2 +-
 .../spring-cloud-gcp-alloydb-sample/pom.xml   |  2 +-
 .../spring-cloud-gcp-bigquery-sample/pom.xml  |  2 +-
 .../spring-cloud-gcp-config-sample/pom.xml    |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-data-jpa-sample/pom.xml  |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-kms-sample/pom.xml       |  2 +-
 .../spring-cloud-gcp-kotlin-samples/pom.xml   |  4 ++--
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-logging-sample/pom.xml   |  2 +-
 .../spring-cloud-gcp-metrics-sample/pom.xml   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-pubsub-sample/pom.xml    |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-sql-mysql-sample/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-trace-sample/pom.xml     |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-vision-ocr-demo/pom.xml  |  2 +-
 .../pom.xml                                   |  2 +-
 spring-cloud-gcp-secretmanager/pom.xml        |  2 +-
 spring-cloud-gcp-security-firebase/pom.xml    |  2 +-
 spring-cloud-gcp-security-iap/pom.xml         |  2 +-
 spring-cloud-gcp-starters/pom.xml             |  2 +-
 .../spring-cloud-gcp-starter-alloydb/pom.xml  |  2 +-
 .../spring-cloud-gcp-starter-bigquery/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-starter-config/pom.xml   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-starter-kms/pom.xml      |  2 +-
 .../spring-cloud-gcp-starter-logging/pom.xml  |  2 +-
 .../spring-cloud-gcp-starter-metrics/pom.xml  |  2 +-
 .../spring-cloud-gcp-starter-pubsub/pom.xml   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../spring-cloud-gcp-starter-storage/pom.xml  |  2 +-
 .../spring-cloud-gcp-starter-trace/pom.xml    |  2 +-
 .../spring-cloud-gcp-starter-vision/pom.xml   |  2 +-
 .../spring-cloud-gcp-starter/pom.xml          |  2 +-
 spring-cloud-gcp-storage/pom.xml              |  2 +-
 spring-cloud-gcp-vision/pom.xml               |  2 +-
 spring-cloud-generator/pom.xml                |  2 +-
 .../googleapis_modification_string.txt        |  2 +-
 .../showcase/showcase-spring-starter/pom.xml  |  2 +-
 .../spring-cloud-previews-template/pom.xml    |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-asset-spring-starter/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-build-spring-starter/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-dlp-spring-starter/pom.xml   |  2 +-
 .../google-cloud-dms-spring-starter/pom.xml   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-ids-spring-starter/pom.xml   |  2 +-
 .../google-cloud-iot-spring-starter/pom.xml   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-redis-spring-starter/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-shell-spring-starter/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-tasks-spring-starter/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-cloud-tpu-spring-starter/pom.xml   |  2 +-
 .../google-cloud-trace-spring-starter/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../google-iam-admin-spring-starter/pom.xml   |  2 +-
 .../google-iam-policy-spring-starter/pom.xml  |  2 +-
 .../pom.xml                                   |  2 +-
 spring-cloud-previews/pom.xml                 |  2 +-
 .../pom.xml                                   |  2 +-
 versions.txt                                  |  2 +-
 190 files changed, 210 insertions(+), 191 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05a7675bf1..2fc2d658c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,25 @@ refer to the [commit
 history](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commits/main)
 on GitHub.
 
+## [5.3.0](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v5.2.1...v5.3.0) (2024-05-15)
+
+
+### Features
+
+* [#2576](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2576) Add spring-cloud-gcp-data-spanner support for Instant values ([@ablx](https://github.com/ablx)) ([#2881](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2881)) ([7d4bb44](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/7d4bb4493423fb9c88c73125e96426ac71793a59))
+
+
+### Bug Fixes
+
+* **deps:** update dependency com.google.cloud:libraries-bom to v26.39.0 ([#2866](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2866)) ([c6d734b](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/c6d734bb87e3fc7e0b115c76ecadca2aa2e0c34f))
+* update generate-library-list.sh for duplicate api_shortnames ([#2873](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2873)) ([035f2c3](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/035f2c307c7f5634342aa419613ffa5142b72dbf))
+* update sanity-checks.sh ([#2891](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2891)) ([2bd16e5](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/2bd16e55ee967c71196ffb8bba130358b5def969))
+
+
+### Documentation
+
+* spanner support for float32 type ([#2882](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2882)) ([4aca9e6](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/commit/4aca9e6ef79d5777c51e0aab64c600e1d95186fd))
+
 ## [5.2.1](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/compare/v5.2.0...v5.2.1) (2024-05-06)
 
 
diff --git a/README.adoc b/README.adoc
index 3cb3549bbf..c0ff51b900 100644
--- a/README.adoc
+++ b/README.adoc
@@ -11,7 +11,7 @@ You can check our project website https://spring.io/projects/spring-cloud-gcp[he
 For a deep dive into the project, refer to the Spring Framework on Google Cloud Reference documentation or Javadocs:
 
 // {x-version-update-start:spring-cloud-gcp:released}
-* link:https://googlecloudplatform.github.io/spring-cloud-gcp/5.2.1/reference/html/index.html[Spring Framework on Google Cloud 5.1.0 (Latest)] - https://googleapis.dev/java/spring-cloud-gcp/5.1.0/index.html[Javadocs 5.1.0]
+* link:https://googlecloudplatform.github.io/spring-cloud-gcp/5.3.0/reference/html/index.html[Spring Framework on Google Cloud 5.1.0 (Latest)] - https://googleapis.dev/java/spring-cloud-gcp/5.1.0/index.html[Javadocs 5.1.0]
 // {x-version-update-end}
 * link:https://googlecloudplatform.github.io/spring-cloud-gcp/4.10.0/reference/html/index.html[Spring Framework on Google Cloud 4.10.0] - https://googleapis.dev/java/spring-cloud-gcp/4.10.0/index.html[Javadocs 4.10.0]
 * link:https://googlecloudplatform.github.io/spring-cloud-gcp/3.8.0/reference/html/index.html[Spring Framework on Google Cloud 3.8.0] - https://googleapis.dev/java/spring-cloud-gcp/3.8.0/index.html[Javadocs 3.8.0]
@@ -82,7 +82,7 @@ This will allow you to not specify versions for any of the Maven dependencies an
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>spring-cloud-gcp-dependencies</artifactId>
-            <version>5.2.1</version>
+            <version>5.3.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
diff --git a/docs/pom.xml b/docs/pom.xml
index e6cf437de5..5535ec4343 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Framework on Google Cloud Documentation</name>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-docs</artifactId>
-	<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/pom.xml b/pom.xml
index bb21bcf4a3..efed2787d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp</artifactId>
-	<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<name>Spring Framework on Google Cloud</name>
 	<description>Spring Framework on Google Cloud</description>
 	<url>https://spring.io/projects/spring-cloud-gcp</url>
diff --git a/spring-cloud-gcp-autoconfigure/pom.xml b/spring-cloud-gcp-autoconfigure/pom.xml
index 23616a8611..7c467ca832 100644
--- a/spring-cloud-gcp-autoconfigure/pom.xml
+++ b/spring-cloud-gcp-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-bigquery/pom.xml b/spring-cloud-gcp-bigquery/pom.xml
index 758352f68b..3e8e3232bd 100644
--- a/spring-cloud-gcp-bigquery/pom.xml
+++ b/spring-cloud-gcp-bigquery/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <artifactId>spring-cloud-gcp-bigquery</artifactId>
diff --git a/spring-cloud-gcp-cloudfoundry/pom.xml b/spring-cloud-gcp-cloudfoundry/pom.xml
index 2e477ac88a..2f178532ef 100644
--- a/spring-cloud-gcp-cloudfoundry/pom.xml
+++ b/spring-cloud-gcp-cloudfoundry/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <artifactId>spring-cloud-gcp-cloudfoundry</artifactId>
diff --git a/spring-cloud-gcp-core/pom.xml b/spring-cloud-gcp-core/pom.xml
index 16f865a992..9e357f7799 100644
--- a/spring-cloud-gcp-core/pom.xml
+++ b/spring-cloud-gcp-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-core</artifactId>
diff --git a/spring-cloud-gcp-data-datastore/pom.xml b/spring-cloud-gcp-data-datastore/pom.xml
index 67ecaac4a5..f8365ef322 100644
--- a/spring-cloud-gcp-data-datastore/pom.xml
+++ b/spring-cloud-gcp-data-datastore/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <artifactId>spring-cloud-gcp-data-datastore</artifactId>
   <name>Spring Framework on Google Cloud Module - Datastore</name>
diff --git a/spring-cloud-gcp-data-firestore/pom.xml b/spring-cloud-gcp-data-firestore/pom.xml
index 8e733128e6..61890686f6 100644
--- a/spring-cloud-gcp-data-firestore/pom.xml
+++ b/spring-cloud-gcp-data-firestore/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <artifactId>spring-cloud-gcp-data-firestore</artifactId>
diff --git a/spring-cloud-gcp-data-spanner/pom.xml b/spring-cloud-gcp-data-spanner/pom.xml
index 607ae6487d..b57e9e8abc 100644
--- a/spring-cloud-gcp-data-spanner/pom.xml
+++ b/spring-cloud-gcp-data-spanner/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-data-spanner</artifactId>
 	<name>Spring Framework on Google Cloud Module - Cloud Spanner</name>
diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml
index 5c20893df8..b0e2e2c390 100644
--- a/spring-cloud-gcp-dependencies/pom.xml
+++ b/spring-cloud-gcp-dependencies/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>spring-cloud-gcp-dependencies</artifactId>
-	<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<name>Spring Framework on Google Cloud Dependencies</name>
 	<description>Spring Framework on Google Cloud Dependencies</description>
 	<url>https://spring.io/projects/spring-cloud-gcp</url>
diff --git a/spring-cloud-gcp-kms/pom.xml b/spring-cloud-gcp-kms/pom.xml
index 91bb95bee2..7b4d2d1279 100644
--- a/spring-cloud-gcp-kms/pom.xml
+++ b/spring-cloud-gcp-kms/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-logging/pom.xml b/spring-cloud-gcp-logging/pom.xml
index 9183044507..7cb8a7e4fd 100644
--- a/spring-cloud-gcp-logging/pom.xml
+++ b/spring-cloud-gcp-logging/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-gcp-native-support/pom.xml b/spring-cloud-gcp-native-support/pom.xml
index 378583970a..5bbb14821c 100644
--- a/spring-cloud-gcp-native-support/pom.xml
+++ b/spring-cloud-gcp-native-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-pubsub-stream-binder/pom.xml b/spring-cloud-gcp-pubsub-stream-binder/pom.xml
index a7d1df2198..ff51a7e239 100644
--- a/spring-cloud-gcp-pubsub-stream-binder/pom.xml
+++ b/spring-cloud-gcp-pubsub-stream-binder/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-pubsub/pom.xml b/spring-cloud-gcp-pubsub/pom.xml
index 4f1dc5ae5f..93e19b5fb8 100644
--- a/spring-cloud-gcp-pubsub/pom.xml
+++ b/spring-cloud-gcp-pubsub/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-pubsub</artifactId>
diff --git a/spring-cloud-gcp-samples/pom.xml b/spring-cloud-gcp-samples/pom.xml
index be03c41b8f..1c429c275f 100644
--- a/spring-cloud-gcp-samples/pom.xml
+++ b/spring-cloud-gcp-samples/pom.xml
@@ -13,7 +13,7 @@
 	<name>Spring Framework on Google Cloud Code Samples</name>
 	<artifactId>spring-cloud-gcp-samples</artifactId>
 	<groupId>com.google.cloud</groupId>
-	<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<packaging>pom</packaging>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-alloydb-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-alloydb-sample/pom.xml
index 651343e53e..ec43ed9255 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-alloydb-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-alloydb-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml
index e73aa41cfd..38dc0b3b72 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-bigquery-sample/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-		    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml
index f6b7f9f2e2..5e16136769 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml
@@ -7,7 +7,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-				<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+				<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml
index 7c993fbd99..066ea0330d 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-basic-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml
index 47c1e3c0f5..a6b1f77481 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-datastore-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
index d2d022d340..1bf3d0abcf 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml
index 192e57ab5b..16986c5012 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-jpa-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml
index 568fd38282..fca6f82d3a 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-multi-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml
index 62744f7c17..70bc976e86 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-repository-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-cloud-gcp-data-spanner-repository-sample</artifactId>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml
index ec801d92aa..6eb253c1d8 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-spanner-template-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-cloud-gcp-data-spanner-template-sample</artifactId>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml
index ea7bd907b1..c23441c6c7 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-json-sample/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml
index 95c9954766..2b09d6df4b 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml
index bc21362f96..38318a132e 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-polling-receiver/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml
index c162360619..acbe790527 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-receiver/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml
index df06a55b86..2d31217f86 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-sender/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml
index e3ade7914c..eaa1e407d8 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-pubsub-sample/spring-cloud-gcp-integration-pubsub-sample-test/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-integration-pubsub-sample</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml
index de244bb2f6..cc3dcca3db 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-integration-storage-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml
index 8964fe2e41..b2e6b674fd 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-kms-sample/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml
index 0c48f1a91f..3d54068312 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/pom.xml
@@ -7,11 +7,11 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-kotlin-samples</artifactId>
-	<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+	<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	<name>Spring Framework on Google Cloud Code Samples - Kotlin</name>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml
index bcb7218e0a..dbd798e75c 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-kotlin-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml
index bdf2ec8de6..2e022988c0 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-logging-sample/pom.xml
@@ -10,7 +10,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml
index 7bee93eaf8..1bd27c1ed8 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-metrics-sample/pom.xml
@@ -10,7 +10,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
index 3a65dee0b2..e7023682db 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml
index 1fb204228b..19ed8a9f25 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-client/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml
index a19b54357f..ca8eef45b2 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-github/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml
index 1608383518..171807077e 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-server-local/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml
index 954d4a4324..639556157f 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/spring-cloud-gcp-pubsub-bus-config-sample-test/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-bus-config-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml
index 158933d351..c275726dac 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-reactive-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml
index 4c075b7312..e50636dccd 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-sample/pom.xml
@@ -7,7 +7,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml
index b05c1c3ff2..f83b5e3e89 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-dead-letter-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml
index 0e922cded2..c145a35233 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml
index 4899a9ac46..9a082b9636 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-sink/pom.xml
@@ -6,7 +6,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-pubsub-stream-functional-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml
index d5bc462d26..76a741e1c8 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-source/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-pubsub-stream-functional-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml
index e8f9b9c7bd..4dba97c193 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-stream-functional-sample/spring-cloud-gcp-pubsub-stream-functional-sample-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-pubsub-stream-functional-sample</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml
index a036a2436d..f48910aeb3 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-secretmanager-sample/pom.xml
@@ -7,7 +7,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml
index 1a5f7d0e70..033380c0c1 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-security-firebase-sample/pom.xml
@@ -7,7 +7,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <properties>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml
index 66417761c4..088a5a1013 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-security-iap-sample/pom.xml
@@ -11,7 +11,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <properties>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml
index 717a5be32f..c22a430906 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-mysql-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml
index 734d6fd24e..7cf9de9ca2 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-r2dbc-sample/pom.xml
@@ -6,7 +6,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml
index a58201764d..944f525966 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-sql-postgres-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-starter-firestore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-starter-firestore-sample/pom.xml
index 3da458e9a1..19646b22e6 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-starter-firestore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-starter-firestore-sample/pom.xml
@@ -7,7 +7,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml
index 7285854a01..acbea20317 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-storage-resource-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml
index c8f6bad7b5..1f22e50729 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/pom.xml
@@ -10,7 +10,7 @@
         <!-- Your own application should inherit from spring-boot-starter-parent -->
         <artifactId>spring-cloud-gcp-samples</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml
index ef08eaaa17..bfb8262cd8 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-api-sample/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml
index 626756b57b..d7a44d52a9 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-vision-ocr-demo/pom.xml
@@ -6,7 +6,7 @@
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<artifactId>spring-cloud-gcp-samples</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml b/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml
index 0364d2af35..c0b4e54f10 100644
--- a/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-spanner-r2dbc-samples/pom.xml
@@ -7,7 +7,7 @@
     <!-- Your own application should inherit from spring-boot-starter-parent -->
     <artifactId>spring-cloud-gcp-samples</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-secretmanager/pom.xml b/spring-cloud-gcp-secretmanager/pom.xml
index 55c8e3a1ce..86f47abcce 100644
--- a/spring-cloud-gcp-secretmanager/pom.xml
+++ b/spring-cloud-gcp-secretmanager/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-security-firebase/pom.xml b/spring-cloud-gcp-security-firebase/pom.xml
index 715d6b310e..86c428b1ff 100644
--- a/spring-cloud-gcp-security-firebase/pom.xml
+++ b/spring-cloud-gcp-security-firebase/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <artifactId>spring-cloud-gcp-security-firebase</artifactId>
diff --git a/spring-cloud-gcp-security-iap/pom.xml b/spring-cloud-gcp-security-iap/pom.xml
index 3e80211024..7ac61148ef 100644
--- a/spring-cloud-gcp-security-iap/pom.xml
+++ b/spring-cloud-gcp-security-iap/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 
 	<artifactId>spring-cloud-gcp-security-iap</artifactId>
diff --git a/spring-cloud-gcp-starters/pom.xml b/spring-cloud-gcp-starters/pom.xml
index 56545e8a36..d3741fcebd 100644
--- a/spring-cloud-gcp-starters/pom.xml
+++ b/spring-cloud-gcp-starters/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Framework on Google Cloud Starters</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-alloydb/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-alloydb/pom.xml
index f2b82ac18a..f6ee2c3bc8 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-alloydb/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-alloydb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml
index a60136293e..a95a792ea4 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bigquery/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp-starters</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml
index f675939f15..cd64d4bc8d 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-bus-pubsub/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
 
   <artifactId>spring-cloud-gcp-starter-bus-pubsub</artifactId>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml
index 2da61cdf4f..6bb7a2d362 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-cloudfoundry/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
index 670deeee75..806349ddbb 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-config/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-config</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Config</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml
index 98b7c311d0..9788f41a55 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-datastore/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-data-datastore</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Datastore</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml
index 5834890f9f..2f8f50b403 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-firestore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>spring-cloud-gcp-starters</artifactId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <artifactId>spring-cloud-gcp-starter-data-firestore</artifactId>
     <name>Spring Framework on Google Cloud Starter - Firestore</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml
index 5326f59b23..4e9dea1f0e 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-data-spanner/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-data-spanner</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Spanner</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml
index 6c882d6d3f..b20b486b5b 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-firestore/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-firestore</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Firestore</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml
index 4fc63b88bd..51c56f7865 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-kms/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml
index 765482c18d..6f07553ef3 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-logging/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml
index a6ba85d6a1..55ba13b4d1 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-metrics/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml
index 44b9ef5cc2..57c4e6c7ec 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-pubsub/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-pubsub</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Pub/Sub</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml
index c1ea918674..8f964b8b10 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml
index a5aa89f11d..4fa52f0619 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml
index 491df5b184..dac037f423 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml
index 6517a1f2f2..c5f5ee362c 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql-r2dbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml
index 0555f0163c..0ba6af80bb 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml
index 511bd1e38b..06ab34a1d4 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgres-r2dbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml
index e3516f4f6e..6745247d4a 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gcp-starters</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml
index 998746e612..c585f6ed4c 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter-storage</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Storage</name>
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml
index 619d3df788..1481d64dcb 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml
index 6e307e9abd..edfe5d66a8 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter-vision/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml b/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml
index f3baad87f5..52014a449a 100644
--- a/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml
+++ b/spring-cloud-gcp-starters/spring-cloud-gcp-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.google.cloud</groupId>
 		<artifactId>spring-cloud-gcp-starters</artifactId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-starter</artifactId>
 	<name>Spring Framework on Google Cloud Starter - Support</name>
diff --git a/spring-cloud-gcp-storage/pom.xml b/spring-cloud-gcp-storage/pom.xml
index 4494a449de..3e773631f1 100644
--- a/spring-cloud-gcp-storage/pom.xml
+++ b/spring-cloud-gcp-storage/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<artifactId>spring-cloud-gcp-storage</artifactId>
 	<name>Spring Framework on Google Cloud Module - Storage</name>
diff --git a/spring-cloud-gcp-vision/pom.xml b/spring-cloud-gcp-vision/pom.xml
index 4330236788..df233aa51c 100644
--- a/spring-cloud-gcp-vision/pom.xml
+++ b/spring-cloud-gcp-vision/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-gcp</artifactId>
 		<groupId>com.google.cloud</groupId>
-		<version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+		<version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-generator/pom.xml b/spring-cloud-generator/pom.xml
index f058c4aeb7..d34e133fbe 100644
--- a/spring-cloud-generator/pom.xml
+++ b/spring-cloud-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-gcp</artifactId>
         <groupId>com.google.cloud</groupId>
-        <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+        <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     </parent>
 
     <groupId>com.google.cloud</groupId>
diff --git a/spring-cloud-generator/scripts/resources/googleapis_modification_string.txt b/spring-cloud-generator/scripts/resources/googleapis_modification_string.txt
index 83583ba744..6ebd15c1b8 100644
--- a/spring-cloud-generator/scripts/resources/googleapis_modification_string.txt
+++ b/spring-cloud-generator/scripts/resources/googleapis_modification_string.txt
@@ -1,4 +1,4 @@
-_spring_cloud_generator_version = "5.2.2-SNAPSHOT" # {x-version-update:spring-cloud-gcp:current}
+_spring_cloud_generator_version = "5.3.0" # {x-version-update:spring-cloud-gcp:current}
 
 maven_install(
     artifacts = [
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/pom.xml b/spring-cloud-generator/showcase/showcase-spring-starter/pom.xml
index 827dca8550..e0b96c2a7d 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/pom.xml
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>gapic-showcase-spring-starter</artifactId>
diff --git a/spring-cloud-generator/spring-cloud-previews-template/pom.xml b/spring-cloud-generator/spring-cloud-previews-template/pom.xml
index c69d70b190..97c1c08b3e 100644
--- a/spring-cloud-generator/spring-cloud-previews-template/pom.xml
+++ b/spring-cloud-generator/spring-cloud-previews-template/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-previews/google-cloud-accessapproval-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-accessapproval-spring-starter/pom.xml
index b406ed7bd3..a264e505ec 100644
--- a/spring-cloud-previews/google-cloud-accessapproval-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-accessapproval-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-accessapproval-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-aiplatform-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-aiplatform-spring-starter/pom.xml
index e5fe2bce03..d53aec11dc 100644
--- a/spring-cloud-previews/google-cloud-aiplatform-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-aiplatform-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-aiplatform-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-api-gateway-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-api-gateway-spring-starter/pom.xml
index 13957d9d20..0361819022 100644
--- a/spring-cloud-previews/google-cloud-api-gateway-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-api-gateway-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-api-gateway-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-apigee-connect-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-apigee-connect-spring-starter/pom.xml
index 7c7e6aa479..acbce4a322 100644
--- a/spring-cloud-previews/google-cloud-apigee-connect-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-apigee-connect-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-apigee-connect-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-appengine-admin-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-appengine-admin-spring-starter/pom.xml
index 200d4e13ca..b650bf72a0 100644
--- a/spring-cloud-previews/google-cloud-appengine-admin-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-appengine-admin-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-appengine-admin-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/pom.xml
index bad8262c52..0a5b81e3b7 100644
--- a/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-artifact-registry-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-asset-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-asset-spring-starter/pom.xml
index 2d04e4918c..c724d6e0fd 100644
--- a/spring-cloud-previews/google-cloud-asset-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-asset-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-asset-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-assured-workloads-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-assured-workloads-spring-starter/pom.xml
index e1db900b87..251932bf26 100644
--- a/spring-cloud-previews/google-cloud-assured-workloads-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-assured-workloads-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-assured-workloads-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-automl-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-automl-spring-starter/pom.xml
index f197d593d2..1da45de33b 100644
--- a/spring-cloud-previews/google-cloud-automl-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-automl-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-automl-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-bigqueryconnection-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-bigqueryconnection-spring-starter/pom.xml
index 03f8036e28..f55e1466de 100644
--- a/spring-cloud-previews/google-cloud-bigqueryconnection-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-bigqueryconnection-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-bigqueryconnection-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-bigquerydatatransfer-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-bigquerydatatransfer-spring-starter/pom.xml
index 46a1197eaf..918a091faf 100644
--- a/spring-cloud-previews/google-cloud-bigquerydatatransfer-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-bigquerydatatransfer-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-bigquerydatatransfer-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-bigqueryreservation-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-bigqueryreservation-spring-starter/pom.xml
index 76c4bf87e0..e815899ee0 100644
--- a/spring-cloud-previews/google-cloud-bigqueryreservation-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-bigqueryreservation-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-bigqueryreservation-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-billing-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-billing-spring-starter/pom.xml
index 375c0a7962..3eb716ec47 100644
--- a/spring-cloud-previews/google-cloud-billing-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-billing-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-billing-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-billingbudgets-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-billingbudgets-spring-starter/pom.xml
index 3393679625..dc92ed0b3a 100644
--- a/spring-cloud-previews/google-cloud-billingbudgets-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-billingbudgets-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-billingbudgets-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-binary-authorization-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-binary-authorization-spring-starter/pom.xml
index ba329e038e..ec8d996438 100644
--- a/spring-cloud-previews/google-cloud-binary-authorization-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-binary-authorization-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-binary-authorization-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-build-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-build-spring-starter/pom.xml
index 7706d8580a..81ac5a75fa 100644
--- a/spring-cloud-previews/google-cloud-build-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-build-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-build-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-channel-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-channel-spring-starter/pom.xml
index 3dc48c3967..3a434d0067 100644
--- a/spring-cloud-previews/google-cloud-channel-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-channel-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-channel-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-compute-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-compute-spring-starter/pom.xml
index 310a1a434b..14520a5011 100644
--- a/spring-cloud-previews/google-cloud-compute-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-compute-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-compute-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/pom.xml
index 2d3a2889d8..4687df3cf3 100644
--- a/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-contact-center-insights-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-container-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-container-spring-starter/pom.xml
index 533a494427..57697dade9 100644
--- a/spring-cloud-previews/google-cloud-container-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-container-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-container-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-containeranalysis-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-containeranalysis-spring-starter/pom.xml
index 5899a2f287..2679a69915 100644
--- a/spring-cloud-previews/google-cloud-containeranalysis-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-containeranalysis-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-containeranalysis-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-data-fusion-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-data-fusion-spring-starter/pom.xml
index 26295f76dc..ac6e627b75 100644
--- a/spring-cloud-previews/google-cloud-data-fusion-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-data-fusion-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-data-fusion-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-datacatalog-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-datacatalog-spring-starter/pom.xml
index b9b4f34106..307a4263ed 100644
--- a/spring-cloud-previews/google-cloud-datacatalog-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-datacatalog-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-datacatalog-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-dataplex-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-dataplex-spring-starter/pom.xml
index 1d7ef6b8a2..b5636a5a39 100644
--- a/spring-cloud-previews/google-cloud-dataplex-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-dataplex-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-dataplex-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-dataproc-metastore-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-dataproc-metastore-spring-starter/pom.xml
index 269adc654e..3faf461e8d 100644
--- a/spring-cloud-previews/google-cloud-dataproc-metastore-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-dataproc-metastore-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-dataproc-metastore-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-dataproc-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-dataproc-spring-starter/pom.xml
index 834ba3b6d5..28ea2d27dd 100644
--- a/spring-cloud-previews/google-cloud-dataproc-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-dataproc-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-dataproc-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-datastream-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-datastream-spring-starter/pom.xml
index 5ac63ffcbf..d3cf43efcf 100644
--- a/spring-cloud-previews/google-cloud-datastream-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-datastream-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-datastream-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-debugger-client-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-debugger-client-spring-starter/pom.xml
index 53ad42a2b4..016164d529 100644
--- a/spring-cloud-previews/google-cloud-debugger-client-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-debugger-client-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-debugger-client-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-deploy-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-deploy-spring-starter/pom.xml
index d5b1697d06..9722747a34 100644
--- a/spring-cloud-previews/google-cloud-deploy-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-deploy-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-deploy-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-dialogflow-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-dialogflow-spring-starter/pom.xml
index 153e5b4f8f..60ea4bf502 100644
--- a/spring-cloud-previews/google-cloud-dialogflow-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-dialogflow-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-dialogflow-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-dlp-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-dlp-spring-starter/pom.xml
index d56134c048..8f8d525dc9 100644
--- a/spring-cloud-previews/google-cloud-dlp-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-dlp-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-dlp-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-dms-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-dms-spring-starter/pom.xml
index 7fe4913636..5377ebb4c8 100644
--- a/spring-cloud-previews/google-cloud-dms-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-dms-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-dms-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-document-ai-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-document-ai-spring-starter/pom.xml
index d1426fab88..9de5b954f7 100644
--- a/spring-cloud-previews/google-cloud-document-ai-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-document-ai-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-document-ai-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-domains-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-domains-spring-starter/pom.xml
index 2ab921a69e..7517758971 100644
--- a/spring-cloud-previews/google-cloud-domains-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-domains-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-domains-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-essential-contacts-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-essential-contacts-spring-starter/pom.xml
index 01d5f96966..b9c8c705df 100644
--- a/spring-cloud-previews/google-cloud-essential-contacts-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-essential-contacts-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-essential-contacts-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-eventarc-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-eventarc-spring-starter/pom.xml
index feb274d132..f1a14da6eb 100644
--- a/spring-cloud-previews/google-cloud-eventarc-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-eventarc-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-eventarc-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-filestore-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-filestore-spring-starter/pom.xml
index 0e84d6cb0c..05a6ed238b 100644
--- a/spring-cloud-previews/google-cloud-filestore-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-filestore-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-filestore-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-functions-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-functions-spring-starter/pom.xml
index 017ea2cca5..f1b06fe3fe 100644
--- a/spring-cloud-previews/google-cloud-functions-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-functions-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-functions-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-gkehub-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-gkehub-spring-starter/pom.xml
index cfbc996e20..356272b516 100644
--- a/spring-cloud-previews/google-cloud-gkehub-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-gkehub-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-gkehub-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-gsuite-addons-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-gsuite-addons-spring-starter/pom.xml
index 30e67527fd..865904e6d3 100644
--- a/spring-cloud-previews/google-cloud-gsuite-addons-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-gsuite-addons-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-gsuite-addons-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-iamcredentials-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-iamcredentials-spring-starter/pom.xml
index ebe786469a..636623d726 100644
--- a/spring-cloud-previews/google-cloud-iamcredentials-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-iamcredentials-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-iamcredentials-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-ids-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-ids-spring-starter/pom.xml
index bf51b09539..6aa29d2f5f 100644
--- a/spring-cloud-previews/google-cloud-ids-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-ids-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-ids-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-iot-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-iot-spring-starter/pom.xml
index be98bd3a50..e03b490720 100644
--- a/spring-cloud-previews/google-cloud-iot-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-iot-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-iot-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-language-spring-starter/pom.xml
index 004437daa5..6c4719dd8b 100644
--- a/spring-cloud-previews/google-cloud-language-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-language-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-language-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-managed-identities-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-managed-identities-spring-starter/pom.xml
index 61bce588f9..14497352d6 100644
--- a/spring-cloud-previews/google-cloud-managed-identities-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-managed-identities-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-managed-identities-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-memcache-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-memcache-spring-starter/pom.xml
index 838d1c23ce..1876e6140a 100644
--- a/spring-cloud-previews/google-cloud-memcache-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-memcache-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-memcache-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-monitoring-dashboard-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-monitoring-dashboard-spring-starter/pom.xml
index aa279bc201..25e2c1fff0 100644
--- a/spring-cloud-previews/google-cloud-monitoring-dashboard-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-monitoring-dashboard-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-monitoring-dashboard-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-network-management-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-network-management-spring-starter/pom.xml
index b801108a90..cd04c8f412 100644
--- a/spring-cloud-previews/google-cloud-network-management-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-network-management-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-network-management-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/pom.xml
index 3ab18f1f1e..2283f6f283 100644
--- a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-networkconnectivity-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-notebooks-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-notebooks-spring-starter/pom.xml
index 15a2b087db..d894b79b5d 100644
--- a/spring-cloud-previews/google-cloud-notebooks-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-notebooks-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-notebooks-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-optimization-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-optimization-spring-starter/pom.xml
index 91927a2f37..a6eb12595a 100644
--- a/spring-cloud-previews/google-cloud-optimization-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-optimization-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-optimization-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/pom.xml
index c1429561e9..bb32e91ea1 100644
--- a/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-orchestration-airflow-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-orgpolicy-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-orgpolicy-spring-starter/pom.xml
index 2395525eab..ff2d3c2ba3 100644
--- a/spring-cloud-previews/google-cloud-orgpolicy-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-orgpolicy-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-orgpolicy-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-os-config-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-os-config-spring-starter/pom.xml
index 2bb6a793bf..6f6563e420 100644
--- a/spring-cloud-previews/google-cloud-os-config-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-os-config-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-os-config-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-os-login-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-os-login-spring-starter/pom.xml
index c045f17442..56092719fd 100644
--- a/spring-cloud-previews/google-cloud-os-login-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-os-login-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-os-login-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-policy-troubleshooter-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-policy-troubleshooter-spring-starter/pom.xml
index 2f1b858caa..f4d9dbcd49 100644
--- a/spring-cloud-previews/google-cloud-policy-troubleshooter-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-policy-troubleshooter-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-policy-troubleshooter-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-profiler-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-profiler-spring-starter/pom.xml
index 53b6ee8958..c6cff9dcd6 100644
--- a/spring-cloud-previews/google-cloud-profiler-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-profiler-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-profiler-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/pom.xml
index f62efc265d..7d0ef70f5a 100644
--- a/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-recaptchaenterprise-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-recommender-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-recommender-spring-starter/pom.xml
index e184069c0e..0c635ab34c 100644
--- a/spring-cloud-previews/google-cloud-recommender-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-recommender-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-recommender-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-redis-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-redis-spring-starter/pom.xml
index 1fe3fdaa6c..f578970211 100644
--- a/spring-cloud-previews/google-cloud-redis-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-redis-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-redis-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-resource-settings-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-resource-settings-spring-starter/pom.xml
index 9db6695268..8d64fa646a 100644
--- a/spring-cloud-previews/google-cloud-resource-settings-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-resource-settings-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-resource-settings-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-retail-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-retail-spring-starter/pom.xml
index fdcd843bc9..2057fb8d05 100644
--- a/spring-cloud-previews/google-cloud-retail-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-retail-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-retail-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-scheduler-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-scheduler-spring-starter/pom.xml
index 9cdd593b20..2f6835d096 100644
--- a/spring-cloud-previews/google-cloud-scheduler-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-scheduler-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-scheduler-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-security-private-ca-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-security-private-ca-spring-starter/pom.xml
index 3385b5f5e2..76f9368ab5 100644
--- a/spring-cloud-previews/google-cloud-security-private-ca-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-security-private-ca-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-security-private-ca-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-securitycenter-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-securitycenter-spring-starter/pom.xml
index 3d0c0ed587..9a8cb9dfd8 100644
--- a/spring-cloud-previews/google-cloud-securitycenter-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-securitycenter-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-securitycenter-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-service-control-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-service-control-spring-starter/pom.xml
index 5c0a9a71bf..a6c2dc987a 100644
--- a/spring-cloud-previews/google-cloud-service-control-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-service-control-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-service-control-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-service-management-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-service-management-spring-starter/pom.xml
index 2b410177e4..b8fc5cb070 100644
--- a/spring-cloud-previews/google-cloud-service-management-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-service-management-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-service-management-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-service-usage-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-service-usage-spring-starter/pom.xml
index b5271d8f0c..86f54404b1 100644
--- a/spring-cloud-previews/google-cloud-service-usage-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-service-usage-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-service-usage-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-servicedirectory-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-servicedirectory-spring-starter/pom.xml
index b93649a47d..7abfd076b3 100644
--- a/spring-cloud-previews/google-cloud-servicedirectory-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-servicedirectory-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-servicedirectory-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-shell-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-shell-spring-starter/pom.xml
index 7753e8f8d4..4dd8648261 100644
--- a/spring-cloud-previews/google-cloud-shell-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-shell-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-shell-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-speech-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-speech-spring-starter/pom.xml
index d74a03fbc6..42a2b1361e 100644
--- a/spring-cloud-previews/google-cloud-speech-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-speech-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-speech-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-storage-transfer-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-storage-transfer-spring-starter/pom.xml
index 211437b768..2ca71cbadd 100644
--- a/spring-cloud-previews/google-cloud-storage-transfer-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-storage-transfer-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-storage-transfer-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-talent-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-talent-spring-starter/pom.xml
index afde3b0d7c..ee327518fb 100644
--- a/spring-cloud-previews/google-cloud-talent-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-talent-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-talent-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-tasks-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-tasks-spring-starter/pom.xml
index 7c4994790a..c9d2ff481f 100644
--- a/spring-cloud-previews/google-cloud-tasks-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-tasks-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-tasks-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-texttospeech-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-texttospeech-spring-starter/pom.xml
index 30d1b1bbec..1f5403dc2d 100644
--- a/spring-cloud-previews/google-cloud-texttospeech-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-texttospeech-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-texttospeech-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-tpu-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-tpu-spring-starter/pom.xml
index dd72bb7064..fce3af471a 100644
--- a/spring-cloud-previews/google-cloud-tpu-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-tpu-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-tpu-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-trace-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-trace-spring-starter/pom.xml
index a26e9a71c2..21e193d092 100644
--- a/spring-cloud-previews/google-cloud-trace-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-trace-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-trace-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-translate-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-translate-spring-starter/pom.xml
index ff85337216..a3f44a0d30 100644
--- a/spring-cloud-previews/google-cloud-translate-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-translate-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-translate-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-video-intelligence-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-video-intelligence-spring-starter/pom.xml
index 7a6262348b..8f72bdaa74 100644
--- a/spring-cloud-previews/google-cloud-video-intelligence-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-video-intelligence-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-video-intelligence-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-video-transcoder-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-video-transcoder-spring-starter/pom.xml
index f3f5030a00..27d5106561 100644
--- a/spring-cloud-previews/google-cloud-video-transcoder-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-video-transcoder-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-video-transcoder-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-vmmigration-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-vmmigration-spring-starter/pom.xml
index 19a96dcab5..fa335cc008 100644
--- a/spring-cloud-previews/google-cloud-vmmigration-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-vmmigration-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-vmmigration-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-vpcaccess-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-vpcaccess-spring-starter/pom.xml
index 8eaac49a80..0cfac413ad 100644
--- a/spring-cloud-previews/google-cloud-vpcaccess-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-vpcaccess-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-vpcaccess-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-webrisk-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-webrisk-spring-starter/pom.xml
index 0ea4137a58..0def6cdb22 100644
--- a/spring-cloud-previews/google-cloud-webrisk-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-webrisk-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-webrisk-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-websecurityscanner-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-websecurityscanner-spring-starter/pom.xml
index 0d8f47d82d..d13fd60900 100644
--- a/spring-cloud-previews/google-cloud-websecurityscanner-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-websecurityscanner-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-websecurityscanner-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-workflow-executions-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-workflow-executions-spring-starter/pom.xml
index 128be3222f..e9ba0ee2ad 100644
--- a/spring-cloud-previews/google-cloud-workflow-executions-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-workflow-executions-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-workflow-executions-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-cloud-workflows-spring-starter/pom.xml b/spring-cloud-previews/google-cloud-workflows-spring-starter/pom.xml
index 8fd7306cab..321bebc0ca 100644
--- a/spring-cloud-previews/google-cloud-workflows-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-cloud-workflows-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-cloud-workflows-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-iam-admin-spring-starter/pom.xml b/spring-cloud-previews/google-iam-admin-spring-starter/pom.xml
index a25754d2f0..9c36c9b167 100644
--- a/spring-cloud-previews/google-iam-admin-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-iam-admin-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-iam-admin-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-iam-policy-spring-starter/pom.xml b/spring-cloud-previews/google-iam-policy-spring-starter/pom.xml
index 9784927dbb..0823aeeb5c 100644
--- a/spring-cloud-previews/google-iam-policy-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-iam-policy-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-iam-policy-spring-starter</artifactId>
diff --git a/spring-cloud-previews/google-identity-accesscontextmanager-spring-starter/pom.xml b/spring-cloud-previews/google-identity-accesscontextmanager-spring-starter/pom.xml
index 18b807ae59..e165300060 100644
--- a/spring-cloud-previews/google-identity-accesscontextmanager-spring-starter/pom.xml
+++ b/spring-cloud-previews/google-identity-accesscontextmanager-spring-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>spring-cloud-gcp-starters</artifactId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
     <relativePath>../../spring-cloud-gcp-starters/pom.xml</relativePath>
   </parent>
   <artifactId>google-identity-accesscontextmanager-spring-starter</artifactId>
diff --git a/spring-cloud-previews/pom.xml b/spring-cloud-previews/pom.xml
index 22aade0da3..b1c638c298 100644
--- a/spring-cloud-previews/pom.xml
+++ b/spring-cloud-previews/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-spanner-spring-data-r2dbc/pom.xml b/spring-cloud-spanner-spring-data-r2dbc/pom.xml
index 3831a9de2e..8d765040ee 100644
--- a/spring-cloud-spanner-spring-data-r2dbc/pom.xml
+++ b/spring-cloud-spanner-spring-data-r2dbc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>spring-cloud-gcp</artifactId>
     <groupId>com.google.cloud</groupId>
-    <version>5.2.2-SNAPSHOT</version><!-- {x-version-update:spring-cloud-gcp:current} -->
+    <version>5.3.0</version><!-- {x-version-update:spring-cloud-gcp:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/versions.txt b/versions.txt
index fab705c342..c9eb996335 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-spring-cloud-gcp:5.2.1:5.2.2-SNAPSHOT
+spring-cloud-gcp:5.3.0:5.3.0

From be9f31653ecbd9403e7ae192c8fd42ac76d6a939 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Fri, 17 May 2024 14:30:56 -0400
Subject: [PATCH 13/27] add default endpoint to autoconfig composer

---
 .../composer/SpringAutoConfigClassComposer.java      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringAutoConfigClassComposer.java b/spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringAutoConfigClassComposer.java
index 649c10d5eb..9f52ee3382 100644
--- a/spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringAutoConfigClassComposer.java
+++ b/spring-cloud-generator/src/main/java/com/google/cloud/generator/spring/composer/SpringAutoConfigClassComposer.java
@@ -465,6 +465,12 @@ private static MethodDefinition createSettingsBeanMethod(
                 .setName("defaultTransportChannelProvider")
                 .setType(STATIC_TYPES.get("TransportChannelProvider"))
                 .build());
+    MethodInvocationExpr defaultEnpointMethodInvocationExpr =
+            MethodInvocationExpr.builder()
+                    .setStaticReferenceType(types.get("ServiceSettings"))
+                    .setMethodName("getDefaultEndpoint")
+                    .setReturnType(TypeNode.STRING)
+                    .build();
 
     List<Statement> bodyStatements = new ArrayList<>();
 
@@ -577,6 +583,12 @@ private static MethodDefinition createSettingsBeanMethod(
             .setMethodName("setTransportChannelProvider")
             .setArguments(transportChannelProviderVariableExpr)
             .build();
+    settingsBuilderExpr =
+            MethodInvocationExpr.builder()
+                    .setExprReferenceExpr(settingsBuilderExpr)
+                    .setMethodName("setEndpoint")
+                    .setArguments(defaultEnpointMethodInvocationExpr)
+                    .build();
     MethodInvocationExpr userAgentHeaderProviderInvocation =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(thisExpr)

From 662d764035fe154f4745cf6979952bcd1cc0952b Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Fri, 17 May 2024 14:33:09 -0400
Subject: [PATCH 14/27] update goldens

---
 .../composer/goldens/EchoSpringAutoConfigurationFull.golden      | 1 +
 .../composer/goldens/EchoSpringAutoConfigurationGrpc.golden      | 1 +
 .../composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden  | 1 +
 .../composer/goldens/EchoSpringAutoConfigurationRest.golden      | 1 +
 .../goldens/WickedSpringAutoConfigurationNoRestRpcs.golden       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
index 9d3862027d..66d2536758 100644
--- a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
+++ b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationFull.golden
@@ -120,6 +120,7 @@ public class EchoSpringAutoConfiguration {
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(EchoSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
index 327fa50bf6..270f496f87 100644
--- a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
+++ b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpc.golden
@@ -100,6 +100,7 @@ public class EchoSpringAutoConfiguration {
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(EchoSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
index 2d53a7ecc9..008bfa24b6 100644
--- a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
+++ b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationGrpcRest.golden
@@ -112,6 +112,7 @@ public class EchoSpringAutoConfiguration {
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(EchoSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationRest.golden b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationRest.golden
index 327fa50bf6..270f496f87 100644
--- a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationRest.golden
+++ b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/EchoSpringAutoConfigurationRest.golden
@@ -100,6 +100,7 @@ public class EchoSpringAutoConfiguration {
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(EchoSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden
index 7f4903693c..a73cf1f30b 100644
--- a/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden
+++ b/spring-cloud-generator/src/test/java/com/google/cloud/generator/spring/composer/goldens/WickedSpringAutoConfigurationNoRestRpcs.golden
@@ -100,6 +100,7 @@ public class WickedSpringAutoConfiguration {
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(WickedSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());

From a7e675c8e9d9a2d89fa9409ccf371dd6cb9a520e Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Fri, 17 May 2024 18:46:56 +0000
Subject: [PATCH 15/27] update showcase

---
 .../v1beta1/spring/ComplianceSpringAutoConfiguration.java        | 1 +
 .../showcase/v1beta1/spring/EchoSpringAutoConfiguration.java     | 1 +
 .../showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java | 1 +
 .../v1beta1/spring/MessagingSpringAutoConfiguration.java         | 1 +
 .../v1beta1/spring/SequenceServiceSpringAutoConfiguration.java   | 1 +
 .../showcase/v1beta1/spring/TestingSpringAutoConfiguration.java  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
index 308594362d..4a8849ca3c 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
@@ -134,6 +134,7 @@ public ComplianceSettings complianceSettings(
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(ComplianceSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
index 45a08766e2..8a3602ca90 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
@@ -130,6 +130,7 @@ public EchoSettings echoSettings(
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(EchoSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
index e9e6485683..a56b0a2a1d 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
@@ -132,6 +132,7 @@ public IdentitySettings identitySettings(
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(IdentitySettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java
index 7a1070d056..489416c612 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/MessagingSpringAutoConfiguration.java
@@ -132,6 +132,7 @@ public MessagingSettings messagingSettings(
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(MessagingSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java
index 571592d0ae..5587f3a942 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/SequenceServiceSpringAutoConfiguration.java
@@ -135,6 +135,7 @@ public SequenceServiceSettings sequenceServiceSettings(
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(SequenceServiceSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java
index 7b8a1b9bb4..e70a3c7229 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/main/java/com/google/showcase/v1beta1/spring/TestingSpringAutoConfiguration.java
@@ -130,6 +130,7 @@ public TestingSettings testingSettings(
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(TestingSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());

From 235478acd0c6259d3d1f869d80d4961257548b50 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Fri, 17 May 2024 19:01:26 +0000
Subject: [PATCH 16/27] update comments

---
 spring-cloud-generator/scripts/generate-showcase.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 811e72cf78..92da852f7b 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -84,10 +84,6 @@ function generate_showcase_spring_starter(){
   gapic_showcase_server_version=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
   popd #showcase/gapic-showcase
 
-  # Alternative: if showcase client library is available on Maven Central,
-  # Instead of downloading sdk-platform-java/showcase (for client library, and generation setup),
-  # Can instead download googleapis (for generation setup) and gapic-showcase (for protos)
-
   output_folder=$(get_output_folder)
   mkdir "${output_folder}"
   pushd "${output_folder}"

From b17b1d861d40a522a40e992e0c3cff15691a5928 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Fri, 17 May 2024 15:22:59 -0400
Subject: [PATCH 17/27] fix showcase tests

---
 .../showcase/v1beta1/spring/EchoAutoConfigurationTests.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-cloud-generator/showcase/showcase-spring-starter/src/test/java/com/google/showcase/v1beta1/spring/EchoAutoConfigurationTests.java b/spring-cloud-generator/showcase/showcase-spring-starter/src/test/java/com/google/showcase/v1beta1/spring/EchoAutoConfigurationTests.java
index 78a528e7e0..3e728c95cf 100644
--- a/spring-cloud-generator/showcase/showcase-spring-starter/src/test/java/com/google/showcase/v1beta1/spring/EchoAutoConfigurationTests.java
+++ b/spring-cloud-generator/showcase/showcase-spring-starter/src/test/java/com/google/showcase/v1beta1/spring/EchoAutoConfigurationTests.java
@@ -198,6 +198,7 @@ void testCustomTransportChannelProviderUsedWhenProvided() throws IOException {
     when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withStreamWaitTimeout(any())).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withStreamIdleTimeout(any())).thenReturn(mockApiCallContext);
+    when(mockApiCallContext.withEndpointContext(any())).thenReturn(mockApiCallContext);
 
     contextRunner
         .withBean(
@@ -218,6 +219,7 @@ void testCustomServiceSettingsUsedWhenProvided() throws IOException {
         EchoSettings.newBuilder()
             .setCredentialsProvider(mockCredentialsProvider)
             .setQuotaProjectId(SERVICE_OVERRIDE_CLIENT_ID)
+            .setEndpoint(EchoSettings.getDefaultEndpoint())
             .build();
     contextRunner
         .withBean("echoSettings", EchoSettings.class, () -> customEchoSettings)

From 2d0f4bc4fdb76c45a713dbfcea0674846ef1b1ba Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Fri, 17 May 2024 15:23:29 -0400
Subject: [PATCH 18/27] ignore vim swap files

---
 .gitignore | 75 +++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4fd66ddf59..d34867932f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,38 @@
-# Ignore folders
-target/
-bin/
-/config
-/.idea
-/out
-
-# Do not ignore them
-!.idea/copyright
-!.idea/inspectionProfiles
-!.idea/scopes
-!.idea/codeStyleSettings.xml
-!.idea/vcs.xml
-
-# Ignore files
-access.properties
-mail.properties
-*.iml
-*.ipr
-*.iws
-.project
-.classpath
-.settings/
-.sts4-cache/
-
-# Ignore to avoid pushing maven wrapper jar as binary artifact
-.mvn/wrapper/maven-wrapper.jar
-
-# Because re-configuring the directory in the share plugin leads to side effect we ignore the file
-dependency-reduced-pom.xml
-.factorypath
-
-# Ignore OSX autogenerated files
-.DS_Store
-
-.flattened-pom.xml
-*.versionsBackup
+# Ignore folders
+target/
+bin/
+/config
+/.idea
+/out
+
+# Do not ignore them
+!.idea/copyright
+!.idea/inspectionProfiles
+!.idea/scopes
+!.idea/codeStyleSettings.xml
+!.idea/vcs.xml
+
+# Ignore files
+access.properties
+mail.properties
+*.iml
+*.ipr
+*.iws
+*.swp
+.project
+.classpath
+.settings/
+.sts4-cache/
+
+# Ignore to avoid pushing maven wrapper jar as binary artifact
+.mvn/wrapper/maven-wrapper.jar
+
+# Because re-configuring the directory in the share plugin leads to side effect we ignore the file
+dependency-reduced-pom.xml
+.factorypath
+
+# Ignore OSX autogenerated files
+.DS_Store
+
+.flattened-pom.xml
+*.versionsBackup

From c05b3a976c8f695dcfbdc2aeda3952541d5fe01b Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Fri, 17 May 2024 16:16:36 -0400
Subject: [PATCH 19/27] fix `popd` comment

---
 spring-cloud-generator/scripts/generate-showcase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 92da852f7b..738494bdc7 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -111,7 +111,7 @@ function generate_showcase_spring_starter(){
   fi
   pushd googleapis
   cp -r google "${output_folder}"
-  popd #gapic-showcase
+  popd #googleapis
 
   # Now we call protoc with a series of arguments we obtain from
   # sdk-platform-java's utilities.sh and others that are hardcoded (and stable).

From 5b9fb60ca29e43d5ccac954dfd8fefca80715468 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Fri, 17 May 2024 16:29:18 -0400
Subject: [PATCH 20/27] fix comment

---
 spring-cloud-generator/scripts/generate-showcase.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 738494bdc7..62424bd993 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -91,8 +91,9 @@ function generate_showcase_spring_starter(){
   os_architecture=$(detect_os_architecture)
   download_protoc "${protoc_version}" "${os_architecture}"
 
-  # We now copy the spring-cloud-generator and gapic-generator-java jar into the output_folder the
-  # sdk-platform-java generation scripts work with.
+  # We now copy the spring-cloud-generator jar with dependencies
+  # into the output_folder the sdk-platform-java generation
+  # scripts work with.
   spring_generator_jar_name="spring-cloud-generator-${project_version}-jar-with-dependencies.jar"
   cp ~/.m2/repository/com/google/cloud/spring-cloud-generator/"${project_version}/${spring_generator_jar_name}" \
     "${output_folder}"

From d8e5a317537c15c36e5315e7069d7d4d70e5a296 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Tue, 21 May 2024 13:46:08 -0400
Subject: [PATCH 21/27] transfer utility functions

---
 .../scripts/generate-showcase-utilities.sh    | 88 +++++++++++++++++++
 .../scripts/generate-showcase.sh              |  5 --
 2 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 spring-cloud-generator/scripts/generate-showcase-utilities.sh

diff --git a/spring-cloud-generator/scripts/generate-showcase-utilities.sh b/spring-cloud-generator/scripts/generate-showcase-utilities.sh
new file mode 100644
index 0000000000..3373467502
--- /dev/null
+++ b/spring-cloud-generator/scripts/generate-showcase-utilities.sh
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+utilities_script_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")
+
+# gets the output folder where all sources and dependencies will be located.
+get_output_folder() {
+  if [[ $(basename $(pwd)) != "output" ]]; then
+    echo "$(pwd)/output" 
+  else
+    echo $(pwd)
+  fi
+}
+
+get_protoc_version() {
+  local gapic_generator_version=$1
+  local protoc_version
+  pushd "${output_folder}" > /dev/null
+  # get protobuf version from gapic-generator-java-pom-parent/pom.xml
+  download_gapic_generator_pom_parent "${gapic_generator_version}"
+  protoc_version=$(grep protobuf.version "gapic-generator-java-pom-parent-${gapic_generator_version}.pom" | sed 's/<protobuf\.version>\(.*\)<\/protobuf\.version>/\1/' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | cut -d "." -f2-)
+  popd > /dev/null
+  echo "${protoc_version}"
+}
+
+detect_os_architecture() {
+  local os_type
+  local os_architecture
+  os_type=$(uname -sm)
+  case "${os_type}" in
+    *"Linux x86_64"*)
+      os_architecture="linux-x86_64"
+      ;;
+    *"Darwin x86_64"*)
+      os_architecture="osx-x86_64"
+      ;;
+    *)
+      os_architecture="osx-aarch_64"
+      ;;
+  esac
+  echo "${os_architecture}"
+}
+
+download_protoc() {
+  local protoc_version=$1
+  local os_architecture=$2
+  if [ ! -d "protoc-${protoc_version}" ]; then
+    # pull proto files and protoc from protobuf repository as maven central
+    # doesn't have proto files
+    download_from \
+    "https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-${os_architecture}.zip" \
+    "protoc-${protoc_version}.zip" \
+    "GitHub"
+    unzip -o -q "protoc-${protoc_version}.zip" -d "protoc-${protoc_version}"
+    cp -r "protoc-${protoc_version}/include/google" .
+    rm "protoc-${protoc_version}.zip"
+  fi
+
+  protoc_path="${output_folder}/protoc-${protoc_version}/bin"
+}
+
+# get gapic options from .yaml and .json files from proto_path.
+get_gapic_opts() {
+  local transport=$1
+  local rest_numeric_enums=$2
+  local gapic_yaml=$3
+  local service_config=$4
+  local service_yaml=$5
+  if [ "${rest_numeric_enums}" == "true" ]; then
+    rest_numeric_enums="rest-numeric-enums"
+  else
+    rest_numeric_enums=""
+  fi
+  # If any of the gapic options is empty (default value), try to search for
+  # it in proto_path.
+  if [[ "${gapic_yaml}" == "" ]]; then
+    gapic_yaml=$(find "${proto_path}" -type f -name "*gapic.yaml")
+  fi
+
+  if [[ "${service_config}" == "" ]]; then
+    service_config=$(find "${proto_path}" -type f -name "*service_config.json")
+  fi
+
+  if [[ "${service_yaml}" == "" ]]; then
+    service_yaml=$(find "${proto_path}" -maxdepth 1 -type f \( -name "*.yaml" ! -name "*gapic*.yaml" \))
+  fi
+  echo "transport=${transport},${rest_numeric_enums},grpc-service-config=${service_config},gapic-config=${gapic_yaml},api-service-config=${service_yaml}"
+}
diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 62424bd993..cd9051bba3 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -68,11 +68,6 @@ function generate_showcase_spring_starter(){
   pushd sdk-platform-java
   git checkout "v${gapic_generator_java_version}"
 
-  # We will use the generation tools from library_generation
-  pushd library_generation/utils
-  source utilities.sh
-  popd #library_generation/utils
-
   # Install showcase client libraries locally
   pushd showcase
   # For local development, we cleanup any traces of previous runs

From 23f7e165995b026d46e2d9d307eae7ebdd610d35 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Tue, 21 May 2024 13:47:14 -0400
Subject: [PATCH 22/27] ignore vim swap files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d34867932f..277f56d94d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ mail.properties
 *.ipr
 *.iws
 *.swp
+*.swo
 .project
 .classpath
 .settings/

From 7f131522cca2471ceef5002343ac63d476e67440 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Tue, 21 May 2024 14:21:11 -0400
Subject: [PATCH 23/27] partial transfer of util functions

---
 .../scripts/generate-showcase-utilities.sh    | 55 +++++++++++++++++++
 .../scripts/generate-showcase.sh              | 23 ++++----
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase-utilities.sh b/spring-cloud-generator/scripts/generate-showcase-utilities.sh
index 3373467502..fdcb445e09 100644
--- a/spring-cloud-generator/scripts/generate-showcase-utilities.sh
+++ b/spring-cloud-generator/scripts/generate-showcase-utilities.sh
@@ -34,6 +34,9 @@ detect_os_architecture() {
     *"Darwin x86_64"*)
       os_architecture="osx-x86_64"
       ;;
+    "MINGW64"*)
+      os_architecture="win64"
+      ;;
     *)
       os_architecture="osx-aarch_64"
       ;;
@@ -86,3 +89,55 @@ get_gapic_opts() {
   fi
   echo "transport=${transport},${rest_numeric_enums},grpc-service-config=${service_config},gapic-config=${gapic_yaml},api-service-config=${service_yaml}"
 }
+
+download_from() {
+  local url=$1
+  local save_as=$2
+  local repo=$3
+  # fail-fast, 30 seconds at most, retry 2 times
+  curl -LJ -o "${save_as}" --fail -m 30 --retry 2 "$url" || download_fail "${save_as}" "${repo}"
+}
+
+download_gapic_generator_pom_parent() {
+  local gapic_generator_version=$1
+  download_generator_artifact "${gapic_generator_version}" "gapic-generator-java-pom-parent-${gapic_generator_version}.pom" "gapic-generator-java-pom-parent"
+}
+
+download_generator_artifact() {
+  local gapic_generator_version=$1
+  local artifact=$2
+  local project=${3:-"gapic-generator-java"}
+  if [ ! -f "${artifact}" ]; then
+    # first, try to fetch the generator locally
+    local local_fetch_successful
+    local_fetch_successful=$(copy_from "$HOME/.m2/repository/com/google/api/${project}/${gapic_generator_version}/${artifact}" \
+      "${artifact}")
+    if [[ "${local_fetch_successful}" == "false" ]];then 
+      # download gapic-generator-java artifact from Google maven central mirror if not
+      # found locally
+      >&2 echo "${artifact} not found locally. Attempting a download from Maven Central"
+      download_from \
+      "https://maven-central.storage-download.googleapis.com/maven2/com/google/api/${project}/${gapic_generator_version}/${artifact}" \
+      "${artifact}"
+      >&2 echo "${artifact} found and downloaded from Maven Central"
+    else
+      >&2 echo "${artifact} found copied from local repository (~/.m2)"
+    fi
+  fi
+}
+
+download_fail() {
+  local artifact=$1
+  local repo=${2:-"maven central mirror"}
+  >&2 echo "Fail to download ${artifact} from ${repo} repository. Please install ${artifact} first if you want to use a non-published artifact."
+  exit 1
+}
+
+# copies the specified file in $1 to $2
+# will return "true" if the copy was successful
+copy_from() {
+  local local_repo=$1
+  local save_as=$2
+  copy_successful=$(cp "${local_repo}" "${save_as}" && echo "true" || echo "false")
+  echo "${copy_successful}"
+}
diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index cd9051bba3..30d5df0fb2 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -11,15 +11,14 @@ do
 done
 
 # For reusing bazel setup modifications and post-processing steps
-source ./scripts/generate-steps.sh
+script_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")
+source "${script_dir}/generate-showcase-utilities.sh"
+source "${script_dir}/generate-steps.sh"
 
-# If not set, assume working directory is spring-cloud-generator
-if [[ -z "${SPRING_GENERATOR_DIR}" ]]; then
-  SPRING_GENERATOR_DIR=$(pwd)
-fi
-spring_root_dir=${SPRING_GENERATOR_DIR}/..
-showcase_starter_old_dir=${SPRING_GENERATOR_DIR}/showcase/showcase-spring-starter
-showcase_starter_new_dir=${SPRING_GENERATOR_DIR}/showcase/showcase-spring-starter-generated
+spring_generator_dir="${script_dir}/.."
+spring_root_dir=${spring_generator_dir}/..
+showcase_starter_old_dir=${spring_generator_dir}/showcase/showcase-spring-starter
+showcase_starter_new_dir=${spring_generator_dir}/showcase/showcase-spring-starter-generated
 
 # Verifies newly generated showcase-spring-starter against goldens
 #
@@ -53,7 +52,7 @@ function generate_showcase_spring_starter(){
   # Compute the parent project version.
   pushd "${spring_root_dir}"
   export project_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-  cd "${SPRING_GENERATOR_DIR}"
+  cd "${spring_generator_dir}"
   gapic_generator_java_version=$(mvn help:evaluate -Dexpression=gapic-generator-java-bom.version -q -DforceStdout)
 
   if [[ -z "${gapic_generator_java_version}" ]]; then
@@ -127,7 +126,7 @@ function generate_showcase_spring_starter(){
 
   "${protoc_path}"/protoc \
     "--experimental_allow_proto3_optional" \
-    "--plugin=protoc-gen-java_gapic_spring=${SPRING_GENERATOR_DIR}/spring-cloud-generator-wrapper" \
+    "--plugin=protoc-gen-java_gapic_spring=${spring_generator_dir}/spring-cloud-generator-wrapper" \
     "--java_gapic_spring_out=${output_folder}/${output_srcjar_zip_name}" \
     "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \
     ${proto_files} ${gapic_additional_protos} # Do not quote because this variable should not be treated as one long string.
@@ -137,7 +136,7 @@ function generate_showcase_spring_starter(){
 
   # Post-process generated modules
   unzip "${output_srcjar_zip_name}"
-  copy_and_unzip "${output_folder}/temp-codegen-spring.srcjar" "temp-codegen-spring.srcjar" "${SPRING_GENERATOR_DIR}/showcase" ${showcase_starter_dir}
+  copy_and_unzip "${output_folder}/temp-codegen-spring.srcjar" "temp-codegen-spring.srcjar" "${spring_generator_dir}/showcase" ${showcase_starter_dir}
   modify_starter_pom "${showcase_starter_dir}/pom.xml" "com.google.cloud" "gapic-showcase" "${project_version}"
 
   popd #output_folder
@@ -155,7 +154,7 @@ function generate_showcase_spring_starter(){
   # Remove downloaded repos
   popd #showcase
   popd #sdk-platform-java
-  rm -rdf ${SPRING_GENERATOR_DIR}/sdk-platform-java
+  rm -rdf "${spring_generator_dir}/sdk-platform-java"
   rm -rdf gapic-showcase
   popd #spring_root_dir
 }

From 2bd371cd740ad620c46f526e42cff1e1f5e9a9e9 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 20 Jun 2024 20:53:42 +0000
Subject: [PATCH 24/27] add sparse_clone function

---
 .../scripts/generate-showcase-utilities.sh      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/spring-cloud-generator/scripts/generate-showcase-utilities.sh b/spring-cloud-generator/scripts/generate-showcase-utilities.sh
index fdcb445e09..4102db6110 100644
--- a/spring-cloud-generator/scripts/generate-showcase-utilities.sh
+++ b/spring-cloud-generator/scripts/generate-showcase-utilities.sh
@@ -141,3 +141,20 @@ copy_from() {
   copy_successful=$(cp "${local_repo}" "${save_as}" && echo "true" || echo "false")
   echo "${copy_successful}"
 }
+
+# Convenience function to clone only the necessary folders from a git repository
+sparse_clone() {
+  repo_url=$1
+  paths=$2
+  commitish=$3
+  clone_dir=$(basename "${repo_url%.*}")
+  rm -rf "${clone_dir}"
+  git clone -n --depth=1 --no-single-branch --filter=tree:0 "${repo_url}"
+  pushd "${clone_dir}"
+  if [ -n "${commitish}" ]; then
+    git checkout "${commitish}"
+  fi
+  git sparse-checkout set --no-cone ${paths}
+  git checkout
+  popd
+}

From 407d35cb567c11bf6f2539b1220a9431faf01016 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 20 Jun 2024 20:55:09 +0000
Subject: [PATCH 25/27] use variable as argument to remove output folder

---
 spring-cloud-generator/scripts/generate-showcase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 30d5df0fb2..740267449a 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -70,7 +70,7 @@ function generate_showcase_spring_starter(){
   # Install showcase client libraries locally
   pushd showcase
   # For local development, we cleanup any traces of previous runs
-  rm -rdf output
+  rm -rdf "${output_folder}"
   mvn clean install
   gapic_showcase_client_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 

From 9bf447a9d752fca0b01a3f5a366f96354c4a33f0 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 20 Jun 2024 22:01:13 +0000
Subject: [PATCH 26/27] remove unnecessary inputs to get_gapic_opts

---
 spring-cloud-generator/scripts/generate-showcase.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index 740267449a..ef7b5b4664 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -118,7 +118,6 @@ function generate_showcase_spring_starter(){
   gapic_additional_protos="google/iam/v1/iam_policy.proto google/cloud/location/locations.proto"
   rest_numeric_enums="false"
   transport="grpc+rest"
-  gapic_yaml=""
   service_config="schema/google/showcase/v1beta1/showcase_grpc_service_config.json"
   service_yaml="schema/google/showcase/v1beta1/showcase_v1beta1.yaml"
   include_samples="false"

From b0b695f7459447e8ad3bd10df8c25e01eb9fceb9 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 20 Jun 2024 22:05:30 +0000
Subject: [PATCH 27/27] remove include_samples

---
 spring-cloud-generator/scripts/generate-showcase.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-cloud-generator/scripts/generate-showcase.sh b/spring-cloud-generator/scripts/generate-showcase.sh
index ef7b5b4664..12d5fcb7ee 100644
--- a/spring-cloud-generator/scripts/generate-showcase.sh
+++ b/spring-cloud-generator/scripts/generate-showcase.sh
@@ -120,14 +120,13 @@ function generate_showcase_spring_starter(){
   transport="grpc+rest"
   service_config="schema/google/showcase/v1beta1/showcase_grpc_service_config.json"
   service_yaml="schema/google/showcase/v1beta1/showcase_v1beta1.yaml"
-  include_samples="false"
   output_srcjar_zip_name="showcase_java_gapic_spring_raw.srcjar.zip"
 
   "${protoc_path}"/protoc \
     "--experimental_allow_proto3_optional" \
     "--plugin=protoc-gen-java_gapic_spring=${spring_generator_dir}/spring-cloud-generator-wrapper" \
     "--java_gapic_spring_out=${output_folder}/${output_srcjar_zip_name}" \
-    "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \
+    "--java_gapic_spring_opt=$(get_gapic_opts  "${transport}" "${rest_numeric_enums}" "" "${service_config}" "${service_yaml}")" \
     ${proto_files} ${gapic_additional_protos} # Do not quote because this variable should not be treated as one long string.