@@ -1,134 +1,134 @@
 {
   "google-cloud-gapic-bom": "0.0.0",
-  "java-accessapproval": "2.4.8",
-  "java-accesscontextmanager": "1.4.3",
-  "java-aiplatform": "3.3.0",
-  "java-analytics-admin": "0.13.2",
-  "java-analytics-data": "0.14.6",
-  "java-api-gateway": "2.3.4",
-  "java-apigee-connect": "2.3.4",
-  "java-apigee-registry": "0.3.0",
+  "java-accessapproval": "2.4.9",
+  "java-accesscontextmanager": "1.4.5",
+  "java-aiplatform": "3.4.0",
+  "java-analytics-admin": "0.13.4",
+  "java-analytics-data": "0.14.7",
+  "java-api-gateway": "2.3.6",
+  "java-apigee-connect": "2.3.7",
+  "java-apigee-registry": "0.3.1",
   "java-appengine-admin": "2.3.4",
-  "java-area120-tables": "0.7.4",
-  "java-artifact-registry": "1.2.7",
-  "java-asset": "3.6.0",
-  "java-assured-workloads": "2.2.0",
-  "java-automl": "2.3.14",
-  "java-bare-metal-solution": "0.3.4",
-  "java-batch": "0.3.0",
+  "java-area120-tables": "0.7.8",
+  "java-artifact-registry": "1.2.9",
+  "java-asset": "3.7.0",
+  "java-assured-workloads": "2.2.1",
+  "java-automl": "2.3.16",
+  "java-bare-metal-solution": "0.3.7",
+  "java-batch": "0.3.2",
   "java-beyondcorp-appconnections": "0.0.0",
   "java-beyondcorp-appconnectors": "0.0.0",
   "java-beyondcorp-appgateways": "0.0.0",
   "java-beyondcorp-clientconnectorservices": "0.1.2",
   "java-beyondcorp-clientgateways": "0.0.0",
-  "java-bigqueryconnection": "2.5.4",
+  "java-bigqueryconnection": "2.5.5",
   "java-bigquery-data-exchange": "0.3.2",
-  "java-bigquerydatatransfer": "2.3.14",
-  "java-bigquerymigration": "0.6.0",
-  "java-bigqueryreservation": "2.4.4",
-  "java-billingbudgets": "2.3.4",
-  "java-billing": "2.3.3",
-  "java-binary-authorization": "1.2.7",
-  "java-certificate-manager": "0.5.2",
-  "java-channel": "3.7.4",
-  "java-cloudbuild": "3.5.4",
-  "java-cloudcommerceconsumerprocurement": "0.1.2",
+  "java-bigquerydatatransfer": "2.3.15",
+  "java-bigquerymigration": "0.6.2",
+  "java-bigqueryreservation": "2.4.5",
+  "java-billingbudgets": "2.3.6",
+  "java-billing": "2.3.4",
+  "java-binary-authorization": "1.2.8",
+  "java-certificate-manager": "0.5.3",
+  "java-channel": "3.7.6",
+  "java-cloudbuild": "3.5.6",
+  "java-cloudcommerceconsumerprocurement": "0.1.5",
   "java-compute": "1.12.1",
-  "java-contact-center-insights": "2.3.6",
-  "java-containeranalysis": "2.4.7",
-  "java-container": "2.5.2",
-  "java-datacatalog": "1.9.4",
-  "java-dataflow": "0.7.4",
-  "java-dataform": "0.2.2",
-  "java-data-fusion": "1.3.3",
-  "java-datalabeling": "0.123.5",
-  "java-dataplex": "1.1.2",
-  "java-dataproc-metastore": "2.4.3",
-  "java-dataproc": "4.0.6",
-  "java-datastream": "1.2.0",
-  "java-debugger-client": "1.3.4",
+  "java-contact-center-insights": "2.3.9",
+  "java-containeranalysis": "2.4.9",
+  "java-container": "2.6.0",
+  "java-datacatalog": "1.9.5",
+  "java-dataflow": "0.7.5",
+  "java-dataform": "0.2.3",
+  "java-data-fusion": "1.3.5",
+  "java-datalabeling": "0.123.7",
+  "java-dataplex": "1.1.3",
+  "java-dataproc-metastore": "2.4.4",
+  "java-dataproc": "4.0.7",
+  "java-datastream": "1.2.1",
+  "java-debugger-client": "1.3.5",
   "java-deploy": "1.1.6",
-  "java-dialogflow-cx": "0.14.6",
-  "java-dialogflow": "4.8.6",
-  "java-dlp": "3.7.3",
-  "java-dms": "2.2.5",
+  "java-dialogflow-cx": "0.14.7",
+  "java-dialogflow": "4.9.0",
+  "java-dlp": "3.7.4",
+  "java-dms": "2.2.7",
   "java-dns": "2.1.7",
-  "java-document-ai": "2.7.2",
+  "java-document-ai": "2.7.4",
   "java-domains": "1.0.4",
-  "java-errorreporting": "0.124.11-beta",
-  "java-essential-contacts": "2.3.4",
-  "java-eventarc": "1.3.6",
-  "java-eventarc-publishing": "0.3.4",
-  "java-filestore": "1.4.3",
-  "java-functions": "2.5.2",
-  "java-game-servers": "2.3.3",
+  "java-errorreporting": "0.124.14-beta",
+  "java-essential-contacts": "2.3.5",
+  "java-eventarc": "1.3.7",
+  "java-eventarc-publishing": "0.3.6",
+  "java-filestore": "1.4.5",
+  "java-functions": "2.5.3",
+  "java-game-servers": "2.3.4",
   "java-gke-backup": "0.2.4",
-  "java-gke-connect-gateway": "0.4.5",
+  "java-gke-connect-gateway": "0.4.6",
   "java-gkehub": "1.3.4",
   "java-gke-multi-cloud": "0.2.4",
-  "java-grafeas": "2.4.5",
-  "java-gsuite-addons": "2.3.4",
-  "java-iam-admin": "1.2.5",
-  "java-iamcredentials": "2.3.4",
-  "java-ids": "1.2.4",
+  "java-grafeas": "2.4.6",
+  "java-gsuite-addons": "2.3.5",
+  "java-iam-admin": "1.3.0",
+  "java-iamcredentials": "2.3.6",
+  "java-ids": "1.2.6",
   "java-iot": "2.3.4",
-  "java-kms": "2.6.7",
-  "java-language": "2.4.0",
-  "java-life-sciences": "0.5.4",
-  "java-managed-identities": "1.1.4",
-  "java-mediatranslation": "0.9.4",
-  "java-memcache": "2.3.4",
-  "java-monitoring-dashboards": "2.5.4",
-  "java-monitoring": "3.4.5",
-  "java-networkconnectivity": "1.2.5",
+  "java-kms": "2.6.8",
+  "java-language": "2.4.1",
+  "java-life-sciences": "0.5.5",
+  "java-managed-identities": "1.1.5",
+  "java-mediatranslation": "0.9.5",
+  "java-memcache": "2.3.5",
+  "java-monitoring-dashboards": "2.5.5",
+  "java-monitoring": "3.4.6",
+  "java-networkconnectivity": "1.2.8",
   "java-network-management": "1.4.2",
-  "java-network-security": "0.6.2",
-  "java-notebooks": "1.1.2",
-  "java-notification": "0.123.15-beta",
-  "java-optimization": "1.1.11",
-  "java-orchestration-airflow": "1.3.4",
-  "java-orgpolicy": "2.3.4",
-  "java-os-config": "2.5.4",
-  "java-os-login": "2.2.5",
-  "java-phishingprotection": "0.34.4",
-  "java-policy-troubleshooter": "1.2.4",
+  "java-network-security": "0.6.3",
+  "java-notebooks": "1.1.3",
+  "java-notification": "0.123.16-beta",
+  "java-optimization": "1.1.12",
+  "java-orchestration-airflow": "1.3.5",
+  "java-orgpolicy": "2.3.6",
+  "java-os-config": "2.5.5",
+  "java-os-login": "2.2.6",
+  "java-phishingprotection": "0.34.6",
+  "java-policy-troubleshooter": "1.2.5",
   "java-private-catalog": "0.5.3",
-  "java-profiler": "2.3.3",
-  "java-recaptchaenterprise": "3.0.9",
-  "java-recommendations-ai": "0.10.3",
-  "java-recommender": "2.5.4",
-  "java-redis": "2.6.4",
-  "java-resourcemanager": "1.5.5",
-  "java-resource-settings": "1.3.3",
-  "java-retail": "2.5.0",
-  "java-run": "0.3.3",
-  "java-scheduler": "2.3.11",
-  "java-secretmanager": "2.3.7",
-  "java-securitycenter": "2.10.0",
-  "java-securitycenter-settings": "0.6.4",
-  "java-security-private-ca": "2.5.3",
-  "java-service-control": "1.3.3",
+  "java-profiler": "2.3.4",
+  "java-recaptchaenterprise": "3.0.11",
+  "java-recommendations-ai": "0.10.4",
+  "java-recommender": "2.5.6",
+  "java-redis": "2.6.5",
+  "java-resourcemanager": "1.5.6",
+  "java-resource-settings": "1.3.4",
+  "java-retail": "2.5.1",
+  "java-run": "0.3.5",
+  "java-scheduler": "2.3.12",
+  "java-secretmanager": "2.3.10",
+  "java-securitycenter": "2.11.0",
+  "java-securitycenter-settings": "0.6.6",
+  "java-security-private-ca": "2.5.4",
+  "java-service-control": "1.3.4",
   "java-servicedirectory": "2.4.3",
-  "java-service-management": "3.1.5",
-  "java-service-usage": "2.3.4",
-  "java-shell": "2.2.6",
+  "java-service-management": "3.1.6",
+  "java-service-usage": "2.3.6",
+  "java-shell": "2.2.8",
   "java-speech": "2.5.9",
-  "java-storage-transfer": "1.3.0",
-  "java-talent": "2.4.4",
-  "java-tasks": "2.3.10",
-  "java-texttospeech": "2.4.4",
-  "java-tpu": "2.3.5",
-  "java-trace": "2.3.5",
-  "java-translate": "2.3.4",
-  "java-video-intelligence": "2.2.9",
-  "java-video-live-stream": "0.5.4",
-  "java-video-stitcher": "0.3.4",
+  "java-storage-transfer": "1.3.1",
+  "java-talent": "2.4.5",
+  "java-tasks": "2.3.11",
+  "java-texttospeech": "2.4.8",
+  "java-tpu": "2.4.0",
+  "java-trace": "2.3.7",
+  "java-translate": "2.3.5",
+  "java-video-intelligence": "2.2.12",
+  "java-video-live-stream": "0.5.7",
+  "java-video-stitcher": "0.3.5",
   "java-video-transcoder": "1.2.3",
-  "java-vision": "3.1.1",
-  "java-vmmigration": "1.3.2",
-  "java-vpcaccess": "2.4.0",
-  "java-webrisk": "2.2.4",
-  "java-websecurityscanner": "2.2.4",
-  "java-workflow-executions": "2.3.4",
-  "java-workflows": "2.3.4"
-}
+  "java-vision": "3.1.2",
+  "java-vmmigration": "1.3.4",
+  "java-vpcaccess": "2.4.2",
+  "java-webrisk": "2.2.5",
+  "java-websecurityscanner": "2.3.0",
+  "java-workflow-executions": "2.3.5",
+  "java-workflows": "2.3.5"
+}
@@ -1,70 +1,60 @@
 #!/bin/bash
 
-set -xe
+set -e
 
-echo "{" > .release-please-manifest.json
+GENERATION_DIR=$(dirname -- "$0")
 
-echo ""\""google-cloud-gapic-bom"\"": "\""0.0.0"\""," >> .release-please-manifest.json
+# Hardcode the tab as two spaces instead of \t
+tab="  "
+release_please_manifest_file=".release-please-manifest.json"
+release_please_config_file="release-please-config.json"
 
-GENERATION_DIR=$(dirname -- "$0");
+[ -e "${release_please_manifest_file}" ] && rm "${release_please_manifest_file}"
+[ -e "${release_please_config_file}" ] && rm "${release_please_config_file}"
 
-num_modules=$(find . -mindepth 2 -maxdepth 2 -name pom.xml | wc -l)
-
-rp_config_line=""
-rp_manifest_line=""
+echo "{" > "${release_please_manifest_file}"
 
-for module in $(find . -mindepth 2 -maxdepth 2 -name pom.xml |sort | xargs dirname); do
-
-  if [[ "${module}" = *google-cloud-gapic-bom ]] || [[ "${module}" = *CoverageAggregator ]]; then
+# We are manually excluding the CoverageAggregator module -- TODO: Update this for any other exclusions
+num_modules=$(find . -mindepth 2 -maxdepth 2 -name pom.xml | wc -l)
+num_modules=$((num_modules - 1))
+for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort --dictionary-order | xargs dirname); do
+  if [[ "${path}" = *CoverageAggregator ]]; then
     continue
   fi
 
-  version_file="${module}/versions.txt"
+  # path starts with ./{module}, we need to exclude the first two chars
+  module_name="${path:2}"
+  version_file="${path}/versions.txt"
 
-  module_name="${module:2}"
-
-  module_released_version=$(grep google- ${version_file} |head -1 |awk -F: '{print $2}')
-  module_snapshot_version=$(grep google- ${version_file} |head -1 |awk -F: '{print $3}')
-  artifactName_config=$(grep google- ${version_file} |head -1 |awk -F: '{print $1}')
-
-  #specific case
-  if [[ ${module_name} == "java-grafeas" ]]; then
-    module_released_version=$(grep grafeas ${version_file} |head -1 |awk -F: '{print $2}')
-    artifactName_config=$(grep grafeas ${version_file} |head -1 |awk -F: '{print $1}')
+  # Java-Grafeas is a special case
+  if [[ "${module_name}" = "java-grafeas" ]]; then
+    module_line=$(grep -E "^grafeas:[0-9]+\.[0-9]+\.[0-9]+.*:[0-9]+\.[0-9]+\.[0-9]+.*$" "${version_file}")
+  else
+    module_line=$(grep -E "^google-.*:[0-9]+\.[0-9]+\.[0-9]+.*:[0-9]+\.[0-9]+\.[0-9]+.*$" "${version_file}")
   fi
+  artifact_name=$(echo "${module_line}" | cut -d ":" -f1)
+  module_released_version=$(echo "${module_line}" | cut -d ":" -f2)
+  module_snapshot_version=$(echo "${module_line}" | cut -d ":" -f3)
 
-  #concatenating module name and module version
-  rp_manifest_line=""\""${module_name}"\"": "\""${module_released_version}"\"""
+  # concatenating module name and module version
+  rp_manifest_line="${tab}\"${module_name}\": \"${module_released_version}\""
+  # Generate the JSON block with formatting
+  rp_config_line+="${tab}${tab}\"${module_name}\": {\n${tab}${tab}${tab}\"component\": \"${artifact_name}\",\n${tab}${tab}${tab}\"skip-github-release\": true\n${tab}${tab}}"
 
-  rp_config_line+=""\""${module_name}"\"": {\n\
-          "\""component"\"": ""\""${artifactName_config}"\"","\n\
-          "\""skip-github-release"\"": "true"\n\
-         }"
-
-  #adding " , " where it's necessary
-  if [[ ${num_modules} -gt 2 ]]; then
+  # adding " , " where it's necessary
+  if [[ ${num_modules} -gt 1 ]]; then
     rp_manifest_line+=","
-    rp_config_line+=",\n    "
-    num_modules=$((num_modules-1))
+    rp_config_line+=",\n"
+    num_modules=$((num_modules - 1))
   fi
 
-  #adding the line to manifest config file
-  echo "${rp_manifest_line}" >> .release-please-manifest.json
-
-  #for multi-module libraries, sync the versions to released(non-snapshot):current(snapshot) type
-  cat ${version_file} | while read line
-      do
-         if [[ ${line} =~ [0-9] ]] && ! [[ ${line} == *"SNAPSHOT"* ]] ; then
-           artifact_name=$(echo "${line}" | awk -F':' '{print $1}')
-           old_version=$(echo "${line}" | awk -F':' '{print $3}')
-           new_version=$(echo ${old_version} |  awk -F'.' '{print $1"."$2"."$3+1}' |  sed s/[.]$//)
-           new_version="${new_version}-SNAPSHOT"
-           sed -i.bak -e "s|${artifact_name}:${old_version}:${old_version}|${artifact_name}:${old_version}:${new_version}|" "${version_file}" && rm "${version_file}".bak
-         fi
-      done
+  # Adding the line to manifest config file
+  echo -e "${rp_manifest_line}" >> "${release_please_manifest_file}"
 done
 
-echo "}" >> .release-please-manifest.json
+# End the .json file with the closing bracket
+echo "}" >> "${release_please_manifest_file}"
 
-awk -v "packagesList=$rp_config_line" '{gsub(/ALL_PACKAGES/,packagesList)}1' \
-    ${GENERATION_DIR}/release_please_config_raw.json > release-please-config.json
+# Replace the package list where `ALL_PACKAGES` string is in the release_please_config_raw.json
+awk -v "packagesList=${rp_config_line}" '{gsub(/ALL_PACKAGES/,packagesList)}1' \
+  "${GENERATION_DIR}/release_please_config_raw.json" > "${release_please_config_file}"
@@ -4,11 +4,7 @@
   "separate-pull-requests": false,
   "include-component-in-tag": true,
   "packages": {
-    "google-cloud-gapic-bom": {
-      "component": "google-cloud-gapic-bom",
-      "skip-github-release": true
-    },
-    ALL_PACKAGES
+ALL_PACKAGES
   },
   "plugins": [
     "maven-workspace"
 
@@ -118,3 +118,11 @@ for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort | xargs dirnam
 done
 
 echo "These artifacts don't exist: ${missing_artifacts[*]}"
+
+echo "Generating the release-please configurations..."
+./generation/generate_release_please_config.sh
+echo "Done generating release-please configurations..."
+
+echo "Copying over the README and CHANGELOG files"
+./generation/copy_readme_changelog.sh
+echo "Done copying over the README and CHANGELOG files"
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-accessapproval:2.4.8:2.4.9-SNAPSHOT
-grpc-google-cloud-accessapproval-v1:2.4.8:2.4.9-SNAPSHOT
-proto-google-cloud-accessapproval-v1:2.4.8:2.4.9-SNAPSHOT
+google-cloud-accessapproval:2.4.9:2.4.10-SNAPSHOT
+grpc-google-cloud-accessapproval-v1:2.4.9:2.4.10-SNAPSHOT
+proto-google-cloud-accessapproval-v1:2.4.9:2.4.10-SNAPSHOT