deps: normalize dependencies (#2574)

googleapis · Mar 15, 2024 · 6622238 · 6622238
1 parent f5f201e
commit 6622238
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.24.1</version>
+            <version>${errorprone.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -80,6 +80,11 @@
             <version>1.4.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>com.google.j2objc</groupId>
+          <artifactId>j2objc-annotations</artifactId>
+          <version>${j2objc-annotations.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -125,4 +130,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -30,10 +30,12 @@
     <google.auth.version>1.23.0</google.auth.version>
     <google.http-client.version>1.44.1</google.http-client.version>
     <gson.version>2.10.1</gson.version>
-    <guava.version>32.1.3-jre</guava.version>
+    <guava.version>33.1.0-jre</guava.version>
     <protobuf.version>3.25.2</protobuf.version>
     <opentelemetry.version>1.36.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
+    <errorprone.version>2.26.1</errorprone.version>
+    <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
   </properties>
 
   <developers>

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
@@ -451,7 +451,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.24.1</version>
+      <version>${errorprone.version}</version>
     </dependency>
 
     <!--

diff --git a/java-core/pom.xml b/java-core/pom.xml
@@ -68,6 +68,11 @@
         <version>1.10.19</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotationsa</artifactId>
+        <version>${errorprone.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -37,7 +37,7 @@
     <!-- ensure checker-qual version matches what Guava uses -->
     <checker-qual.version>3.42.0</checker-qual.version>
     <perfmark-api.version>0.27.0</perfmark-api.version>
-    <j2objc-annotations.version>2.8</j2objc-annotations.version>
+    <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
     <opentelemetry.version>1.36.0</opentelemetry.version>
     <flogger.version>0.8</flogger.version>
     <arrow.version>15.0.1</arrow.version>
@@ -184,4 +184,4 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-</project>
+</project>