deps: Push explicit dependency versioning into the parent pom. Remove…

… explicit versioning to rely on parent or imported BOMs. Remove old lib versions and update explicit lib versions (#1748) * Updated BOMs, Removed versions for deps now managed by BOM. Updated deps not managed by BOM * 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 * 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 (#1738) deps: update dependency com.google.cloud:google-cloud-pubsub to v1.133.1 (#1736) chore: Update generation configuration at Tue Oct 8 02:28:35 UTC 2024 (#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 (#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 (#1734) deps: update dependency com.google.cloud:sdk-platform-java-config to v3.37.0 (#1740) chore(main): release 1.14.4 (#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 * Use errorprone 2.31.0 since 2.32.0 and 2.33.0 break our java 11 build with compiler errors * Fix samples/pom.xml * fix snapshot and snippets pom.xml * Fix bad merge on pom files
googleapis · Oct 24, 2024 · fc8cbb0 · fc8cbb0
1 parent dd849d6
commit fc8cbb0
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 45 deletions.
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/google-cloud-pubsublite-bom/pom.xml b/google-cloud-pubsublite-bom/pom.xml
@@ -57,12 +57,12 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
-        <version>1.14.4</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.4</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
@@ -38,7 +38,6 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.133.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</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
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -22,33 +22,28 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-bom</artifactId>
+        <version>0.230.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-pubsublite-v1</artifactId>
-        <version>1.14.4</version><!-- {x-version-update:proto-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>grpc-google-cloud-pubsublite-v1</artifactId>
-        <version>1.14.4</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.cloud</groupId>
         <artifactId>google-cloud-pubsublite</artifactId>
         <version>1.14.4</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bom</artifactId>
-        <version>0.228.0</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.flogger</groupId>
-        <artifactId>google-extensions</artifactId>
-        <version>0.8</version>
-      </dependency>
       <dependency>
         <groupId>com.google.auto.service</groupId>
         <artifactId>auto-service-annotations</artifactId>
@@ -57,13 +52,7 @@
       <dependency>
         <groupId>com.google.truth</groupId>
         <artifactId>truth</artifactId>
-        <version>1.1.5</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.truth.extensions</groupId>
-        <artifactId>truth-java8-extension</artifactId>
-        <version>1.1.5</version>
+        <version>1.4.4</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -78,8 +67,37 @@
         <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.auto.value</groupId>
+        <artifactId>auto-value</artifactId>
+        <version>${auto-value.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auto.service</groupId>
+        <artifactId>auto-service</artifactId>
+        <version>1.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_core</artifactId>
+        <!-- 2.32.0 and 2.33.0 break our java 11 build with compiler errors, I reported this to the
+        errorprone team, but try upgrading to new versions in the future-->
+        <version>2.31.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>3.0</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.flogger</groupId>
+      <artifactId>google-extensions</artifactId>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
@@ -97,7 +115,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.13.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -109,12 +126,10 @@
             <path>
               <groupId>com.google.auto.value</groupId>
               <artifactId>auto-value</artifactId>
-              <version>1.11.0</version>
             </path>
             <path>
               <groupId>com.google.auto.service</groupId>
               <artifactId>auto-service</artifactId>
-              <version>1.1.1</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
@@ -147,7 +162,6 @@
     <module>google-cloud-pubsublite</module>
     <module>grpc-google-cloud-pubsublite-v1</module>
     <module>proto-google-cloud-pubsublite-v1</module>
-    <module>google-cloud-pubsublite-bom</module>
   </modules>
 
   <profiles>
@@ -170,7 +184,8 @@
               <fork>true</fork>
               <compilerArgs combine.children="append">
                 <arg>-XDcompilePolicy=simple</arg>
-                <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:.*/pubsublite/proto/.*</arg>
+                <arg>-Xplugin:ErrorProne -XepDisableWarningsInGeneratedCode -XepExcludedPaths:(.*/pubsublite/proto/.*)|(.*/pubsublite/internal/.*)</arg>
+                <!-- Updates to ErrorProne have broken GuardedBy for our custom locking -->
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -186,7 +201,6 @@
                 <path>
                   <groupId>com.google.errorprone</groupId>
                   <artifactId>error_prone_core</artifactId>
-                  <version>2.13.1</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>

diff --git a/proto-google-cloud-pubsublite-v1/pom.xml b/proto-google-cloud-pubsublite-v1/pom.xml
@@ -31,6 +31,21 @@
       <artifactId>api-common</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>