Skip to content

Commit

Permalink
chore: remove duplicate deps (error_prone & autovalue) from bigtable …
Browse files Browse the repository at this point in the history
…specific pom (#742)

google-shared-config already has provisions for autovalue & error_prone. No need for us to track it separately.
This will remove auto-value-annotations from the compile path and into annotation processor path.
  • Loading branch information
igorbernstein2 committed Apr 20, 2021
1 parent 22d2422 commit 1d1db7e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 42 deletions.
21 changes: 0 additions & 21 deletions google-cloud-bigtable-deps-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
</license>
</licenses>

<properties>
<autovalue.version>1.8</autovalue.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -83,23 +79,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Production dependency version definitions in alphabetical order -->
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${autovalue.version}</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>${autovalue.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.6.0</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 2 additions & 0 deletions google-cloud-bigtable/EnableAutoValue.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This is a marker file to trigger auto-value injection into the annotation processor path
https://github.com/googleapis/java-shared-config/blob/51c9f68ff1736761b21c921f078ab2c8675ff268/pom.xml#L758
7 changes: 1 addition & 6 deletions google-cloud-bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
Expand Down Expand Up @@ -488,7 +483,7 @@
grpc-auth is not directly used transitively, but is pulled to align with other grpc parts
opencensus-impl-core is brought in transitively through opencensus-impl
-->
<usedDependencies>io.grpc:grpc-auth,io.grpc:grpc-grpclb,com.google.auto.value:auto-value</usedDependencies>
<usedDependencies>io.grpc:grpc-auth,io.grpc:grpc-grpclb</usedDependencies>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>io.opencensus:opencensus-impl-core</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
Expand Down
15 changes: 0 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,21 +203,6 @@
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<!-- Using maven site plugin only as a hook for javadoc:aggregate, don't need the reports -->
<plugin>
Expand Down

0 comments on commit 1d1db7e

Please sign in to comment.