Skip to content

Commit 38299e7

Browse files
committed
Bring back error_prone_annotations
1 parent 6c3a3d6 commit 38299e7

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

sdk-platform-java/api-common-java/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
<artifactId>javax.annotation-api</artifactId>
6161
<version>${javax.annotation-api.version}</version>
6262
</dependency>
63+
<dependency>
64+
<groupId>com.google.errorprone</groupId>
65+
<artifactId>error_prone_annotations</artifactId>
66+
<version>${errorprone.version}</version>
67+
<scope>compile</scope>
68+
</dependency>
6369
<!-- Test Dependencies -->
6470
<dependency>
6571
<groupId>junit</groupId>
@@ -117,6 +123,16 @@
117123
</archive>
118124
</configuration>
119125
</plugin>
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-dependency-plugin</artifactId>
129+
<configuration>
130+
<ignoredUnusedDeclaredDependencies>
131+
<ignoredUnusedDeclaredDependency>com.google.errorprone:error_prone_annotations</ignoredUnusedDeclaredDependency>
132+
</ignoredUnusedDeclaredDependencies>
133+
</configuration>
134+
</plugin>
135+
120136
</plugins>
121137
</build>
122138
</project>

sdk-platform-java/gax-java/gax/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@
4141
<dependency>
4242
<groupId> com.google.protobuf</groupId>
4343
<artifactId>protobuf-java-util</artifactId>
44-
<exclusions>
45-
<exclusion>
46-
<!-- protobuf-java-util's error_prone_annotatoins is old. -->
47-
<groupId>com.google.errorprone</groupId>
48-
<artifactId>error_prone_annotations</artifactId>
49-
</exclusion>
50-
</exclusions>
5144
</dependency>
5245
<dependency>
5346
<groupId>org.threeten</groupId>

0 commit comments

Comments
 (0)