googleapis
diff --git a/‎.github/release-please.yml‎
Lines changed: 3 additions & 4 deletions b/‎.github/release-please.yml‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎.github/scripts/update_generation_config.sh‎
Lines changed: 11 additions & 1 deletion b/‎.github/scripts/update_generation_config.sh‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎.github/workflows/hermetic_library_generation.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/hermetic_library_generation.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/unmanaged-dependency-check.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/unmanaged-dependency-check.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎.kokoro/nightly/integration-named-db.cfg‎
Lines changed: 1 addition & 1 deletion b/‎.kokoro/nightly/integration-named-db.cfg‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.kokoro/nightly/integration.cfg‎
Lines changed: 6 additions & 0 deletions b/‎.kokoro/nightly/integration.cfg‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.kokoro/presubmit/graalvm-a.cfg‎
Lines changed: 6 additions & 1 deletion b/‎.kokoro/presubmit/graalvm-a.cfg‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎.kokoro/presubmit/graalvm-b.cfg‎
Lines changed: 6 additions & 1 deletion b/‎.kokoro/presubmit/graalvm-b.cfg‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎.kokoro/presubmit/graalvm-c.cfg‎
Lines changed: 6 additions & 1 deletion b/‎.kokoro/presubmit/graalvm-c.cfg‎
Lines changed: 6 additions & 1 deletion
@@ -2,7 +2,6 @@ bumpMinorPreMajor: true
 handleGHRelease: true
 releaseType: java-yoshi
 branches:
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-yoshi
-    branch: java7
+    - branch: java7
+    - branch: protobuf-4.x-rc
+      manifest: true
@@ -18,7 +18,17 @@ function get_latest_released_version() {
     group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
     url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
     xml_content=$(curl -s --fail "${url}")
-    latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
+    
+    # 1. Extract all version tags
+    # 2. Strip the XML tags to leave just the version numbers
+    # 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
+    # 4. Sort by version (V) and take the last one (tail -n 1)
+    latest=$(echo "${xml_content}" \
+      | grep -oE '<version>[0-9]+\.[0-9]+\.[0-9]+</version>' \
+      | sed -E 's/<[^>]+>//g' \
+      | sort -V \
+      | tail -n 1)
+    
     if [[ -z "${latest}" ]]; then
         echo "The latest version of ${group_id}:${artifact_id} is empty."
         echo "The returned json from maven.org is invalid: ${json_content}"
 
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.64.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
 
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
       with:
         bom-path: google-cloud-firestore-bom/pom.xml
@@ -1,5 +1,7 @@
 target/
 .idea/
+.idx/
+.vscode/
 *.iml
 __pycache__/
 .DS_Store
 
@@ -13,7 +13,7 @@ env_vars: {
 
 env_vars: {
   key: "INTEGRATION_TEST_ARGS"
-  value: "-DFIRESTORE_NAMED_DATABASE=test-db"
+  value: "-DFIRESTORE_NAMED_DATABASE=test-db -DFIRESTORE_EDITION=standard"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
 
@@ -10,6 +10,12 @@ env_vars: {
   key: "JOB_TYPE"
   value: "integration"
 }
+
+env_vars: {
+  key: "INTEGRATION_TEST_ARGS"
+  value: "-DFIRESTORE_EDITION=standard"
+}
+
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
 
@@ -11,6 +11,11 @@ env_vars: {
   value: "graalvm"
 }
 
+env_vars: {
+  key: "INTEGRATION_TEST_ARGS"
+  value: "-DFIRESTORE_EDITION=standard"
+}
+
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
@@ -35,4 +40,4 @@ env_vars: {
 env_vars: {
   key: "IT_SERVICE_ACCOUNT_EMAIL"
   value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
-}
+}
@@ -11,6 +11,11 @@ env_vars: {
   value: "graalvm"
 }
 
+env_vars: {
+  key: "INTEGRATION_TEST_ARGS"
+  value: "-DFIRESTORE_EDITION=standard"
+}
+
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
@@ -35,4 +40,4 @@ env_vars: {
 env_vars: {
   key: "IT_SERVICE_ACCOUNT_EMAIL"
   value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
-}
+}
@@ -11,6 +11,11 @@ env_vars: {
   value: "graalvm"
 }
 
+env_vars: {
+  key: "INTEGRATION_TEST_ARGS"
+  value: "-DFIRESTORE_EDITION=standard"
+}
+
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
@@ -35,4 +40,4 @@ env_vars: {
 env_vars: {
   key: "IT_SERVICE_ACCOUNT_EMAIL"
   value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ env_vars: {`
`13`	`13`
`14`	`14`	`env_vars: {`
`15`	`15`	`key: "INTEGRATION_TEST_ARGS"`
`16`		`- value: "-DFIRESTORE_NAMED_DATABASE=test-db"`
	`16`	`+ value: "-DFIRESTORE_NAMED_DATABASE=test-db -DFIRESTORE_EDITION=standard"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`# TODO: remove this after we've migrated all tests and scripts`