Make sure dependencies converges #1659

rborer · 2017-02-24T15:22:43Z

Hi,

I'm planning to use the BigQuery client in one of my project where I have have enabled dependency convergence (see 1). Unfortunately, it seems that the client has quite a few dependencies that do not converge, so I've started to fix them as I cannot build my project.

This is a work in progress, please let me know if this would make sense to you or if I have to sort things out at my project level only.

Also, the policy I've chosen when a conflict has been detected is to always pick the highest version number.

I've also added in the modified pom.xml (only core project for the moment) which lower versions are excluded for reference.

Thanks,
Reynald

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

googlebot · 2017-02-24T15:22:45Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please let us know the company's name.

rborer · 2017-02-24T15:24:28Z

I signed it!

googlebot · 2017-02-24T15:24:30Z

CLAs look good, thanks!

…i-client-appengine clients to 1.22.0

…-rev135-1.22.0

rborer · 2017-02-24T15:59:01Z

Now that I'm doing it, I see that there a quite a few common deps that does not converge (guava, joda-time, ...). Another solution could be to have a dependencyManagement block at the root pom.xml to force those libraries to be at the specified version globally. Thoughts?

This reverts commit ffe1b55.

…ttp & api-client-appengine clients to 1.22.0" This reverts commit c5ee626.

…te to v1-rev135-1.22.0" This reverts commit a072af8.

This reverts commit 0e77664.

This reverts commit 071889f.

This reverts commit fe9a4c6.

This is done using dependencyManagement at the root pom

coveralls · 2017-02-27T10:11:11Z

Changes Unknown when pulling 44409b9 on rborer:dependency-convergence into ** on GoogleCloudPlatform:master**.

google-cloud-bigquery/pom.xml

@@ -51,7 +51,6 @@
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
-      <version>4.12</version>
      <scope>test</scope>


coveralls · 2017-03-06T10:33:26Z

Changes Unknown when pulling 7d5ad6b on rborer:dependency-convergence into ** on GoogleCloudPlatform:master**.

rborer · 2017-03-16T15:24:56Z

Any news on this one? Let me know if my explanation is not clear or if I need to improve my PR :-)

garrettjonesgoogle · 2017-03-16T18:20:35Z

I intend on circling back - we're trying to get a lot of breaking changes through at the moment so we're concentrating on that.

rborer · 2017-03-24T08:04:33Z

Thanks @garrettjonesgoogle I fully understand, it looks like things are moving at an interesting pace. Ping me when you intend to have a look at this one, there will probably be some conflicts to fix first. Also, I think we should compare the output of mvn dependency:tree before & after to spot differences in dependencies.

garrettjonesgoogle · 2017-04-19T05:36:05Z

@rborer I went ahead and re-implemented this with the latest versions in #1943 .

garrettjonesgoogle · 2017-04-22T02:10:38Z

Closing out because #1943 was submitted.

rborer · 2017-04-24T11:34:53Z

@garrettjonesgoogle thanks!

Co-authored-by: Jeffrey Rennie <[email protected]> Co-authored-by: Tomo Suzuki <[email protected]> Source-Link: https://togithub.com/googleapis/synthtool/commit/b59cf7b5a91ecab29e21fdfbb7e3b81066229be4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:894d56f45fc3f4f0d5f3bcf790846419ee2d8e44715eae8917d6a1bba2b7283d

…500) Revert "chore(deps): update dependency protobuf to v3.20.2 (#1659)" This reverts commit b59cf7b5a91ecab29e21fdfbb7e3b81066229be4. Source-Link: https://togithub.com/googleapis/synthtool/commit/a66e34625d760ad299627f6613a1bd438c1b62a9 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a

googlebot added the cla: no This human has *not* signed the Contributor License Agreement. label Feb 24, 2017

googlebot added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Feb 24, 2017

Reynald Borer added 5 commits February 24, 2017 16:29

Fix convergence for google-cloud-bigquery by bumping oauth, http & ap…

c5ee626

…i-client-appengine clients to 1.22.0

Fix google-cloud-compute by bumping google-api-services-compute to v1…

a072af8

…-rev135-1.22.0

Make google-cloud-datastore converge

0e77664

Make google-cloud-errorreporting converge

071889f

Make google-cloud-language converge

fe9a4c6

Reynald Borer added 7 commits February 27, 2017 10:15

Revert "Make sure dependencies converges"

7c3940d

This reverts commit ffe1b55.

Revert "Fix convergence for google-cloud-bigquery by bumping oauth, h…

b2b8634

…ttp & api-client-appengine clients to 1.22.0" This reverts commit c5ee626.

Revert "Fix google-cloud-compute by bumping google-api-services-compu…

81b50a1

…te to v1-rev135-1.22.0" This reverts commit a072af8.

Revert "Make google-cloud-datastore converge"

e8c2930

This reverts commit 0e77664.

Revert "Make google-cloud-errorreporting converge"

1d5d497

This reverts commit 071889f.

Revert "Make google-cloud-language converge"

1fade09

This reverts commit fe9a4c6.

Ensure dependency convergence

44409b9

This is done using dependencyManagement at the root pom

garrettjonesgoogle reviewed Feb 28, 2017

View reviewed changes

google-cloud-bigquery/pom.xml

@@ -51,7 +51,6 @@

<dependency>

<groupId>junit</groupId>

<artifactId>junit</artifactId>

<version>4.12</version>

<scope>test</scope>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Merge branch 'master' into dependency-convergence

7d5ad6b

garrettjonesgoogle mentioned this pull request Mar 23, 2017

Different google-cloud-java artifacts depends on different versions of the libraries, breaking build any enforcer projects #1803

Closed

garrettjonesgoogle closed this Apr 22, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make sure dependencies converges #1659

Make sure dependencies converges #1659

rborer commented Feb 24, 2017

googlebot commented Feb 24, 2017

rborer commented Feb 24, 2017

googlebot commented Feb 24, 2017

rborer commented Feb 24, 2017

coveralls commented Feb 27, 2017

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Mar 6, 2017

rborer commented Mar 16, 2017

garrettjonesgoogle commented Mar 16, 2017

rborer commented Mar 24, 2017

garrettjonesgoogle commented Apr 19, 2017

garrettjonesgoogle commented Apr 22, 2017

rborer commented Apr 24, 2017

Make sure dependencies converges #1659

Make sure dependencies converges #1659

Conversation

rborer commented Feb 24, 2017

googlebot commented Feb 24, 2017

rborer commented Feb 24, 2017

googlebot commented Feb 24, 2017

rborer commented Feb 24, 2017

coveralls commented Feb 27, 2017

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Mar 6, 2017

rborer commented Mar 16, 2017

garrettjonesgoogle commented Mar 16, 2017

rborer commented Mar 24, 2017

garrettjonesgoogle commented Apr 19, 2017

garrettjonesgoogle commented Apr 22, 2017

rborer commented Apr 24, 2017