Reverse-integrate: merge v2 into master#568
Reverse-integrate: merge v2 into master#568davorbonaci merged 49 commits intoGoogleCloudPlatform:masterfrom davorbonaci:merge_v2_into_master
v2 into master#568Conversation
Forward-integrate branch 'master' into 'v2'
They are now brought by the dependency on Apache Beam.
They are now brought by the dependency on Apache Beam.
dependencies as used.
These modules are part of Apache Beam, but not Dataflow any more.
Dataflow distribution of Beam is not expected to have its own Javadoc build.
This test lives in Beam, and doesn't need to be duplicated in the Dataflow distribution.
Add Dataflow, version 2.0.0-beta1, as a distribution of Apache Beam
Add copyright and license throughout
Add NOTICE to archetypes and enforce they match the root NOTICE
maven-enforcer: require Java 1.8.0 and above
Root of the jars we ship Not in the generated projects
Move NOTICE to the right location
Generate empty Javadoc
Move properties to root pom.xml
This is based on the release candidate #2, currenly being considered as the release.
Upgrade to Apache Beam, version 0.5.0
Signed-off-by: Jason Kuster <jasonkuster@google.com>
Signed-off-by: Jason Kuster <jasonkuster@google.com>
Signed-off-by: Jason Kuster <jasonkuster@google.com>
Archetypes: version management at the top-level outside archetype source code
Forward-integrate: merge `master` into `v2`
|
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
francesperry
left a comment
francesperry
left a comment
There was a problem hiding this comment.
Can you add a bit of detail in the description?
|
(description added) Merging. |
5 participants
This pull request merges
v2branch intomaster.After this pull request is merged, the
masterbranch will build Dataflow SDK 2.x for Java, which itself is a distribution of Apache Beam.The old branch is preserved, as
master-1.x-- just checkout that branch for continued development of the Dataflow SDK 1.x.