From 323fe5fe9922db34698ab765a4d5a811e443ce34 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Sat, 15 Oct 2022 05:00:15 +0000 Subject: [PATCH] chore: Fix update_versions.sh to include beyondcorp --- .release-please-manifest.json | 10 +++++----- generation/update_versions.sh | 7 +++++-- java-beyondcorp-appconnections/versions.txt | 6 +++--- java-beyondcorp-appconnectors/versions.txt | 6 +++--- java-beyondcorp-appgateways/versions.txt | 6 +++--- java-beyondcorp-clientconnectorservices/versions.txt | 6 +++--- java-beyondcorp-clientgateways/versions.txt | 6 +++--- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 836d8813f4ba..d07002c286af 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -20,11 +20,11 @@ "java-automl": "2.3.18", "java-bare-metal-solution": "0.3.8", "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-beyondcorp-appconnections": "0.1.0", + "java-beyondcorp-appconnectors": "0.1.0", + "java-beyondcorp-appgateways": "0.1.0", + "java-beyondcorp-clientconnectorservices": "0.1.3", + "java-beyondcorp-clientgateways": "0.1.0", "java-bigqueryconnection": "2.5.6", "java-bigquery-data-exchange": "0.4.0", "java-bigquerydatapolicy": "0.0.0", diff --git a/generation/update_versions.sh b/generation/update_versions.sh index 91e75845bf71..36147ffc9d46 100755 --- a/generation/update_versions.sh +++ b/generation/update_versions.sh @@ -58,8 +58,7 @@ count=0 missing_artifacts=() for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort | xargs dirname); do - # As of 9/21/22: BeyondCorp repos do not have artifacts released to maven central - if [[ "${path}" =~ gapic-libraries-bom ]] || [[ "${path}" =~ .*samples.* ]] || [[ "${path}" =~ .*beyondcorp.* ]]; then + if [[ "${path}" =~ gapic-libraries-bom ]] || [[ "${path}" =~ .*samples.* ]]; then continue fi @@ -95,6 +94,8 @@ for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort | xargs dirnam maven_latest_version=$(echo "${maven_metadata_version}" | cut -d "-" -f1) maven_latest_trailing=$(echo "${maven_metadata_version}" | cut -s -d "-" -f2-) + echo "${artifactId} has latest version: ${maven_latest_version}" + major_version=$(echo "${maven_latest_version}" | cut -d "." -f1) minor_version=$(echo "${maven_latest_version}" | cut -d "." -f2) patch_version=$(echo "${maven_latest_version}" | cut -d "." -f3) @@ -110,6 +111,8 @@ for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort | xargs dirnam new_version="${artifactId}:${maven_metadata_version}:${maven_metadata_version}" fi + echo "Updating ${artifactId} from version ${maven_metadata_version} to ${new_version}" + sed -i.bak "s/${line}/${new_version}/g" "${path}/versions.txt" && rm "${path}/versions.txt.bak" else missing_artifacts+=("${artifactId}") diff --git a/java-beyondcorp-appconnections/versions.txt b/java-beyondcorp-appconnections/versions.txt index a912291c18f3..b072e86d3506 100644 --- a/java-beyondcorp-appconnections/versions.txt +++ b/java-beyondcorp-appconnections/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-beyondcorp-appconnections:0.0.0:0.1.0-SNAPSHOT -proto-google-cloud-beyondcorp-appconnections-v1:0.0.0:0.1.0-SNAPSHOT -grpc-google-cloud-beyondcorp-appconnections-v1:0.0.0:0.1.0-SNAPSHOT +google-cloud-beyondcorp-appconnections:0.1.0:0.1.1-SNAPSHOT +proto-google-cloud-beyondcorp-appconnections-v1:0.1.0:0.1.1-SNAPSHOT +grpc-google-cloud-beyondcorp-appconnections-v1:0.1.0:0.1.1-SNAPSHOT diff --git a/java-beyondcorp-appconnectors/versions.txt b/java-beyondcorp-appconnectors/versions.txt index 9ec3782298ee..73b4bbd25027 100644 --- a/java-beyondcorp-appconnectors/versions.txt +++ b/java-beyondcorp-appconnectors/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-beyondcorp-appconnectors:0.0.0:0.1.0-SNAPSHOT -proto-google-cloud-beyondcorp-appconnectors-v1:0.0.0:0.1.0-SNAPSHOT -grpc-google-cloud-beyondcorp-appconnectors-v1:0.0.0:0.1.0-SNAPSHOT +google-cloud-beyondcorp-appconnectors:0.1.0:0.1.1-SNAPSHOT +proto-google-cloud-beyondcorp-appconnectors-v1:0.1.0:0.1.1-SNAPSHOT +grpc-google-cloud-beyondcorp-appconnectors-v1:0.1.0:0.1.1-SNAPSHOT diff --git a/java-beyondcorp-appgateways/versions.txt b/java-beyondcorp-appgateways/versions.txt index 12b1f3154842..e2d23ce3f0e5 100644 --- a/java-beyondcorp-appgateways/versions.txt +++ b/java-beyondcorp-appgateways/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-beyondcorp-appgateways:0.0.0:0.1.0-SNAPSHOT -proto-google-cloud-beyondcorp-appgateways-v1:0.0.0:0.1.0-SNAPSHOT -grpc-google-cloud-beyondcorp-appgateways-v1:0.0.0:0.1.0-SNAPSHOT +google-cloud-beyondcorp-appgateways:0.1.0:0.1.1-SNAPSHOT +proto-google-cloud-beyondcorp-appgateways-v1:0.1.0:0.1.1-SNAPSHOT +grpc-google-cloud-beyondcorp-appgateways-v1:0.1.0:0.1.1-SNAPSHOT diff --git a/java-beyondcorp-clientconnectorservices/versions.txt b/java-beyondcorp-clientconnectorservices/versions.txt index 468ee2d6ca54..130342df694e 100644 --- a/java-beyondcorp-clientconnectorservices/versions.txt +++ b/java-beyondcorp-clientconnectorservices/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-beyondcorp-clientconnectorservices:0.1.2:0.1.3-SNAPSHOT -proto-google-cloud-beyondcorp-clientconnectorservices-v1:0.1.2:0.1.3-SNAPSHOT -grpc-google-cloud-beyondcorp-clientconnectorservices-v1:0.1.2:0.1.3-SNAPSHOT +google-cloud-beyondcorp-clientconnectorservices:0.1.3:0.1.4-SNAPSHOT +proto-google-cloud-beyondcorp-clientconnectorservices-v1:0.1.3:0.1.4-SNAPSHOT +grpc-google-cloud-beyondcorp-clientconnectorservices-v1:0.1.3:0.1.4-SNAPSHOT diff --git a/java-beyondcorp-clientgateways/versions.txt b/java-beyondcorp-clientgateways/versions.txt index f3c9ebd622f1..7460976e960b 100644 --- a/java-beyondcorp-clientgateways/versions.txt +++ b/java-beyondcorp-clientgateways/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-beyondcorp-clientgateways:0.0.0:0.1.0-SNAPSHOT -proto-google-cloud-beyondcorp-clientgateways-v1:0.0.0:0.1.0-SNAPSHOT -grpc-google-cloud-beyondcorp-clientgateways-v1:0.0.0:0.1.0-SNAPSHOT +google-cloud-beyondcorp-clientgateways:0.1.0:0.1.1-SNAPSHOT +proto-google-cloud-beyondcorp-clientgateways-v1:0.1.0:0.1.1-SNAPSHOT +grpc-google-cloud-beyondcorp-clientgateways-v1:0.1.0:0.1.1-SNAPSHOT