Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (
  • Loading branch information
yangnuoyu committed Jun 18, 2020
1 parent c148cff commit 78b2ebf
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 103 deletions.
4 changes: 1 addition & 3 deletions google-cloud-firestore/pom.xml
Expand Up @@ -59,7 +59,6 @@
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-util</artifactId>
<version>${opencensus.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -149,7 +148,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<!-- Need testing utility classes for generated gRPC clients tests -->
Expand Down Expand Up @@ -234,7 +233,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
1 change: 0 additions & 1 deletion grpc-google-cloud-firestore-admin-v1/pom.xml
Expand Up @@ -85,7 +85,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
1 change: 0 additions & 1 deletion grpc-google-cloud-firestore-v1/pom.xml
Expand Up @@ -80,7 +80,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
1 change: 0 additions & 1 deletion grpc-google-cloud-firestore-v1beta1/pom.xml
Expand Up @@ -80,7 +80,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
99 changes: 5 additions & 94 deletions pom.xml
Expand Up @@ -152,19 +152,6 @@
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-firestore-parent</site.installationModule>
<project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
<google.core.version>1.93.6</google.core.version>
<google.api-common.version>1.9.2</google.api-common.version>
<google.common-protos.version>1.18.0</google.common-protos.version>
<gax.version>1.57.0</gax.version>
<grpc.version>1.30.0</grpc.version>
<protobuf.version>3.12.2</protobuf.version>
<junit.version>4.13</junit.version>
<guava.version>29.0-android</guava.version>
<threeten.version>1.4.4</threeten.version>
<opencensus.version>0.24.0</opencensus.version>
<mockito.version>1.10.19</mockito.version>
<javax.annotations.version>1.3.2</javax.annotations.version>
<truth.version>1.0.1</truth.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -201,105 +188,29 @@
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>${gax.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${guava.version}</version>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.8.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
<version>${google.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${google.api-common.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>${google.common-protos.version}</version>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>${opencensus.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<version>0.20.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>${google.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>${truth.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<version>${gax.version}</version>
<classifier>testlib</classifier>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion proto-google-cloud-firestore-admin-v1/pom.xml
Expand Up @@ -51,7 +51,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
1 change: 0 additions & 1 deletion proto-google-cloud-firestore-v1/pom.xml
Expand Up @@ -51,7 +51,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
1 change: 0 additions & 1 deletion proto-google-cloud-firestore-v1beta1/pom.xml
Expand Up @@ -51,7 +51,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down

0 comments on commit 78b2ebf

Please sign in to comment.