Skip to content

Commit ffe1b55

Browse files
author
Reynald Borer
committed
Make sure dependencies converges
Use the maven enforcer plugin dependencyConvergence ([1]) rule to make sure that all dependencies converge. When conflicts were detected, the higher version has been choosen. Note that this is a work in progress... [1]: http://maven.apache.org/enforcer/enforcer-rules/dependencyConvergence.html
1 parent c9a4ea6 commit ffe1b55

2 files changed

Lines changed: 84 additions & 3 deletions

File tree

‎google-cloud-core/pom.xml‎

Lines changed: 82 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,42 @@
3131
<groupId>com.google.guava</groupId>
3232
<artifactId>guava-jdk5</artifactId>
3333
</exclusion>
34+
<exclusion>
35+
<groupId>com.google.http-client</groupId>
36+
<artifactId>google-http-client-jackson2</artifactId>
37+
<!-- version 1.19.0 -->
38+
</exclusion>
39+
<exclusion>
40+
<groupId>com.google.http-client</groupId>
41+
<artifactId>google-http-client</artifactId>
42+
<!-- version 1.19.0 -->
43+
</exclusion>
3444
</exclusions>
3545
</dependency>
3646
<dependency>
3747
<groupId>com.google.http-client</groupId>
3848
<artifactId>google-http-client</artifactId>
3949
<version>1.21.0</version>
4050
<scope>compile</scope>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>com.google.code.findbugs</groupId>
54+
<artifactId>jsr305</artifactId>
55+
<!-- version 1.3.9 -->
56+
</exclusion>
57+
</exclusions>
4158
</dependency>
4259
<dependency>
4360
<groupId>com.google.oauth-client</groupId>
4461
<artifactId>google-oauth-client</artifactId>
4562
<version>1.21.0</version>
4663
<scope>compile</scope>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>com.google.code.findbugs</groupId>
67+
<artifactId>jsr305</artifactId>
68+
</exclusion>
69+
</exclusions>
4770
</dependency>
4871
<dependency>
4972
<groupId>com.google.guava</groupId>
@@ -101,12 +124,19 @@
101124
<dependency>
102125
<groupId>com.google.protobuf</groupId>
103126
<artifactId>protobuf-java</artifactId>
104-
<version>3.0.0</version>
127+
<version>3.0.2</version>
105128
</dependency>
106129
<dependency>
107130
<groupId>io.grpc</groupId>
108131
<artifactId>grpc-protobuf</artifactId>
109132
<version>${grpc.version}</version>
133+
<exclusions>
134+
<exclusion>
135+
<groupId>com.google.guava</groupId>
136+
<artifactId>guava</artifactId>
137+
<!-- version 18.0 -->
138+
</exclusion>
139+
</exclusions>
110140
</dependency>
111141
<dependency>
112142
<groupId>com.google.api</groupId>
@@ -117,17 +147,57 @@
117147
<groupId>io.grpc</groupId>
118148
<artifactId>grpc-all</artifactId>
119149
</exclusion>
150+
<exclusion>
151+
<groupId>com.google.guava</groupId>
152+
<artifactId>guava</artifactId>
153+
<!-- version 16.0.1 -->
154+
</exclusion>
155+
<exclusion>
156+
<groupId>joda-time</groupId>
157+
<artifactId>joda-time</artifactId>
158+
<!-- version 2.8.2 -->
159+
</exclusion>
160+
<exclusion>
161+
<groupId>com.google.auth</groupId>
162+
<artifactId>google-auth-library-credentials</artifactId>
163+
<!-- version 0.4.0 -->
164+
</exclusion>
165+
<exclusion>
166+
<groupId>com.google.auth</groupId>
167+
<artifactId>google-auth-library-oauth2-http</artifactId>
168+
<!-- version 0.4.0 -->
169+
</exclusion>
120170
</exclusions>
121171
</dependency>
122172
<dependency>
123173
<groupId>com.google.api.grpc</groupId>
124174
<artifactId>grpc-google-common-protos</artifactId>
125-
<version>0.1.5</version>
175+
<version>0.1.6</version>
126176
<exclusions>
127177
<exclusion>
128178
<groupId>io.grpc</groupId>
129179
<artifactId>grpc-all</artifactId>
130180
</exclusion>
181+
<exclusion>
182+
<groupId>com.google.auto.value</groupId>
183+
<artifactId>auto-value</artifactId>
184+
<!-- version 1.1 -->
185+
</exclusion>
186+
<exclusion>
187+
<groupId>com.google.protobuf</groupId>
188+
<artifactId>protobuf-java</artifactId>
189+
<!-- version 3.0.0 -->
190+
</exclusion>
191+
<exclusion>
192+
<groupId>com.google.guava</groupId>
193+
<artifactId>guava</artifactId>
194+
<!-- version 18.0 -->
195+
</exclusion>
196+
<exclusion>
197+
<groupId>joda-time</groupId>
198+
<artifactId>joda-time</artifactId>
199+
<!-- version 2.8.2 -->
200+
</exclusion>
131201
</exclusions>
132202
</dependency>
133203
<dependency>
@@ -139,6 +209,16 @@
139209
<groupId>io.grpc</groupId>
140210
<artifactId>grpc-all</artifactId>
141211
</exclusion>
212+
<exclusion>
213+
<groupId>com.google.protobuf</groupId>
214+
<artifactId>protobuf-java</artifactId>
215+
<!-- version 3.0.0 -->
216+
</exclusion>
217+
<exclusion>
218+
<groupId>com.google.api.grpc</groupId>
219+
<artifactId>grpc-google-common-protos</artifactId>
220+
<!-- version 0.1.5 -->
221+
</exclusion>
142222
</exclusions>
143223
</dependency>
144224
</dependencies>

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<version>1.4.1</version>
167167
<executions>
168168
<execution>
169-
<id>enforce-maven</id>
169+
<id>enforce</id>
170170
<goals>
171171
<goal>enforce</goal>
172172
</goals>
@@ -178,6 +178,7 @@
178178
<requireJavaVersion>
179179
<version>[1.7,)</version>
180180
</requireJavaVersion>
181+
<dependencyConvergence/>
181182
</rules>
182183
</configuration>
183184
</execution>

0 commit comments

Comments
 (0)