diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 9f1a24bd6..9399ebef2 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.46.1 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.47.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index f1a27f81c..3c00d025e 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 11 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check working-directory: samples diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index b84e6e5ee..e00962128 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -17,6 +17,6 @@ jobs: # repository .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.37.0 with: bom-path: google-cloud-pubsublite-bom/pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 0effa03c5..0f8b919c9 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.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.36.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.37.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 96a8059b9..e6553bd6e 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.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.36.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.37.0" } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index f8300737e..2c0e4383c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.14.4](https://github.com/googleapis/java-pubsublite/compare/v1.14.3...v1.14.4) (2024-10-08) + + +### Bug Fixes + +* **deps:** Update the Java code generator (gapic-generator-java) to 2.47.0 ([e9f991f](https://github.com/googleapis/java-pubsublite/commit/e9f991fd70cfa1b5231fdcd16b1b6d5af62e170b)) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-pubsub to v1.133.1 ([#1736](https://github.com/googleapis/java-pubsublite/issues/1736)) ([05feb1d](https://github.com/googleapis/java-pubsublite/commit/05feb1d1a9b90dffc7c17c0251d6b4ec148af655)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.37.0 ([#1740](https://github.com/googleapis/java-pubsublite/issues/1740)) ([7379905](https://github.com/googleapis/java-pubsublite/commit/7379905102149d767adc94d4d12cf67424eb9ce7)) +* Update googleapis/sdk-platform-java action to v2.47.0 ([#1738](https://github.com/googleapis/java-pubsublite/issues/1738)) ([9b5fac7](https://github.com/googleapis/java-pubsublite/commit/9b5fac7f874279d9aca9474babec43a57e682a6a)) + ## [1.14.3](https://github.com/googleapis/java-pubsublite/compare/v1.14.2...v1.14.3) (2024-09-30) diff --git a/README.md b/README.md index 989be5722..1cd71661e 100644 --- a/README.md +++ b/README.md @@ -20,12 +20,12 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-pubsublite - 1.14.2 + 1.14.3 com.google.cloud google-cloud-pubsub - 1.132.3 + 1.133.1 ``` @@ -33,13 +33,13 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-pubsublite:1.14.3' +implementation 'com.google.cloud:google-cloud-pubsublite:1.14.4' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsublite" % "1.14.3" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsublite" % "1.14.4" ``` @@ -483,7 +483,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-pubsublite/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-pubsublite.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsublite/1.14.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsublite/1.14.4 [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/generation_config.yaml b/generation_config.yaml index f5a7f5502..c61b15d49 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,6 +1,6 @@ -gapic_generator_version: 2.46.1 -googleapis_commitish: d6f184876ec67295addccbb70aa4af622e049a7e -libraries_bom_version: 26.47.0 +gapic_generator_version: 2.47.0 +googleapis_commitish: 3effbf23b1a1d1fe1306356e94397e20d01d31a0 +libraries_bom_version: 26.48.0 libraries: - api_shortname: pubsublite name_pretty: Cloud Pub/Sub Lite diff --git a/google-cloud-pubsublite-bom/pom.xml b/google-cloud-pubsublite-bom/pom.xml index ffd1b6c3f..561d0eb96 100644 --- a/google-cloud-pubsublite-bom/pom.xml +++ b/google-cloud-pubsublite-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-pubsublite-bom - 1.14.3 + 1.14.4 pom com.google.cloud sdk-platform-java-config - 3.36.1 + 3.37.0 Google Cloud pubsublite BOM @@ -52,17 +52,17 @@ com.google.cloud google-cloud-pubsublite - 1.14.3 + 1.14.4 com.google.api.grpc grpc-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 com.google.api.grpc proto-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 diff --git a/google-cloud-pubsublite/pom.xml b/google-cloud-pubsublite/pom.xml index be16feff5..4e647e1ed 100644 --- a/google-cloud-pubsublite/pom.xml +++ b/google-cloud-pubsublite/pom.xml @@ -3,13 +3,13 @@ com.google.cloud google-cloud-pubsublite-parent - 1.14.3 + 1.14.4 ../pom.xml 4.0.0 com.google.cloud google-cloud-pubsublite - 1.14.3 + 1.14.4 jar Google Cloud Pub/Sub Lite https://github.com/googleapis/java-pubsublite @@ -38,7 +38,6 @@ com.google.cloud google-cloud-pubsub - 1.132.3 com.google.api.grpc @@ -47,12 +46,12 @@ com.google.api.grpc proto-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 com.google.api.grpc grpc-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 com.google.flogger @@ -110,7 +109,6 @@ com.google.flogger flogger-system-backend - 0.8 runtime @@ -120,11 +118,6 @@ truth test - - com.google.truth.extensions - truth-java8-extension - test - org.mockito mockito-core @@ -138,7 +131,6 @@ org.hamcrest hamcrest - 3.0 test @@ -175,7 +167,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 enforce diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/ApiExceptionMatcher.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/ApiExceptionMatcher.java index 61f4a2c22..113e015cf 100755 --- a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/ApiExceptionMatcher.java +++ b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/ApiExceptionMatcher.java @@ -17,7 +17,6 @@ package com.google.cloud.pubsublite.internal; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import static org.junit.Assert.assertThrows; import com.google.api.gax.rpc.StatusCode.Code; diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriberTest.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriberTest.java index 6eb24b10f..737706ff5 100644 --- a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriberTest.java +++ b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriberTest.java @@ -17,7 +17,6 @@ package com.google.cloud.pubsublite.internal; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/CursorClientImplTest.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/CursorClientImplTest.java index 423e65bb3..483ffb28c 100644 --- a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/CursorClientImplTest.java +++ b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/CursorClientImplTest.java @@ -18,7 +18,6 @@ import static com.google.cloud.pubsublite.internal.ApiExceptionMatcher.assertFutureThrowsCode; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/TopicStatsClientImplTest.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/TopicStatsClientImplTest.java index 77c308e76..cf1924dce 100644 --- a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/TopicStatsClientImplTest.java +++ b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/TopicStatsClientImplTest.java @@ -18,7 +18,6 @@ import static com.google.cloud.pubsublite.internal.ApiExceptionMatcher.assertFutureThrowsCode; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitStateTest.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitStateTest.java index dcdc25858..e7a05a51f 100755 --- a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitStateTest.java +++ b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitStateTest.java @@ -17,7 +17,6 @@ package com.google.cloud.pubsublite.internal.wire; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import static org.junit.Assert.assertThrows; import com.google.api.core.ApiFuture; diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/FlowControlBatcherTest.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/FlowControlBatcherTest.java index 463a8b689..a8d34040e 100644 --- a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/FlowControlBatcherTest.java +++ b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/FlowControlBatcherTest.java @@ -17,7 +17,6 @@ package com.google.cloud.pubsublite.internal.wire; import static com.google.common.truth.Truth.assertThat; -import static com.google.common.truth.Truth8.assertThat; import com.google.cloud.pubsublite.internal.CheckedApiException; import com.google.cloud.pubsublite.proto.Cursor; diff --git a/grpc-google-cloud-pubsublite-v1/pom.xml b/grpc-google-cloud-pubsublite-v1/pom.xml index 1b59b1010..e0ca1627e 100644 --- a/grpc-google-cloud-pubsublite-v1/pom.xml +++ b/grpc-google-cloud-pubsublite-v1/pom.xml @@ -4,20 +4,20 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 grpc-google-cloud-pubsublite-v1 GRPC library for grpc-google-cloud-pubsublite-v1 com.google.cloud google-cloud-pubsublite-parent - 1.14.3 + 1.14.4 ../pom.xml com.google.api.grpc proto-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 io.grpc @@ -44,6 +44,21 @@ proto-google-common-protos + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.flogger:google-extensions + + + + + + true diff --git a/pom.xml b/pom.xml index 0f99654c9..c3b54bac8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,12 @@ com.google.cloud sdk-platform-java-config - 3.36.1 + 3.38.0 4.0.0 com.google.cloud google-cloud-pubsublite-parent - 1.14.3 + 1.14.4 pom Google Cloud Pub/Sub Lite Parent https://github.com/googleapis/java-pubsublite @@ -22,32 +22,27 @@ pom import + + com.google.cloud + google-cloud-bom + 0.230.0 + pom + import + com.google.api.grpc proto-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 com.google.api.grpc grpc-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 com.google.cloud google-cloud-pubsublite - 1.14.3 - - - com.google.cloud - google-cloud-bom - 0.228.0 - pom - import - - - com.google.flogger - google-extensions - 0.8 + 1.14.4 com.google.auto.service @@ -57,13 +52,7 @@ com.google.truth truth - 1.1.5 - test - - - com.google.truth.extensions - truth-java8-extension - 1.1.5 + 1.4.4 test @@ -78,8 +67,35 @@ 4.13.2 test + + com.google.auto.value + auto-value + ${auto-value.version} + + + com.google.auto.service + auto-service + 1.1.1 + + + com.google.errorprone + error_prone_core + 2.34.0 + + + org.hamcrest + hamcrest + 3.0 + test + + + + com.google.flogger + google-extensions + + @@ -97,7 +113,6 @@ maven-compiler-plugin - 3.13.0 1.8 1.8 @@ -109,12 +124,10 @@ com.google.auto.value auto-value - 1.11.0 com.google.auto.service auto-service - 1.1.1 @@ -147,7 +160,6 @@ google-cloud-pubsublite grpc-google-cloud-pubsublite-v1 proto-google-cloud-pubsublite-v1 - google-cloud-pubsublite-bom @@ -170,7 +182,8 @@ true -XDcompilePolicy=simple - -Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:.*/pubsublite/proto/.* + -Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:(.*/pubsublite/proto/.*)|(.*/pubsublite/internal/.*) + -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED @@ -186,7 +199,6 @@ com.google.errorprone error_prone_core - 2.13.1 diff --git a/proto-google-cloud-pubsublite-v1/pom.xml b/proto-google-cloud-pubsublite-v1/pom.xml index cf07f2851..c2fd4bbcd 100644 --- a/proto-google-cloud-pubsublite-v1/pom.xml +++ b/proto-google-cloud-pubsublite-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-pubsublite-v1 - 1.14.3 + 1.14.4 proto-google-cloud-pubsublite-v1 PROTO library for proto-google-cloud-pubsublite-v1 com.google.cloud google-cloud-pubsublite-parent - 1.14.3 + 1.14.4 ../pom.xml @@ -31,6 +31,21 @@ api-common + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.flogger:google-extensions + + + + + + true diff --git a/renovate.json b/renovate.json index bc1ba286a..64aecdbe0 100644 --- a/renovate.json +++ b/renovate.json @@ -41,6 +41,16 @@ ], "depNameTemplate": "com.google.cloud:sdk-platform-java-config", "datasourceTemplate": "maven" + }, + { + "fileMatch": [ + "^.github/workflows/hermetic_library_generation.yaml$" + ], + "matchStrings": [ + "uses: googleapis/sdk-platform-java/.github/scripts@v(?.+?)\\n" + ], + "depNameTemplate": "com.google.api:gapic-generator-java", + "datasourceTemplate": "maven" } ], "packageRules": [ @@ -101,6 +111,13 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" + }, + { + "matchPackagePatterns": [ + "^com.google.api:gapic-generator-java", + "^com.google.cloud:sdk-platform-java-config" + ], + "groupName": "SDK platform Java dependencies" } ], "semanticCommits": true, diff --git a/samples/pom.xml b/samples/pom.xml index 4108ca700..944eeea6f 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -54,7 +54,6 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 true @@ -62,7 +61,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.7.0 true diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 549c85219..46b383070 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud.samples shared-configuration - 1.2.0 + 1.2.2 @@ -40,18 +40,26 @@ UTF-8 + + + + com.google.cloud + google-cloud-bom + 0.230.0 + pom + import + + + - com.google.cloud google-cloud-pubsublite - 1.14.3 + 1.14.4 - com.google.cloud google-cloud-pubsub - 1.132.3 @@ -63,7 +71,7 @@ com.google.truth truth - 1.1.5 + 1.4.4 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 80e6c9f44..8d1510894 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -31,7 +31,7 @@ com.google.cloud.samples shared-configuration - 1.2.0 + 1.2.2 @@ -41,21 +41,20 @@ - + com.google.cloud google-cloud-pubsublite - 1.14.2 + 1.14.3 com.google.cloud google-cloud-pubsub - 1.132.3 + 1.133.1 - junit junit @@ -65,7 +64,7 @@ com.google.truth truth - 1.1.5 + 1.4.4 test diff --git a/versions.txt b/versions.txt index 7965236ad..494bddc58 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-pubsublite:1.14.3:1.14.3 -pubsublite-beam-io:0.33.3:0.33.3 -proto-google-cloud-pubsublite-v1:1.14.3:1.14.3 -grpc-google-cloud-pubsublite-v1:1.14.3:1.14.3 +google-cloud-pubsublite:1.14.4:1.14.4 +pubsublite-beam-io:0.33.4:0.33.4 +proto-google-cloud-pubsublite-v1:1.14.4:1.14.4 +grpc-google-cloud-pubsublite-v1:1.14.4:1.14.4