Skip to content

Commit

Permalink
Reduce gRPC dependency footprint, get rid of duplicate classes (#1365)
Browse files Browse the repository at this point in the history 
* Reduce gRPC dependency footprint, get rid of duplicate classes

* Wrap grpc version inside a pom.xml property
  • Loading branch information
@mziccard
mziccard authored Nov 4, 2016
1 parent a70747c commit 09ad52a
Show file tree
Hide file tree
Showing 10 changed files with 168 additions and 16 deletions.
23 changes: 23 additions & 0 deletions google-cloud-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,43 @@
<artifactId>protobuf-java</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<version>0.0.21</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-common-protos</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-iam-v1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
20 changes: 18 additions & 2 deletions google-cloud-errorreporting/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-devtools-clouderrorreporting-v1beta1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-language/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-language-v1beta1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-logging-v2</artifactId>
<version>0.1.1</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-monitoring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-monitoring-v3</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-pubsub/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-pubsub-v1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-speech/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-speech-v1beta1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-trace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
20 changes: 18 additions & 2 deletions google-cloud-vision/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,27 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-vision-v1</artifactId>
<version>0.1.0</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>1.0.1</version>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<grpc.version>1.0.1</grpc.version>
<site.installationModule>google-cloud</site.installationModule>
</properties>
<modules>
Expand Down

0 comments on commit 09ad52a

Please sign in to comment.