Skip to content

[BEAM-9444] Use GCP BOM to set package versions - #13075

Merged
kennknowles merged 23 commits into
apache:masterfrom
kileys:beam-9444-bom
Nov 2, 2020
Merged

[BEAM-9444] Use GCP BOM to set package versions#13075
kennknowles merged 23 commits into
apache:masterfrom
kileys:beam-9444-bom

Conversation

@kileys

@kileyskileys commented Oct 12, 2020

Copy link
Copy Markdown
Contributor

Use GCP libraries bom to set versions for GCP related libraries

Updated version of #11156

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Format the pull request title like [BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replace BEAM-XXX with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

Post-Commit Tests Status (on master branch)

LangSDKDataflowFlinkSamzaSparkTwister2
GoBuild Status---Build Status---Build Status---
JavaBuild StatusBuild Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build StatusBuild Status
Build Status
Build Status
Build Status
PythonBuild Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
---Build Status---
XLangBuild Status---Build Status---Build Status---

Pre-Commit Tests Status (on master branch)

---JavaPythonGoWebsiteWhitespaceTypescript
Non-portableBuild StatusBuild Status
Build Status
Build Status
Build Status
Build StatusBuild StatusBuild StatusBuild Status
Portable---Build Status------------

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests

See CI.md for more information about GitHub Actions CI.

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Java examples on Dataflow Java 11

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Dataflow ValidatesRunner Java 11

@kileyskileys closed this Oct 12, 2020
@kileyskileys reopened this Oct 12, 2020
@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Dataflow ValidatesRunner

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Java PostCommit

@github-actions

Copy link
Copy Markdown
Contributor

The Build Workflow run is cancelling this PR. It in earlier duplicate of 2173354 run.

@kennknowles

Copy link
Copy Markdown
Member

Run Spotless PreCommit

@kennknowles

Copy link
Copy Markdown
Member

I don't see any reason for that strange error in spotless.

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Python PreCommit

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Python_PVR_Flink PreCommit

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Spark ValidatesRunner

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Dataflow ValidatesRunner

@kileys

Copy link
Copy Markdown
ContributorAuthor

@suztomo are there other tests I should run to verify this? Linkage checker runs without any new errors

@kileys

Copy link
Copy Markdown
ContributorAuthor

R: @kennknowles, @suztomo, @lukecwik

@kileys

Copy link
Copy Markdown
ContributorAuthor

The Dataflow validates runner tests are also failing on master

@suztomosuztomo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are there other tests I should run to verify this?

Not that I know of.

Comment threadbuildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy Outdated
Comment threadbuildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy Outdated
Comment threadexamples/java/build.gradle Outdated
@lukecwik

Copy link
Copy Markdown
Member

Also, it seems as though existing modules that don't add a platform level dep to the GCP libraries bom will get some version of the dep since we have cleared the version.

@kennknowleskennknowles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Java PreCommit

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Python PreCommit

@kileys

Copy link
Copy Markdown
ContributorAuthor

Run Java_Examples_Dataflow PreCommit

@kennknowles

Copy link
Copy Markdown
Member

It does seem that if a module had any of these deps but forgot the enforcedPlatform line then it would go back to getting the arbitrary latest version. I understand fixing that is in a follow-up.

Here's what I did to view the dep changes:

# gcp is GNU cp here
mkdir ~/tmp/deps-before
git checkout github/master
./gradlew dependencyReport
find . -name dependencies.txt -exec gcp --parents \{\} ~/tmp/deps-before/ \;
mkdir ~/tmp/deps-after
git checkout github/pr/13075
./gradlew dependencyReport
find . -name dependencies.txt -exec gcp --parents \{\} ~/tmp/deps-after/ \;
diff --brief --recursive ~/tmp/deps-before ~/tmp/deps-after
diff --unified=0 --recursive ~/tmp/deps-before ~/tmp/deps-after

@kennknowleskennknowles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not have the capacity to manually determine the possible consequences of the dep changes, which do affect modules not listed (for example autovalue annotations are downgraded a couple patch versions).

I was checking just for modules that were accidentally "upgraded" to the latest by not having a version or that were accidentally downgraded because the BOM reduced versions they depended on that had nothing to do with GCP. I did not find any problems, but it is too much content to be certain. Still, it is surely an improvement.

@kennknowles
kennknowles merged commit c0c39eb into apache:masterNov 2, 2020
@kileys
kileys deleted the beam-9444-bom branch November 19, 2020 21:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kileys@kennknowles@lukecwik@suztomo