Skip to content
This repository was archived by the owner on Sep 14, 2022. It is now read-only.

Commit 896cee4

Browse files
denyskaBogdan Drutu
denyska
authored and
Bogdan Drutu
committed
Centralize management of GRPC/Netty libraries and upgrade GRPC to 1.0.2 (#79)
* Centralize management of GRPC/Netty libraries; * Upgrade GRPC to 1.0.2 * Update .gitignore to support the major IDEs.
1 parent e7dc2bd commit 896cee4

File tree

12 files changed

+70
-23
lines changed

12 files changed

+70
-23
lines changed

‎.gitignore‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
target/
1+
# Maven
2+
target
3+
4+
# IntelliJ IDEA
5+
.idea
6+
*.iml
7+
8+
# Eclipse
9+
.classpath
10+
.project
11+
.settings
12+
bin

‎guice/v1/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
<dependency>
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
33-
<version>0.1.0</version>
33+
<version>${grpc-google-devtools-cloudtrace-v1.version}</version>
34+
</dependency>
35+
<dependency>
36+
<!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->
37+
<groupId>io.grpc</groupId>
38+
<artifactId>grpc-all</artifactId>
3439
</dependency>
3540
<dependency>
3641
<groupId>com.google.inject</groupId>

‎pom.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131

3232
<properties>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<grpc.version>1.0.2</grpc.version>
35+
<netty-boringssl.version>1.1.33.Fork23</netty-boringssl.version>
36+
<grpc-google-devtools-cloudtrace-v1.version>0.1.1</grpc-google-devtools-cloudtrace-v1.version>
3437
</properties>
3538

3639
<modules>
@@ -59,6 +62,37 @@
5962
</repository>
6063
</distributionManagement>
6164

65+
<dependencyManagement>
66+
<dependencies>
67+
<dependency>
68+
<groupId>com.google.api.grpc</groupId>
69+
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
70+
<version>${grpc-google-devtools-cloudtrace-v1.version}</version>
71+
<exclusions>
72+
<exclusion>
73+
<groupId>io.grpc</groupId>
74+
<artifactId>grpc-all</artifactId>
75+
</exclusion>
76+
</exclusions>
77+
</dependency>
78+
<dependency>
79+
<groupId>io.grpc</groupId>
80+
<artifactId>grpc-all</artifactId>
81+
<version>${grpc.version}</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>io.grpc</groupId>
85+
<artifactId>grpc-netty</artifactId>
86+
<version>${grpc.version}</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>io.grpc</groupId>
90+
<artifactId>grpc-context</artifactId>
91+
<version>${grpc.version}</version>
92+
</dependency>
93+
</dependencies>
94+
</dependencyManagement>
95+
6296
<build>
6397
<pluginManagement>
6498
<plugins>

‎samples/buffering-grpc/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,11 @@
5050
<dependency>
5151
<groupId>io.grpc</groupId>
5252
<artifactId>grpc-netty</artifactId>
53-
<version>1.0.1</version>
5453
</dependency>
5554
<dependency>
5655
<groupId>io.netty</groupId>
5756
<artifactId>netty-tcnative-boringssl-static</artifactId>
58-
<version>1.1.33.Fork23</version>
57+
<version>${netty-boringssl.version}</version>
5958
<classifier>${os.detected.classifier}</classifier>
6059
</dependency>
6160
</dependencies>

‎samples/guice-scheduled-grpc/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,11 @@
7777
<dependency>
7878
<groupId>io.grpc</groupId>
7979
<artifactId>grpc-netty</artifactId>
80-
<version>1.0.1</version>
8180
</dependency>
8281
<dependency>
8382
<groupId>io.netty</groupId>
8483
<artifactId>netty-tcnative-boringssl-static</artifactId>
85-
<version>1.1.33.Fork23</version>
84+
<version>${netty-boringssl.version}</version>
8685
<classifier>${os.detected.classifier}</classifier>
8786
</dependency>
8887
</dependencies>

‎samples/guice-servlet-grpc/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,11 @@
9393
<dependency>
9494
<groupId>io.grpc</groupId>
9595
<artifactId>grpc-netty</artifactId>
96-
<version>1.0.1</version>
9796
</dependency>
9897
<dependency>
9998
<groupId>io.netty</groupId>
10099
<artifactId>netty-tcnative-boringssl-static</artifactId>
101-
<version>1.1.33.Fork23</version>
100+
<version>${netty-boringssl.version}</version>
102101
<classifier>${os.detected.classifier}</classifier>
103102
</dependency>
104103
</dependencies>

‎samples/managed-grpc/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@
4949
<dependency>
5050
<groupId>io.grpc</groupId>
5151
<artifactId>grpc-netty</artifactId>
52-
<version>1.0.1</version>
5352
</dependency>
5453
<dependency>
5554
<groupId>io.netty</groupId>
5655
<artifactId>netty-tcnative-boringssl-static</artifactId>
57-
<version>1.1.33.Fork23</version>
56+
<version>${netty-boringssl.version}</version>
5857
<classifier>${os.detected.classifier}</classifier>
5958
</dependency>
6059
</dependencies>

‎samples/stackdriver-trace-api/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
<dependency>
3232
<groupId>io.grpc</groupId>
3333
<artifactId>grpc-netty</artifactId>
34-
<version>1.0.1</version>
3534
</dependency>
3635
<dependency>
3736
<groupId>io.netty</groupId>
3837
<artifactId>netty-tcnative-boringssl-static</artifactId>
39-
<version>1.1.33.Fork23</version>
38+
<version>${netty-boringssl.version}</version>
4039
</dependency>
4140
</dependencies>
4241
</project>

‎sdk/implementation/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<dependency>
3131
<groupId>io.grpc</groupId>
3232
<artifactId>grpc-context</artifactId>
33-
<version>1.0.1</version>
3433
</dependency>
3534
<dependency>
3635
<groupId>com.google.code.findbugs</groupId>

‎sinks/v1/grpc-consumer/pom.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<dependency>
2525
<groupId>com.google.api.grpc</groupId>
2626
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
27-
<version>0.1.0</version>
2827
</dependency>
2928
<dependency>
3029
<groupId>com.google.auth</groupId>
@@ -33,13 +32,7 @@
3332
</dependency>
3433
<dependency>
3534
<groupId>io.grpc</groupId>
36-
<artifactId>grpc-auth</artifactId>
37-
<version>1.0.1</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>io.grpc</groupId>
41-
<artifactId>grpc-core</artifactId>
42-
<version>1.0.1</version>
35+
<artifactId>grpc-all</artifactId>
4336
</dependency>
4437
</dependencies>
4538
</project>

0 commit comments

Comments
 (0)