Skip to content

Commit 5b1fcf5

Browse files
committed
chore: Upgrade errorprone and j2objc versions
1 parent ce5c88f commit 5b1fcf5

File tree

6 files changed

+2
-51
lines changed

6 files changed

+2
-51
lines changed

api-common-java/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@
4444
<groupId>com.google.guava</groupId>
4545
<artifactId>guava</artifactId>
4646
<version>${guava.version}</version>
47-
<exclusions>
48-
<exclusion>
49-
<groupId>com.google.errorprone</groupId>
50-
<artifactId>error_prone_annotations</artifactId>
51-
</exclusion>
52-
<exclusion>
53-
<groupId>com.google.j2objc</groupId>
54-
<artifactId>j2objc-annotations</artifactId>
55-
</exclusion>
56-
</exclusions>
5747
</dependency>
5848
<dependency>
5949
<groupId>com.google.auto.value</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<guava.version>33.5.0-jre</guava.version>
3535
<protobuf.version>3.25.8</protobuf.version>
3636
<opentelemetry.version>1.47.0</opentelemetry.version>
37-
<errorprone.version>2.38.0</errorprone.version>
38-
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
37+
<errorprone.version>2.42.0</errorprone.version>
38+
<j2objc-annotations.version>3.1</j2objc-annotations.version>
3939
<threetenbp.version>1.7.0</threetenbp.version>
4040
<junit.version>5.11.4</junit.version>
4141
<mockito.version>4.11.0</mockito.version>

gapic-generator-java/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -381,16 +381,6 @@
381381
<groupId>com.google.guava</groupId>
382382
<artifactId>guava</artifactId>
383383
<version>${guava.version}</version>
384-
<exclusions>
385-
<exclusion>
386-
<groupId>com.google.errorprone</groupId>
387-
<artifactId>error_prone_annotations</artifactId>
388-
</exclusion>
389-
<exclusion>
390-
<groupId>com.google.j2objc</groupId>
391-
<artifactId>j2objc-annotations</artifactId>
392-
</exclusion>
393-
</exclusions>
394384
</dependency>
395385
<dependency>
396386
<groupId>com.google.api</groupId>
@@ -462,11 +452,6 @@
462452
<artifactId>error_prone_annotations</artifactId>
463453
<version>${errorprone.version}</version>
464454
</dependency>
465-
<dependency>
466-
<groupId>com.google.j2objc</groupId>
467-
<artifactId>j2objc-annotations</artifactId>
468-
<version>${j2objc-annotations.version}</version>
469-
</dependency>
470455

471456
<!--
472457
TODO: remove when dropping Java 8.

gax-java/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
<groupId>com.google.errorprone</groupId>
7979
<artifactId>error_prone_annotations</artifactId>
8080
</exclusion>
81-
<exclusion>
82-
<groupId>com.google.j2objc</groupId>
83-
<artifactId>j2objc-annotations</artifactId>
84-
</exclusion>
8581
</exclusions>
8682
</dependency>
8783
<dependency>

java-common-protos/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,6 @@
8282
<groupId>com.google.guava</groupId>
8383
<artifactId>guava</artifactId>
8484
<version>${guava.version}</version>
85-
<exclusions>
86-
<exclusion>
87-
<groupId>com.google.errorprone</groupId>
88-
<artifactId>error_prone_annotations</artifactId>
89-
</exclusion>
90-
<exclusion>
91-
<groupId>com.google.j2objc</groupId>
92-
<artifactId>j2objc-annotations</artifactId>
93-
</exclusion>
94-
</exclusions>
9585
</dependency>
9686
<dependency>
9787
<groupId>javax.annotation</groupId>

java-iam/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,6 @@
147147
<artifactId>javax.annotation-api</artifactId>
148148
<version>${javax.annotation-api.version}</version>
149149
</dependency>
150-
<dependency>
151-
<groupId>com.google.errorprone</groupId>
152-
<artifactId>error_prone_annotations</artifactId>
153-
<version>${errorprone.version}</version>
154-
</dependency>
155-
<dependency>
156-
<groupId>com.google.j2objc</groupId>
157-
<artifactId>j2objc-annotations</artifactId>
158-
<version>${j2objc-annotations.version}</version>
159-
</dependency>
160150

161151
<dependency>
162152
<groupId>junit</groupId>

0 commit comments

Comments
 (0)