Updated BOMs, Removed versions for deps now

managed by BOM. Updated deps not managed by BOM deps: update googleapis/sdk-platform-java action to v2.47.0 (googleapis#1738) deps: update dependency com.google.cloud:google-cloud-pubsub to v1.133.1 (googleapis#1736) chore: Update generation configuration at Tue Oct 8 02:28:35 UTC 2024 (googleapis#1735) * chore: Update generation configuration at Tue Oct 1 02:30:56 UTC 2024 * chore: Update generation configuration at Wed Oct 2 02:26:57 UTC 2024 * chore: Update generation configuration at Thu Oct 3 02:27:16 UTC 2024 * chore: Update generation configuration at Fri Oct 4 02:27:19 UTC 2024 * chore: Update generation configuration at Sat Oct 5 02:25:46 UTC 2024 * chore: Update generation configuration at Sun Oct 6 02:29:14 UTC 2024 * chore: generate libraries at Sun Oct 6 02:29:34 UTC 2024 * chore: Update generation configuration at Tue Oct 8 02:28:35 UTC 2024 chore(main): release 1.14.4-SNAPSHOT (googleapis#1733) :robot: I have created a release *beep* *boop* --- --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). chore(deps): update dependency com.google.cloud:google-cloud-pubsublite to v1.14.3 (googleapis#1734) deps: update dependency com.google.cloud:sdk-platform-java-config to v3.37.0 (googleapis#1740) chore(main): release 1.14.4 (googleapis#1741) * chore(main): release 1.14.4 * chore: generate libraries at Tue Oct 8 19:56:23 UTC 2024 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot <[email protected]> Push explicit versioning of hamcrest into the parent. Depend on google-cloud-bom in snippets. Remove explicit versioning where possible fix pomfile header Fix snippets to leave tags in place. Use the same version tag for all versions in the parent Fix accidental newlines Update pom.xml Add ignore unused deps to proto lib Fix unused dep in grpc un-parent google-cloud-pubsublite-bom from google-cloud-pubsublite-parent since it actually is a child of sdk-platform-java-config Update samples checkstyle check to run on java-version: 11 to fix version mismatch. Same fix applied in googleapis/java-pubsub#2201
bcol-google · Oct 24, 2024 · b7d3bea · b7d3bea
1 parent 87877aa
commit b7d3bea
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 90 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,26 +20,26 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsublite</artifactId>
-  <version>1.14.2</version>
+  <version>1.14.3</version>
 </dependency>
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsub</artifactId>
-  <version>1.132.3</version>
+  <version>1.133.1</version>
 </dependency>
 
 ```
 
 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"
 ```
 <!-- {x-version-update-end} -->
 
@@ -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
@@ -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
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsublite-bom</artifactId>
-  <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+  <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.36.1</version>
+    <version>3.37.0</version>
   </parent>
 
   <name>Google Cloud pubsublite BOM</name>
@@ -52,17 +52,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsublite</artifactId>
-        <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+        <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
-        <version>1.14.3</version><!-- {x-version-update:grpc-google-cloud-pubsublite-v1:current} -->
+        <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-pubsublite-v1</artifactId>
-        <version>1.14.3</version><!-- {x-version-update:proto-google-cloud-pubsublite-v1:current} -->
+        <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/google-cloud-pubsublite/pom.xml b/google-cloud-pubsublite/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pubsublite-parent</artifactId>
-    <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+    <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsublite</artifactId>
-  <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+  <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Pub/Sub Lite</name>
   <url>https://github.com/googleapis/java-pubsublite</url>
@@ -38,7 +38,6 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.132.3</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
@@ -47,12 +46,12 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-pubsublite-v1</artifactId>
-      <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+      <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
-      <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+      <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
     </dependency>
     <dependency>
       <groupId>com.google.flogger</groupId>
@@ -110,7 +109,6 @@
     <dependency>
       <groupId>com.google.flogger</groupId>
       <artifactId>flogger-system-backend</artifactId>
-      <version>0.8</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -120,11 +118,6 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.truth.extensions</groupId>
-      <artifactId>truth-java8-extension</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -138,7 +131,6 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
-      <version>3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -175,7 +167,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.5.0</version>
         <executions>
           <execution>
             <id>enforce</id>

diff --git a/...ud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/ApiExceptionMatcher.java b/...ud-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/...blite/src/test/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriberTest.java b/...blite/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/...d-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/CursorClientImplTest.java b/...d-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/...bsublite/src/test/java/com/google/cloud/pubsublite/internal/TopicStatsClientImplTest.java b/...bsublite/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/...d-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitStateTest.java b/...d-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/...blite/src/test/java/com/google/cloud/pubsublite/internal/wire/FlowControlBatcherTest.java b/...blite/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
@@ -4,20 +4,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
-  <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+  <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
   <name>grpc-google-cloud-pubsublite-v1</name>
   <description>GRPC library for grpc-google-cloud-pubsublite-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pubsublite-parent</artifactId>
-    <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+    <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-pubsublite-v1</artifactId>
-      <version>1.14.3</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
+      <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -44,6 +44,21 @@
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
   </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <configuration>
+            <ignoredUnusedDeclaredDependencies>
+              <ignoredUnusedDeclaredDependency>com.google.flogger:google-extensions</ignoredUnusedDeclaredDependency>
+            </ignoredUnusedDeclaredDependencies>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
   <properties>
     <checkstyle.skip>true</checkstyle.skip>
   </properties>