diff --git a/.github/release-please.yml b/.github/release-please.yml index 67eae62c4b..64a2f5f5db 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,6 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +extraFiles: + - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java branches: - bumpMinorPreMajor: true handleGHRelease: true @@ -86,5 +88,11 @@ branches: - >- google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java branch: 2.60.x -extraFiles: - - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + extraFiles: + - >- + google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java + branch: protobuf-4.x-rc + manifest: true diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 973ebf2f8e..ece46ef3a7 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -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.54.2 with: bom-path: google-cloud-bigtable-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index 55c5543e26..b772eac66c 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 5c981b9848..baf136cf82 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index f2032499df..2fb2fc87c4 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index 25bf2b781e..e9a265cd06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.70.1](https://github.com/googleapis/java-bigtable/compare/v2.70.0...v2.70.1) (2025-12-12) + + +### Dependencies + +* Update shared dependencies ([#2734](https://github.com/googleapis/java-bigtable/issues/2734)) ([2823705](https://github.com/googleapis/java-bigtable/commit/28237059edaa20028ea35a1903bdee8c02885260)) + ## [2.70.0](https://github.com/googleapis/java-bigtable/compare/v2.69.0...v2.70.0) (2025-11-18) diff --git a/README.md b/README.md index 92171f63a3..4cc3a2743b 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.70.0' +implementation 'com.google.cloud:google-cloud-bigtable:2.70.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.70.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.70.1" ``` ## Authentication @@ -471,7 +471,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.70.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.70.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index c488f4904e..a3fe7310c6 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom com.google.cloud sdk-platform-java-config - 3.54.1 + 3.54.2 @@ -63,37 +63,37 @@ com.google.cloud google-cloud-bigtable - 2.70.0 + 2.70.1 com.google.cloud google-cloud-bigtable-emulator - 0.207.0 + 0.207.1 com.google.cloud google-cloud-bigtable-emulator-core - 0.207.0 + 0.207.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.70.0 + 2.70.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.70.0 + 2.70.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.70.0 + 2.70.1 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.70.0 + 2.70.1 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index d2d6f24b13..7f5fdc1686 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -7,13 +7,13 @@ com.google.cloud sdk-platform-java-config - 3.54.1 + 3.54.2 com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom Google Cloud Bigtable Dependency BOM @@ -68,7 +68,7 @@ com.google.cloud gapic-libraries-bom - 1.74.0 + 1.74.1 pom import diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index 81b76affcf..8225d42201 100644 --- a/google-cloud-bigtable-emulator-core/pom.xml +++ b/google-cloud-bigtable-emulator-core/pom.xml @@ -7,12 +7,12 @@ google-cloud-bigtable-parent com.google.cloud - 2.70.0 + 2.70.1 Google Cloud Java - Bigtable Emulator Core google-cloud-bigtable-emulator-core - 0.207.0 + 0.207.1 A Java wrapper for the Cloud Bigtable emulator. diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 0b9fed06df..aee04f48f2 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.207.0 + 0.207.1 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.70.0 + 2.70.1 scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.207.0 + 0.207.1 diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 6a4b3fd21c..aa1b32e0bc 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.70.0 + 2.70.1 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.70.0 + 2.70.1 - 2.70.0 + 2.70.1 google-cloud-bigtable @@ -54,14 +54,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index 169e965d61..8404d7e93d 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "2.70.0"; + public static String VERSION = "2.70.1"; // {x-version-update-end} } diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamMergingAcceptanceTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamMergingAcceptanceTest.java index 7c3243ecfe..0465b87efe 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamMergingAcceptanceTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamMergingAcceptanceTest.java @@ -285,20 +285,20 @@ public void test() throws Exception { private static boolean expectsError(ReadChangeStreamTest testCase) { List results = testCase.getResultsList(); - return results != null && !results.isEmpty() && results.get(results.size() - 1).getError(); + return !results.isEmpty() && results.get(results.size() - 1).getError(); } private static List getNonExceptionResults( ReadChangeStreamTest testCase) { List results = testCase.getResultsList(); List response = new ArrayList<>(); - if (results != null) { - for (ReadChangeStreamTest.Result result : results) { - if (!result.getError()) { - response.add(result); - } + + for (ReadChangeStreamTest.Result result : results) { + if (!result.getError()) { + response.add(result); } } + return response; } } diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java index e478eb911d..8a455d3c1b 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java @@ -142,20 +142,20 @@ public void test() throws Exception { private static boolean expectsError(ReadRowsTest rrt) { List results = rrt.getResultsList(); - return results != null && !results.isEmpty() && results.get(results.size() - 1).getError(); + return !results.isEmpty() && results.get(results.size() - 1).getError(); } private static List getNonExceptionResults(ReadRowsTest rrt) { List results = rrt.getResultsList(); List response = new ArrayList<>(); - if (results != null) { - for (ReadRowsTest.Result result : results) { - if (!result.getError()) { - response.add(result); - } + + for (ReadRowsTest.Result result : results) { + if (!result.getError()) { + response.add(result); } } + return response; } } diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index bb452b01c0..31361aedf7 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.70.0 + 2.70.1 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.70.0 + 2.70.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index b78d5e5ea3..c11f7b9ec0 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.70.0 + 2.70.1 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.70.0 + 2.70.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom import diff --git a/pom.xml b/pom.xml index 3fcd706262..b79b48d696 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.70.0 + 2.70.1 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.54.1 + 3.54.2 @@ -156,27 +156,27 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.70.0 + 2.70.1 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.70.0 + 2.70.1 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.70.0 + 2.70.1 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.70.0 + 2.70.1 com.google.cloud google-cloud-bigtable - 2.70.0 + 2.70.1 diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index fa309c627b..0313c7868e 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.70.0 + 2.70.1 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.70.0 + 2.70.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 1e747d0995..ead3932325 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.70.0 + 2.70.1 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.70.0 + 2.70.1 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.70.0 + 2.70.1 pom import com.google.cloud google-cloud-bigtable-bom - 2.70.0 + 2.70.1 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 67a4886439..309646b799 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.70.0 + 2.70.1 diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index 41c9934ee3..c42d6e673d 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.70.0 + 2.70.1 - 2.70.0 + 2.70.1 diff --git a/versions.txt b/versions.txt index 6504a55414..e8cec64f3a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.70.0:2.70.0 -grpc-google-cloud-bigtable-admin-v2:2.70.0:2.70.0 -grpc-google-cloud-bigtable-v2:2.70.0:2.70.0 -proto-google-cloud-bigtable-admin-v2:2.70.0:2.70.0 -proto-google-cloud-bigtable-v2:2.70.0:2.70.0 -google-cloud-bigtable-emulator:0.207.0:0.207.0 -google-cloud-bigtable-emulator-core:0.207.0:0.207.0 +google-cloud-bigtable:2.70.1:2.70.1 +grpc-google-cloud-bigtable-admin-v2:2.70.1:2.70.1 +grpc-google-cloud-bigtable-v2:2.70.1:2.70.1 +proto-google-cloud-bigtable-admin-v2:2.70.1:2.70.1 +proto-google-cloud-bigtable-v2:2.70.1:2.70.1 +google-cloud-bigtable-emulator:0.207.1:0.207.1 +google-cloud-bigtable-emulator-core:0.207.1:0.207.1