Skip to content

Commit 6622238

Browse files
deps: normalize dependencies (#2574)
1 parent f5f201e commit 6622238

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

api-common-java/pom.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.errorprone</groupId>
6565
<artifactId>error_prone_annotations</artifactId>
66-
<version>2.24.1</version>
66+
<version>${errorprone.version}</version>
6767
<scope>compile</scope>
6868
</dependency>
6969

@@ -80,6 +80,11 @@
8080
<version>1.4.2</version>
8181
<scope>test</scope>
8282
</dependency>
83+
<dependency>
84+
<groupId>com.google.j2objc</groupId>
85+
<artifactId>j2objc-annotations</artifactId>
86+
<version>${j2objc-annotations.version}</version>
87+
</dependency>
8388
</dependencies>
8489

8590
<build>
@@ -125,4 +130,4 @@
125130
</plugin>
126131
</plugins>
127132
</build>
128-
</project>
133+
</project>

gapic-generator-java-pom-parent/pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
<google.auth.version>1.23.0</google.auth.version>
3131
<google.http-client.version>1.44.1</google.http-client.version>
3232
<gson.version>2.10.1</gson.version>
33-
<guava.version>32.1.3-jre</guava.version>
33+
<guava.version>33.1.0-jre</guava.version>
3434
<protobuf.version>3.25.2</protobuf.version>
3535
<opentelemetry.version>1.36.0</opentelemetry.version>
3636
<maven.compiler.release>8</maven.compiler.release>
37+
<errorprone.version>2.26.1</errorprone.version>
38+
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
3739
</properties>
3840

3941
<developers>

gapic-generator-java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
<dependency>
452452
<groupId>com.google.errorprone</groupId>
453453
<artifactId>error_prone_annotations</artifactId>
454-
<version>2.24.1</version>
454+
<version>${errorprone.version}</version>
455455
</dependency>
456456

457457
<!--

java-core/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
<version>1.10.19</version>
6969
<scope>test</scope>
7070
</dependency>
71+
<dependency>
72+
<groupId>com.google.errorprone</groupId>
73+
<artifactId>error_prone_annotationsa</artifactId>
74+
<version>${errorprone.version}</version>
75+
</dependency>
7176
</dependencies>
7277
</dependencyManagement>
7378

java-shared-dependencies/third-party-dependencies/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!-- ensure checker-qual version matches what Guava uses -->
3838
<checker-qual.version>3.42.0</checker-qual.version>
3939
<perfmark-api.version>0.27.0</perfmark-api.version>
40-
<j2objc-annotations.version>2.8</j2objc-annotations.version>
40+
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
4141
<opentelemetry.version>1.36.0</opentelemetry.version>
4242
<flogger.version>0.8</flogger.version>
4343
<arrow.version>15.0.1</arrow.version>
@@ -184,4 +184,4 @@
184184
</dependency>
185185
</dependencies>
186186
</dependencyManagement>
187-
</project>
187+
</project>

0 commit comments

Comments
 (0)