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

Commit 6ad5210

Browse files
davorbonacidavorbonaci
committed
Dataflow launch: update pom.xml for certain modules. In the context of bringing in dependencies from com.google.apis group, add exclusion of Guava transitive dependency to all com.google.apis dependencies.
Notes: * Artifacts from com.google.apis, version 1.19 in particular, brings in an old version of Guava, which is not compatible with the SDK content. * We need to exclude this transitive dependency to ensure build works. [] ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82246218
1 parent 9e90654 commit 6ad5210

File tree

2 files changed

+72
-0
lines changed

2 files changed

+72
-0
lines changed

‎examples/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,28 @@
165165
<groupId>com.google.apis</groupId>
166166
<artifactId>google-api-services-bigquery</artifactId>
167167
<version>v2-rev167-1.19.0</version>
168+
<exclusions>
169+
<!-- Exclude an old version of guava which is being pulled
170+
in by a transitive dependency google-api-client 1.19.0 -->
171+
<exclusion>
172+
<groupId>com.google.guava</groupId>
173+
<artifactId>guava-jdk5</artifactId>
174+
</exclusion>
175+
</exclusions>
168176
</dependency>
169177

170178
<dependency>
171179
<groupId>com.google.http-client</groupId>
172180
<artifactId>google-http-client-jackson2</artifactId>
173181
<version>1.19.0</version>
182+
<exclusions>
183+
<!-- Exclude an old version of guava which is being pulled
184+
in by a transitive dependency google-api-client 1.19.0 -->
185+
<exclusion>
186+
<groupId>com.google.guava</groupId>
187+
<artifactId>guava-jdk5</artifactId>
188+
</exclusion>
189+
</exclusions>
174190
</dependency>
175191

176192
<dependency>

‎sdk/pom.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,42 +203,98 @@
203203
<groupId>com.google.apis</groupId>
204204
<artifactId>google-api-services-bigquery</artifactId>
205205
<version>v2-rev167-1.19.0</version>
206+
<exclusions>
207+
<!-- Exclude an old version of guava which is being pulled
208+
in by a transitive dependency google-api-client 1.19.0 -->
209+
<exclusion>
210+
<groupId>com.google.guava</groupId>
211+
<artifactId>guava-jdk5</artifactId>
212+
</exclusion>
213+
</exclusions>
206214
</dependency>
207215

208216
<dependency>
209217
<groupId>com.google.apis</groupId>
210218
<artifactId>google-api-services-compute</artifactId>
211219
<version>v1-rev34-1.19.0</version>
220+
<exclusions>
221+
<!-- Exclude an old version of guava which is being pulled
222+
in by a transitive dependency google-api-client 1.19.0 -->
223+
<exclusion>
224+
<groupId>com.google.guava</groupId>
225+
<artifactId>guava-jdk5</artifactId>
226+
</exclusion>
227+
</exclusions>
212228
</dependency>
213229

214230
<dependency>
215231
<groupId>com.google.apis</groupId>
216232
<artifactId>google-api-services-pubsub</artifactId>
217233
<version>v1beta1-rev9-1.19.0</version>
234+
<exclusions>
235+
<!-- Exclude an old version of guava which is being pulled
236+
in by a transitive dependency google-api-client 1.19.0 -->
237+
<exclusion>
238+
<groupId>com.google.guava</groupId>
239+
<artifactId>guava-jdk5</artifactId>
240+
</exclusion>
241+
</exclusions>
218242
</dependency>
219243

220244
<dependency>
221245
<groupId>com.google.apis</groupId>
222246
<artifactId>google-api-services-storage</artifactId>
223247
<version>v1-rev11-1.19.0</version>
248+
<exclusions>
249+
<!-- Exclude an old version of guava which is being pulled
250+
in by a transitive dependency google-api-client 1.19.0 -->
251+
<exclusion>
252+
<groupId>com.google.guava</groupId>
253+
<artifactId>guava-jdk5</artifactId>
254+
</exclusion>
255+
</exclusions>
224256
</dependency>
225257

226258
<dependency>
227259
<groupId>com.google.http-client</groupId>
228260
<artifactId>google-http-client-jackson2</artifactId>
229261
<version>1.19.0</version>
262+
<exclusions>
263+
<!-- Exclude an old version of guava which is being pulled
264+
in by a transitive dependency google-api-client 1.19.0 -->
265+
<exclusion>
266+
<groupId>com.google.guava</groupId>
267+
<artifactId>guava-jdk5</artifactId>
268+
</exclusion>
269+
</exclusions>
230270
</dependency>
231271

232272
<dependency>
233273
<groupId>com.google.oauth-client</groupId>
234274
<artifactId>google-oauth-client-java6</artifactId>
235275
<version>1.19.0</version>
276+
<exclusions>
277+
<!-- Exclude an old version of guava which is being pulled
278+
in by a transitive dependency google-api-client 1.19.0 -->
279+
<exclusion>
280+
<groupId>com.google.guava</groupId>
281+
<artifactId>guava-jdk5</artifactId>
282+
</exclusion>
283+
</exclusions>
236284
</dependency>
237285

238286
<dependency>
239287
<groupId>com.google.apis</groupId>
240288
<artifactId>google-api-services-datastore-protobuf</artifactId>
241289
<version>v1beta2-rev1-2.1.0</version>
290+
<exclusions>
291+
<!-- Exclude an old version of guava which is being pulled
292+
in by a transitive dependency google-api-client 1.19.0 -->
293+
<exclusion>
294+
<groupId>com.google.guava</groupId>
295+
<artifactId>guava-jdk5</artifactId>
296+
</exclusion>
297+
</exclusions>
242298
</dependency>
243299

244300
<dependency>

0 commit comments

Comments
 (0)