[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110333=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110333 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 23:07 Start Date: 08/Jun/18 23:07 Worklog Time Spent: 10m Work Description: asfgit closed pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/src/contribute/release-guide.md b/src/contribute/release-guide.md index e48981c51..1608b05c5 100644 --- a/src/contribute/release-guide.md +++ b/src/contribute/release-guide.md @@ -63,6 +63,15 @@ To prepare for each release, you should audit the project status in the JIRA iss You need to have a GPG key to sign the release artifacts. Please be aware of the ASF-wide [release signing guidelines](https://www.apache.org/dev/release-signing.html). If you don’t have a GPG key associated with your Apache account, please create one according to the guidelines. +Get more entropy for creating a GPG key + +sudo apt-get install rng-tools +sudo rngd -r /dev/urandom + +Create a GPG key + +gpg --full-generate-key + Determine your Apache GPG Key and Key ID, as follows: gpg --list-keys @@ -128,6 +137,8 @@ Release manager needs to have an account with PyPI. If you need one, [register a When contributors resolve an issue in JIRA, they are tagging it with a release that will contain their changes. With the release currently underway, new issues should be resolved against a subsequent future release. Therefore, you should create a release item for this subsequent release, as follows: +Attention: Only committer has permission to perform this. + 1. In JIRA, navigate to the [`Beam > Administration > Versions`](https://issues.apache.org/jira/plugins/servlet/project-config/BEAM/versions). 1. Add a new release: choose the next minor version number compared to the one currently underway, select today’s date as the `Start Date`, and choose `Add`. @@ -158,12 +169,54 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Pre-installation for python build +* Install pip + + ``` + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python get-pip.py + ``` +* Install virtualenv + + ``` + pip install --upgrade virtualenv + ``` +* Cython + + ``` + sudo pip install cython + sudo apt-get install gcc + sudo apt-get install python-dev + ``` +Make sure your ```time``` alias to ```/usr/bin/time```, if not: + +``` +sudo apt-get install time +alias time='/usr/bin/time' +``` + +Run gradle release build +* Clean current workspace + + ``` + git clean -fdx + ./gradlew clean + ``` + +* Unlock the secret key + ``` + gpg --output ~/doc.sig --sign ~/.bashrc + ``` + +* Run build command + ``` + ./gradlew build -PisRelease --no-parallel --scan --stacktrace + ``` + ### Update and Verify Javadoc -The build with `-Prelease` creates the combined Javadoc for the release in `sdks/java/javadoc`. +The build with `-PisRelease` creates the combined Javadoc for the release in `sdks/java/javadoc`. The file `sdks/java/javadoc/ant.xml` file contains a list of modules to include in and exclude, plus a list of offline URLs that populate links from Beam's @@ -178,64 +231,73 @@ Javadoc to the Javadoc for other modules that Beam depends on. the version number has changed, download a new version of the corresponding `-docs/package-list` file. -### Create a release branch +### Create a release branch in apache/beam repository + +Attention: Only committer has permission to create release branch in apache/beam. -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110331=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110331 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 23:03 Start Date: 08/Jun/18 23:03 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395915303 @asfgit merge This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110331) Time Spent: 12h 50m (was: 12h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 12h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110324=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110324 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 22:37 Start Date: 08/Jun/18 22:37 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395910816 This PR is ready to merge. Issues above were discussed offline. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110324) Time Spent: 12h 40m (was: 12.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 12h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110319=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110319 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 22:27 Start Date: 08/Jun/18 22:27 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395909002 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110319) Time Spent: 12.5h (was: 12h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 12.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110292=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110292 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 21:44 Start Date: 08/Jun/18 21:44 Worklog Time Spent: 10m Work Description: aaltay commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r194188504 ## File path: src/contribute/release-guide.md ## @@ -289,30 +355,57 @@ Copy the source release to the dev repository of `dist.apache.org`. 1. Make a directory for the new release: -mkdir beam/${VERSION} -cd beam/${VERSION} +mkdir beam/${RELEASE} +cd beam/${RELEASE} -1. Copy and rename the Beam source distribution, hashes, and GPG signature: +1. Download source zip from GitHub: -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip . -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip.asc . -cp ${BEAM_ROOT}/sdks/python/target/apache-beam-${VERSION}.zip apache-beam-${VERSION}-python.zip +wget https://github.com/apache/beam/archive/release-${RELEASE}.zip \ + -O apache-beam-${RELEASE}-source-release.zip -1. Create hashes for source files and sign the python source file file +1. Create hashes and sign the source distribution: -sha512sum apache-beam-${VERSION}-source-release.zip > apache-beam-${VERSION}-source-release.zip.sha512 -gpg --armor --detach-sig apache-beam-${VERSION}-python.zip -sha512sum apache-beam-${VERSION}-python.zip > apache-beam-${VERSION}-python.zip.sha512 +gpg --armor --detach-sig apache-beam-${RELEASE}-source-release.zip +sha512sum apache-beam-${RELEASE}-source-release.zip > apache-beam-${RELEASE}-source-release.zip.sha512 1. Add and commit all the files. -svn add beam/${VERSION} +svn add beam/${RELEASE} svn commit 1. Verify that files are [present](https://dist.apache.org/repos/dist/dev/beam). +### Stage python binaries on dist.apache.org Review comment: I meant, all python "artifacts". Sorry for the confusion. I mean the tar ball, and platform dependent whl files. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110292) Time Spent: 12h 20m (was: 12h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 12h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110272=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110272 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 21:00 Start Date: 08/Jun/18 21:00 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395889030 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110272) Time Spent: 12h 10m (was: 12h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 12h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110223=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110223 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:47 Start Date: 08/Jun/18 18:47 Worklog Time Spent: 10m Work Description: boyuanzz commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r194149801 ## File path: src/contribute/release-guide.md ## @@ -289,30 +355,57 @@ Copy the source release to the dev repository of `dist.apache.org`. 1. Make a directory for the new release: -mkdir beam/${VERSION} -cd beam/${VERSION} +mkdir beam/${RELEASE} +cd beam/${RELEASE} -1. Copy and rename the Beam source distribution, hashes, and GPG signature: +1. Download source zip from GitHub: -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip . -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip.asc . -cp ${BEAM_ROOT}/sdks/python/target/apache-beam-${VERSION}.zip apache-beam-${VERSION}-python.zip +wget https://github.com/apache/beam/archive/release-${RELEASE}.zip \ + -O apache-beam-${RELEASE}-source-release.zip -1. Create hashes for source files and sign the python source file file +1. Create hashes and sign the source distribution: -sha512sum apache-beam-${VERSION}-source-release.zip > apache-beam-${VERSION}-source-release.zip.sha512 -gpg --armor --detach-sig apache-beam-${VERSION}-python.zip -sha512sum apache-beam-${VERSION}-python.zip > apache-beam-${VERSION}-python.zip.sha512 +gpg --armor --detach-sig apache-beam-${RELEASE}-source-release.zip +sha512sum apache-beam-${RELEASE}-source-release.zip > apache-beam-${RELEASE}-source-release.zip.sha512 1. Add and commit all the files. -svn add beam/${VERSION} +svn add beam/${RELEASE} svn commit 1. Verify that files are [present](https://dist.apache.org/repos/dist/dev/beam). +### Stage python binaries on dist.apache.org Review comment: We don't explain that so far. Do we need this? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110223) Time Spent: 12h (was: 11h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 12h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110222=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110222 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:46 Start Date: 08/Jun/18 18:46 Worklog Time Spent: 10m Work Description: boyuanzz commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r194149568 ## File path: src/contribute/release-guide.md ## @@ -158,12 +169,54 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Pre-installation for python build +* Install pip + + ``` + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python get-pip.py + ``` +* Install virtualenv + + ``` + pip install --upgrade virtualenv + ``` +* Cython + + ``` + sudo pip install cython + sudo apt-get install gcc + sudo apt-get install python-dev + ``` +Make sure your ```time``` alias to ```/usr/bin/time```, if not: Review comment: python tests script uses ```time```. If ```/usr/bin/time``` is not alias to ```time```, tests will fail. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110222) Time Spent: 11h 50m (was: 11h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 11h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110219=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110219 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:41 Start Date: 08/Jun/18 18:41 Worklog Time Spent: 10m Work Description: aaltay commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r194147737 ## File path: src/contribute/release-guide.md ## @@ -158,12 +169,54 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Pre-installation for python build +* Install pip + + ``` + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python get-pip.py + ``` +* Install virtualenv + + ``` + pip install --upgrade virtualenv + ``` +* Cython + + ``` + sudo pip install cython + sudo apt-get install gcc + sudo apt-get install python-dev + ``` +Make sure your ```time``` alias to ```/usr/bin/time```, if not: Review comment: Why do we need ``time`` for release verification? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110219) Time Spent: 11h 40m (was: 11.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 11h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110218=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110218 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:41 Start Date: 08/Jun/18 18:41 Worklog Time Spent: 10m Work Description: aaltay commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r194148134 ## File path: src/contribute/release-guide.md ## @@ -289,30 +355,57 @@ Copy the source release to the dev repository of `dist.apache.org`. 1. Make a directory for the new release: -mkdir beam/${VERSION} -cd beam/${VERSION} +mkdir beam/${RELEASE} +cd beam/${RELEASE} -1. Copy and rename the Beam source distribution, hashes, and GPG signature: +1. Download source zip from GitHub: -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip . -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip.asc . -cp ${BEAM_ROOT}/sdks/python/target/apache-beam-${VERSION}.zip apache-beam-${VERSION}-python.zip +wget https://github.com/apache/beam/archive/release-${RELEASE}.zip \ + -O apache-beam-${RELEASE}-source-release.zip -1. Create hashes for source files and sign the python source file file +1. Create hashes and sign the source distribution: -sha512sum apache-beam-${VERSION}-source-release.zip > apache-beam-${VERSION}-source-release.zip.sha512 -gpg --armor --detach-sig apache-beam-${VERSION}-python.zip -sha512sum apache-beam-${VERSION}-python.zip > apache-beam-${VERSION}-python.zip.sha512 +gpg --armor --detach-sig apache-beam-${RELEASE}-source-release.zip +sha512sum apache-beam-${RELEASE}-source-release.zip > apache-beam-${RELEASE}-source-release.zip.sha512 1. Add and commit all the files. -svn add beam/${VERSION} +svn add beam/${RELEASE} svn commit 1. Verify that files are [present](https://dist.apache.org/repos/dist/dev/beam). +### Stage python binaries on dist.apache.org Review comment: Do we explain how to generate all python dependencies? (If not could we file a JIRA?) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110218) Time Spent: 11.5h (was: 11h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 11.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110213=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110213 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:35 Start Date: 08/Jun/18 18:35 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395850537 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110213) Time Spent: 11h 20m (was: 11h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 11h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110210=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110210 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:26 Start Date: 08/Jun/18 18:26 Worklog Time Spent: 10m Work Description: pabloem closed pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/src/contribute/release-guide.md b/src/contribute/release-guide.md index e48981c51..1608b05c5 100644 --- a/src/contribute/release-guide.md +++ b/src/contribute/release-guide.md @@ -63,6 +63,15 @@ To prepare for each release, you should audit the project status in the JIRA iss You need to have a GPG key to sign the release artifacts. Please be aware of the ASF-wide [release signing guidelines](https://www.apache.org/dev/release-signing.html). If you don’t have a GPG key associated with your Apache account, please create one according to the guidelines. +Get more entropy for creating a GPG key + +sudo apt-get install rng-tools +sudo rngd -r /dev/urandom + +Create a GPG key + +gpg --full-generate-key + Determine your Apache GPG Key and Key ID, as follows: gpg --list-keys @@ -128,6 +137,8 @@ Release manager needs to have an account with PyPI. If you need one, [register a When contributors resolve an issue in JIRA, they are tagging it with a release that will contain their changes. With the release currently underway, new issues should be resolved against a subsequent future release. Therefore, you should create a release item for this subsequent release, as follows: +Attention: Only committer has permission to perform this. + 1. In JIRA, navigate to the [`Beam > Administration > Versions`](https://issues.apache.org/jira/plugins/servlet/project-config/BEAM/versions). 1. Add a new release: choose the next minor version number compared to the one currently underway, select today’s date as the `Start Date`, and choose `Add`. @@ -158,12 +169,54 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Pre-installation for python build +* Install pip + + ``` + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python get-pip.py + ``` +* Install virtualenv + + ``` + pip install --upgrade virtualenv + ``` +* Cython + + ``` + sudo pip install cython + sudo apt-get install gcc + sudo apt-get install python-dev + ``` +Make sure your ```time``` alias to ```/usr/bin/time```, if not: + +``` +sudo apt-get install time +alias time='/usr/bin/time' +``` + +Run gradle release build +* Clean current workspace + + ``` + git clean -fdx + ./gradlew clean + ``` + +* Unlock the secret key + ``` + gpg --output ~/doc.sig --sign ~/.bashrc + ``` + +* Run build command + ``` + ./gradlew build -PisRelease --no-parallel --scan --stacktrace + ``` + ### Update and Verify Javadoc -The build with `-Prelease` creates the combined Javadoc for the release in `sdks/java/javadoc`. +The build with `-PisRelease` creates the combined Javadoc for the release in `sdks/java/javadoc`. The file `sdks/java/javadoc/ant.xml` file contains a list of modules to include in and exclude, plus a list of offline URLs that populate links from Beam's @@ -178,64 +231,73 @@ Javadoc to the Javadoc for other modules that Beam depends on. the version number has changed, download a new version of the corresponding `-docs/package-list` file. -### Create a release branch +### Create a release branch in apache/beam repository + +Attention: Only committer has permission to create release branch in apache/beam. -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110211=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110211 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:26 Start Date: 08/Jun/18 18:26 Worklog Time Spent: 10m Work Description: pabloem opened a new pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110211) Time Spent: 11h 10m (was: 11h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 11h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110209=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110209 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:24 Start Date: 08/Jun/18 18:24 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395847220 rerun tests please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110209) Time Spent: 10h 50m (was: 10h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 10h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=110208=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-110208 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 08/Jun/18 18:24 Start Date: 08/Jun/18 18:24 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395847220 rerun tests please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 110208) Time Spent: 10h 40m (was: 10.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 10h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109778=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109778 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 07/Jun/18 16:15 Start Date: 07/Jun/18 16:15 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395479370 @robertwb commit https://github.com/apache/beam-site/pull/424/commits/c6b6cc213504a8259f51201d2a0d014b42c6f294 copies zip file into sdks/python/staging subdir This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109778) Time Spent: 10.5h (was: 10h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 10.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109575=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109575 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Jun/18 23:21 Start Date: 06/Jun/18 23:21 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395244298 Re: @robertwb, I think so. @alanmyrvold what do you think? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109575) Time Spent: 10h 20m (was: 10h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 10h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109573=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109573 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Jun/18 23:12 Start Date: 06/Jun/18 23:12 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-395242643 Hey @alanmyrvold @robertwb , please review this commit: https://github.com/apache/beam-site/pull/424/commits/ab15c1bb19ac20c97652cca1c7fc085f6d1b6709 . Thanks! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109573) Time Spent: 10h 10m (was: 10h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 10h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109569=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109569 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Jun/18 22:39 Start Date: 06/Jun/18 22:39 Worklog Time Spent: 10m Work Description: boyuanzz commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193580872 ## File path: src/contribute/release-guide.md ## @@ -334,14 +404,14 @@ candidate into the source tree of the website. Add the new Javadoc to [SDK API Reference page]({{ site.baseurl }}/documentation/sdks/javadoc/) page, as follows: * Unpack the Maven artifact `org.apache.beam:beam-sdks-java-javadoc` into some temporary location. Call this `${JAVADOC_TMP}`. -* Copy the generated Javadoc into the website repository: `cp -r ${JAVADOC_TMP} src/documentation/sdks/javadoc/${VERSION}`. +* Copy the generated Javadoc into the website repository: `cp -r ${JAVADOC_TMP} src/documentation/sdks/javadoc/${RELEASE}`. * Set up the necessary git commands to account for the new and deleted files from the javadoc. * Update the Javadoc link on this page to point to the new version (in `src/documentation/sdks/javadoc/current.md`). Create Pydoc Add the new Pydoc to [SDK API Reference page]({{ site.baseurl }}/documentation/sdks/pydoc/) page, as follows: -* Copy the generated Pydoc into the website repository: `cp -r ${PYDOC_ROOT} src/documentation/sdks/pydoc/${VERSION}`. +* Copy the generated Pydoc into the website repository: `cp -r ${PYDOC_ROOT} src/documentation/sdks/pydoc/${RELEASE}`. * Remove `.doctrees` directory. * Update the Pydoc link on this page to point to the new version (in `src/documentation/sdks/pydoc/current.md`). Review comment: I think this step will push RC1 tag to github: https://github.com/pabloem/beam-site/blob/372c93ecbafbf3a1440492df1e12050dfe939e91/src/contribute/release-guide.md#build-and-stage-java-artifacts-with-maven This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109569) Time Spent: 10h (was: 9h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 10h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109560=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109560 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Jun/18 21:52 Start Date: 06/Jun/18 21:52 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193571012 ## File path: src/contribute/release-guide.md ## @@ -334,14 +404,14 @@ candidate into the source tree of the website. Add the new Javadoc to [SDK API Reference page]({{ site.baseurl }}/documentation/sdks/javadoc/) page, as follows: * Unpack the Maven artifact `org.apache.beam:beam-sdks-java-javadoc` into some temporary location. Call this `${JAVADOC_TMP}`. -* Copy the generated Javadoc into the website repository: `cp -r ${JAVADOC_TMP} src/documentation/sdks/javadoc/${VERSION}`. +* Copy the generated Javadoc into the website repository: `cp -r ${JAVADOC_TMP} src/documentation/sdks/javadoc/${RELEASE}`. * Set up the necessary git commands to account for the new and deleted files from the javadoc. * Update the Javadoc link on this page to point to the new version (in `src/documentation/sdks/javadoc/current.md`). Create Pydoc Add the new Pydoc to [SDK API Reference page]({{ site.baseurl }}/documentation/sdks/pydoc/) page, as follows: -* Copy the generated Pydoc into the website repository: `cp -r ${PYDOC_ROOT} src/documentation/sdks/pydoc/${VERSION}`. +* Copy the generated Pydoc into the website repository: `cp -r ${PYDOC_ROOT} src/documentation/sdks/pydoc/${RELEASE}`. * Remove `.doctrees` directory. * Update the Pydoc link on this page to point to the new version (in `src/documentation/sdks/pydoc/current.md`). Review comment: Need to push the RC1 tag to github? And verify that the cythonized built python artifacts are on dist.apache.org along with the source? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109560) Time Spent: 9h 50m (was: 9h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 9h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109557=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109557 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Jun/18 21:48 Start Date: 06/Jun/18 21:48 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193569851 ## File path: src/contribute/release-guide.md ## @@ -289,30 +355,34 @@ Copy the source release to the dev repository of `dist.apache.org`. 1. Make a directory for the new release: -mkdir beam/${VERSION} -cd beam/${VERSION} +mkdir beam/${RELEASE} +cd beam/${RELEASE} -1. Copy and rename the Beam source distribution, hashes, and GPG signature: +1. Download source zip from GitHub: -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip . -cp ${BEAM_ROOT}/target/apache-beam-${VERSION}-source-release.zip.asc . -cp ${BEAM_ROOT}/sdks/python/target/apache-beam-${VERSION}.zip apache-beam-${VERSION}-python.zip +wget https://github.com/apache/beam/archive/release-${RELEASE}.zip \ + -O apache-beam-${RELEASE}-source-release.zip -1. Create hashes for source files and sign the python source file file +1. Create hashes and sign the source distribution: -sha512sum apache-beam-${VERSION}-source-release.zip > apache-beam-${VERSION}-source-release.zip.sha512 -gpg --armor --detach-sig apache-beam-${VERSION}-python.zip -sha512sum apache-beam-${VERSION}-python.zip > apache-beam-${VERSION}-python.zip.sha512 +gpg --armor --detach-sig apache-beam-${RELEASE}-source-release.zip +sha512sum apache-beam-${RELEASE}-source-release.zip > apache-beam-${RELEASE}-source-release.zip.sha512 1. Add and commit all the files. -svn add beam/${VERSION} +svn add beam/${RELEASE} svn commit 1. Verify that files are [present](https://dist.apache.org/repos/dist/dev/beam). Review comment: Need a step to build the python binaries and stage on dist.apache.org/dev/beam, like https://dist.apache.org/repos/dist/dev/beam/2.5.0/ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109557) Time Spent: 9h 40m (was: 9.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 9h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109230=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109230 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 05/Jun/18 22:31 Start Date: 05/Jun/18 22:31 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-394881364 Hey @alanmyrvold , please review commit https://github.com/apache/beam-site/pull/424/commits/d238c9ec3ba279188c33b098de0a3064fa8b4216, which addressed your comments above. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109230) Time Spent: 9.5h (was: 9h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 9.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109229=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109229 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 05/Jun/18 22:30 Start Date: 05/Jun/18 22:30 Worklog Time Spent: 10m Work Description: boyuanzz commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193242145 ## File path: src/contribute/release-guide.md ## @@ -178,64 +231,78 @@ Javadoc to the Javadoc for other modules that Beam depends on. the version number has changed, download a new version of the corresponding `-docs/package-list` file. -### Create a release branch +### Create a release branch in apache/beam repository -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Attention: Only committer has permission to create release branch in apache/beam. + +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please make sure your cloned repository is up-to-date before starting.) git checkout +**NOTE**: If you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, rather than the master branch. Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: + +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} + +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +git branch ${BRANCH} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +# Now change the version in existing gradle files, and Python files +sed -i -e "s/'${RELEASE}'/'${NEXT_VERSION_IN_BASE_BRANCH}'/g" build_rules.gradle +sed -i -e "s/${RELEASE}/${NEXT_VERSION_IN_BASE_BRANCH}/g" gradle.properties +sed -i -e "s/${RELEASE}/${NEXT_VERSION_IN_BASE_BRANCH}/g" sdks/python/apache_beam/version.py -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +# Save changes in master branch +git add gradle.properties build_rules.gradle sdks/python/apache_beam/version.py +git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch." Check out the release branch. -git checkout ${BRANCH_NAME} +git checkout ${BRANCH} Review comment: We do all master update in previous sed scripts. The rest of instructions all happen in release branch. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109229) Time Spent: 9h 20m (was: 9h 10m) > Update release process to use Gradle >
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109163=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109163 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 05/Jun/18 18:32 Start Date: 05/Jun/18 18:32 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193176828 ## File path: src/contribute/release-guide.md ## @@ -178,64 +231,78 @@ Javadoc to the Javadoc for other modules that Beam depends on. the version number has changed, download a new version of the corresponding `-docs/package-list` file. -### Create a release branch +### Create a release branch in apache/beam repository -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Attention: Only committer has permission to create release branch in apache/beam. + +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please make sure your cloned repository is up-to-date before starting.) git checkout +**NOTE**: If you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, rather than the master branch. Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: + +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} + +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +git branch ${BRANCH} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +# Now change the version in existing gradle files, and Python files +sed -i -e "s/'${RELEASE}'/'${NEXT_VERSION_IN_BASE_BRANCH}'/g" build_rules.gradle +sed -i -e "s/${RELEASE}/${NEXT_VERSION_IN_BASE_BRANCH}/g" gradle.properties +sed -i -e "s/${RELEASE}/${NEXT_VERSION_IN_BASE_BRANCH}/g" sdks/python/apache_beam/version.py -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +# Save changes in master branch +git add gradle.properties build_rules.gradle sdks/python/apache_beam/version.py +git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch." Check out the release branch. -git checkout ${BRANCH_NAME} +git checkout ${BRANCH} Review comment: This step needs to be moved later, after changing versions on master? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109163) Time Spent: 9h 10m (was: 9h) > Update release process to use Gradle > > >
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109160=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109160 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 05/Jun/18 18:31 Start Date: 05/Jun/18 18:31 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193176561 ## File path: src/contribute/release-guide.md ## @@ -178,64 +231,78 @@ Javadoc to the Javadoc for other modules that Beam depends on. the version number has changed, download a new version of the corresponding `-docs/package-list` file. -### Create a release branch +### Create a release branch in apache/beam repository -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Attention: Only committer has permission to create release branch in apache/beam. + +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please make sure your cloned repository is up-to-date before starting.) git checkout +**NOTE**: If you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, rather than the master branch. Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: + +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} + +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +git branch ${BRANCH} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +# Now change the version in existing gradle files, and Python files +sed -i -e "s/'${RELEASE}'/'${NEXT_VERSION_IN_BASE_BRANCH}'/g" build_rules.gradle +sed -i -e "s/${RELEASE}/${NEXT_VERSION_IN_BASE_BRANCH}/g" gradle.properties +sed -i -e "s/${RELEASE}/${NEXT_VERSION_IN_BASE_BRANCH}/g" sdks/python/apache_beam/version.py -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +# Save changes in master branch +git add gradle.properties build_rules.gradle sdks/python/apache_beam/version.py +git commit -m "Moving to ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT on master branch." Check out the release branch. -git checkout ${BRANCH_NAME} +git checkout ${BRANCH} The rest of this guide assumes that commands are run in the root of a repository on `${BRANCH_NAME}` with the above environment variables set. +### Update the beam version on master to the next dev version Review comment: This step should be done on master and is the purpose of the sed scripts above? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at:
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=109159=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-109159 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 05/Jun/18 18:30 Start Date: 05/Jun/18 18:30 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r193176202 ## File path: src/contribute/release-guide.md ## @@ -178,64 +231,78 @@ Javadoc to the Javadoc for other modules that Beam depends on. the version number has changed, download a new version of the corresponding `-docs/package-list` file. -### Create a release branch +### Create a release branch in apache/beam repository -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Attention: Only committer has permission to create release branch in apache/beam. + +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please make sure your cloned repository is up-to-date before starting.) git checkout +**NOTE**: If you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, rather than the master branch. Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: + +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 Review comment: NEXT_VERSION_IN_BASE_BRANCH=2.6.0 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 109159) Time Spent: 8h 50m (was: 8h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 8h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=108729=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-108729 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 04/Jun/18 20:36 Start Date: 04/Jun/18 20:36 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-394490497 Hey @alanmyrvold, could you please review my recent updates: https://github.com/apache/beam-site/pull/424/commits/9eab89ca99ec4375e18b70a6b39598e417fb7ae5, https://github.com/apache/beam-site/pull/424/commits/9d0fd1c6967ee61209b2fadf86e99c6005ffd0ed ? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 108729) Time Spent: 8h 40m (was: 8.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 8h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=108651=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-108651 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 04/Jun/18 16:30 Start Date: 04/Jun/18 16:30 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-394417474 @jbonofre @aaltay WDYT? Should we merge this PR now? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 108651) Time Spent: 8.5h (was: 8h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 8.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=108649=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-108649 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 04/Jun/18 16:26 Start Date: 04/Jun/18 16:26 Worklog Time Spent: 10m Work Description: swegner commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-394416170 I didn't realize this PR is still open. The published release guide still references the old Maven commands. If this doc is close or good enough, can it be merged and continue to iterate in separate PR's? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 108649) Time Spent: 8h 20m (was: 8h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 8h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=108244=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-108244 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 02/Jun/18 00:16 Start Date: 02/Jun/18 00:16 Worklog Time Spent: 10m Work Description: boyuanzz commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-394040555 Hey @pabloem @alanmyrvold , I added more updates in commit https://github.com/apache/beam-site/pull/424/commits/9eab89ca99ec4375e18b70a6b39598e417fb7ae5. Please take a look and review it. Thanks! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 108244) Time Spent: 8h 10m (was: 8h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 8h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=103431=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-103431 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 18/May/18 17:01 Start Date: 18/May/18 17:01 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r189332887 ## File path: src/contribute/release-guide.md ## @@ -158,12 +158,11 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Run `./gradlew -PisRelease clean build` to ensure that the build processes that are specific to that profile are in good shape. Review comment: ah yes that's true This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 103431) Time Spent: 8h (was: 7h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 8h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=103430=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-103430 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 18/May/18 16:56 Start Date: 18/May/18 16:56 Worklog Time Spent: 10m Work Description: lukecwik commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r189331584 ## File path: src/contribute/release-guide.md ## @@ -158,12 +158,11 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Run `./gradlew -PisRelease clean build` to ensure that the build processes that are specific to that profile are in good shape. Review comment: I'm not sure whether we should instruct users to use `--no-parallel` or not here as well. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 103430) Time Spent: 7h 50m (was: 7h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 7h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=103428=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-103428 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 18/May/18 16:53 Start Date: 18/May/18 16:53 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r189330634 ## File path: src/contribute/release-guide.md ## @@ -158,12 +158,11 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Run `./gradlew -PisRelease clean build` to ensure that the build processes that are specific to that profile are in good shape. Review comment: Added. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 103428) Time Spent: 7h 40m (was: 7.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 7h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=103417=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-103417 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 18/May/18 16:28 Start Date: 18/May/18 16:28 Worklog Time Spent: 10m Work Description: lukecwik commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r189324395 ## File path: src/contribute/release-guide.md ## @@ -158,12 +158,11 @@ Adjust any of the above properties to the improve clarity and presentation of th ### Verify that a Release Build Works -Run `mvn -Prelease clean install` to ensure that the build processes that are specific to that -profile are in good shape. +Run `./gradlew -PisRelease clean build` to ensure that the build processes that are specific to that profile are in good shape. Review comment: From a clean workspace `git clean -fdx`, perform `./gradlew -PisRelease build` The gradle tasks you list don't run in the order that you specified, they just get added to the task tree and execute in dependency order (and if there is no dependency between them, then in arbitrary order). This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 103417) Time Spent: 7.5h (was: 7h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 7.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=97714=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-97714 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 02/May/18 22:59 Start Date: 02/May/18 22:59 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-386147051 I think I agree with that. I've covered all the other TODOs that we ran into during our demo with Ahmet. So we can do the final review for this PR. r: @aaltay PTAL This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 97714) Time Spent: 7h 20m (was: 7h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 7h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=97713=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-97713 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 02/May/18 22:55 Start Date: 02/May/18 22:55 Worklog Time Spent: 10m Work Description: swegner commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-386146224 @pabloem Can you elaborate on what you're referring to with `dataflow.container_version`? I don't see this in the existing release documentation or your current changes. I want to get this unblocked so that we can follow this release guide for the 2.5.0 release. I seem to recall that we need to update `dataflow.container_version` as some part of the release, but I don't think the requirements would change with the Gradle migration. Put otherwise: if documentation about `dataflow.container_version` is missing, then we should track that as a bug, but it shouldn't hold up this doc update. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 97713) Time Spent: 7h 10m (was: 7h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 7h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=97277=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-97277 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 01/May/18 22:26 Start Date: 01/May/18 22:26 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-385808820 I've merged your changes, scott, and added a few to fix some todos that we discovered earlier. I'm still unclear if the instructions to update dataflow.container_version should be here, or in a Dataflow release guide. @aaltay what should we do with dataflow.container_version? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 97277) Time Spent: 7h (was: 6h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 7h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=97273=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-97273 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 01/May/18 22:24 Start Date: 01/May/18 22:24 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-385808820 I've merged your changes, scott, and added a few to fix some todos that we discovered earlier. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 97273) Time Spent: 6h 50m (was: 6h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 6h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=97239=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-97239 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 01/May/18 21:39 Start Date: 01/May/18 21:39 Worklog Time Spent: 10m Work Description: swegner commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-385798815 I've proposed a set of changes for source distribution here: https://github.com/pabloem/beam-site/pull/2 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 97239) Time Spent: 6h 40m (was: 6.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 6h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95210=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95210 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 19:59 Start Date: 25/Apr/18 19:59 Worklog Time Spent: 10m Work Description: aaltay closed pull request #5187: [BEAM-3255] Enabling gradle-based release process URL: https://github.com/apache/beam/pull/5187 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/build.gradle b/build.gradle index 6d32af17922..b8119d4ae31 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,7 @@ buildscript { maven { url "http://repo.spring.io/plugins-release; } } dependencies { +classpath 'net.researchgate:gradle-release:2.6.0' // Enable gradle-based release management classpath "com.gradle:build-scan-plugin:1.13.1" // Enable publishing build scans classpath "net.ltgt.gradle:gradle-apt-plugin:0.13" // Enable a Java annotation processor classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.1" // Enable proto code generation @@ -160,3 +161,11 @@ task pythonPreCommit() { dependsOn ":beam-sdks-python:check" } +apply plugin: 'net.researchgate.release' +release { + revertOnFail = true + tagTemplate = 'v${version}' + git { +requireBranch = 'release-.*|master' + } +} diff --git a/build_rules.gradle b/build_rules.gradle index 647cded120f..fee5755df7a 100644 --- a/build_rules.gradle +++ b/build_rules.gradle @@ -62,7 +62,7 @@ buildscript { // Create a function which returns true iff we are performing a release. def isRelease() { - return project.hasProperty('release') + return project.hasProperty('isRelease') } group = 'org.apache.beam' diff --git a/gradle.properties b/gradle.properties index 4b34251cea1..6b89dae4021 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,3 +21,4 @@ offlineRepositoryRoot=offline-repository signing.gnupg.executable=gpg signing.gnupg.useLegacyGpg=true +version=2.5.0-SNAPSHOT This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95210) Time Spent: 6.5h (was: 6h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 6.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95200=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95200 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 19:39 Start Date: 25/Apr/18 19:39 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384409228 TODO: Information on how to create the new key This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95200) Time Spent: 6h 20m (was: 6h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 6h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95197=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95197 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 19:23 Start Date: 25/Apr/18 19:23 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384404959 TODO: Substitute -Prelease to -PisRelease This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95197) Time Spent: 6h 10m (was: 6h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 6h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95191=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95191 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 19:10 Start Date: 25/Apr/18 19:10 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384401004 TODO: Update docs to state that it's pushing to origin. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95191) Time Spent: 6h (was: 5h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 6h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95186=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95186 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:52 Start Date: 25/Apr/18 18:52 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384395640 TODO: Add update of runners - and dataflow.container_version. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95186) Time Spent: 5h 50m (was: 5h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 5h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95169=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95169 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:29 Start Date: 25/Apr/18 18:29 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384388419 TODO: Revise section to update python version This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95169) Time Spent: 5h 40m (was: 5.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 5h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95168=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95168 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:24 Start Date: 25/Apr/18 18:24 Worklog Time Spent: 10m Work Description: pabloem commented on issue #5187: [BEAM-3255] Enabling gradle-based release process URL: https://github.com/apache/beam/pull/5187#issuecomment-384386864 Retest this please. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95168) Time Spent: 5.5h (was: 5h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 5.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95166=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95166 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:23 Start Date: 25/Apr/18 18:23 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384385956 TODO: Update sed commands to update to right release version This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95166) Time Spent: 5h 20m (was: 5h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 5h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95165=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95165 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:22 Start Date: 25/Apr/18 18:22 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384385956 TODO: Debug why python version update is not working This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95165) Time Spent: 5h 10m (was: 5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 5h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95157=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95157 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:17 Start Date: 25/Apr/18 18:17 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384384520 TODO: Add Python version.py file when committing new release on Base Branch This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95157) Time Spent: 5h (was: 4h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=95150=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-95150 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 25/Apr/18 18:16 Start Date: 25/Apr/18 18:16 Worklog Time Spent: 10m Work Description: pabloem commented on issue #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#issuecomment-384384017 TODO: Update https://github.com/pabloem/beam-site/blob/68ad3d68704e8256e25e93cbf5d656e8e32e9883/src/contribute/release-guide.md#verify-that-a-release-build-works to use Gradle TODO: Make sure that artifacts & javadoc are built with command in https://github.com/pabloem/beam-site/blob/68ad3d68704e8256e25e93cbf5d656e8e32e9883/src/contribute/release-guide.md#verify-that-a-release-build-works This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 95150) Time Spent: 4h 50m (was: 4h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 4h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93339=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93339 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 18:23 Start Date: 20/Apr/18 18:23 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183133095 ## File path: src/contribute/release-guide.md ## @@ -258,22 +264,20 @@ The core of the release process is the build-vote-fix cycle. Each cycle produces ### Build and stage Java artifacts with Maven -Set up a few environment variables to simplify Maven commands that follow. This identifies the release candidate being built. Start with `RC_NUM` equal to `1` and increment it for each candidate. +Set up a few environment variables to simplify the commands that follow. These identify the release candidate being built, and the branch where you will stage files. Start with `RC_NUM` equal to `1` and increment it for each candidate. + +RC_NUM=1 -RC_NUM="1" -RC_TAG="v${VERSION}-RC${RC_NUM}" -Use Maven release plugin to build the release artifacts, as follows: +Use Gradle release plugin to build the release artifacts, as follows: -mvn release:prepare \ --Dresume=false \ --DreleaseVersion=${VERSION} \ --Dtag=${RC_TAG} \ --DupdateWorkingCopyVersions=false +./gradlew release -Prelease.newVersion=${RELEASE_VERSION}-SNAPSHOT \ Review comment: Is release.newVersion 2.5.0-SNAPSHOT or 2.6.0-SNAPSHOT? ${NEXT_VERSION_IN_BASE_BRANCH}-SNAPSHOT ? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93339) Time Spent: 4h 40m (was: 4.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 4h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93334=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93334 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 18:13 Start Date: 20/Apr/18 18:13 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183130698 ## File path: src/contribute/release-guide.md ## @@ -180,39 +180,45 @@ Javadoc to the Javadoc for other modules that Beam depends on. ### Create a release branch -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please make sure your cloned repository is up-to-date before starting.) git checkout +**NOTE**: If you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, rather than the master branch. Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 Review comment: Ugh, sorry about that. Thanks. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93334) Time Spent: 4.5h (was: 4h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 4.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93330=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93330 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 18:11 Start Date: 20/Apr/18 18:11 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183130133 ## File path: src/contribute/release-guide.md ## @@ -180,39 +180,45 @@ Javadoc to the Javadoc for other modules that Beam depends on. ### Create a release branch -Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the code repository, and update version information on the original branch. +Release candidates are built from a release branch. As a final step in preparation for the release, you should create the release branch, push it to the Apache code repository, and update version information on the original branch. Check out the version of the codebase from which you start the release. For a new minor or major release, this may be `HEAD` of the `master` branch. To build a hotfix/incremental release, instead of the `master` branch, use the release tag of the release being patched. (Please make sure your cloned repository is up-to-date before starting.) git checkout +**NOTE**: If you are doing an incremental/hotfix release (e.g. 2.5.1), please check out the previous release tag, rather than the master branch. Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 Review comment: Either this should be RELEASE=2.5.0 or occurrences of $RELEASE below changed to match This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93330) Time Spent: 4h 20m (was: 4h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 4h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93320=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93320 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 17:51 Start Date: 20/Apr/18 17:51 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183125176 ## File path: src/contribute/release-guide.md ## @@ -189,30 +189,35 @@ Check out the version of the codebase from which you start the release. For a ne Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix releasei (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +git branch ${BRANCH} + +# Now change the version in existing gradle files, and Python files +sed -i 's/'$RELEASE'/'${NEXT_VERSION_IN_BASE_BRANCH}'/g' build_rules.gradle Review comment: Nice! thanks. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93320) Time Spent: 4h (was: 3h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 4h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93321=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93321 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 17:51 Start Date: 20/Apr/18 17:51 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183125226 ## File path: src/contribute/release-guide.md ## @@ -189,30 +189,35 @@ Check out the version of the codebase from which you start the release. For a ne Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix releasei (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: Review comment: Good catch. Thanks Scott. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93321) Time Spent: 4h 10m (was: 4h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 4h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93319=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93319 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 17:51 Start Date: 20/Apr/18 17:51 Worklog Time Spent: 10m Work Description: pabloem commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183125149 ## File path: src/contribute/release-guide.md ## @@ -189,30 +189,35 @@ Check out the version of the codebase from which you start the release. For a ne Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix releasei (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +git branch ${BRANCH} Review comment: It should be done in the upstream repo. I've mentioned 'Apache' there. LMK what you think. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93319) Time Spent: 3h 50m (was: 3h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 3h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93264=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93264 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 16:09 Start Date: 20/Apr/18 16:09 Worklog Time Spent: 10m Work Description: swegner commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183099578 ## File path: src/contribute/release-guide.md ## @@ -189,30 +189,35 @@ Check out the version of the codebase from which you start the release. For a ne Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix releasei (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: Review comment: typo: releasei -> release This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93264) Time Spent: 3h 40m (was: 3.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 3h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93207=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93207 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 13:43 Start Date: 20/Apr/18 13:43 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183054733 ## File path: src/contribute/release-guide.md ## @@ -189,30 +189,35 @@ Check out the version of the codebase from which you start the release. For a ne Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix releasei (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +git branch ${BRANCH} + +# Now change the version in existing gradle files, and Python files +sed -i 's/'$RELEASE'/'${NEXT_VERSION_IN_BASE_BRANCH}'/g' build_rules.gradle Review comment: The single quotes as written don't just match strings with single quotes. Maybe sed -i -e "s/'${RELEASE}'/'${NEXT_VERSION_IN_BASE_BRANCH}'/g" build_rules.gradle This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93207) Time Spent: 3.5h (was: 3h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 3.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=93204=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-93204 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 20/Apr/18 13:37 Start Date: 20/Apr/18 13:37 Worklog Time Spent: 10m Work Description: alanmyrvold commented on a change in pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424#discussion_r183043380 ## File path: src/contribute/release-guide.md ## @@ -189,30 +189,35 @@ Check out the version of the codebase from which you start the release. For a ne Set up a few environment variables to simplify Maven commands that follow. (We use `bash` Unix syntax in this guide.) -VERSION="1.2.3" -NEXT_VERSION="1.2.4" -BRANCH_NAME="release-${VERSION}" -DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT" +RELEASE_VERSION=2.5.0 +NEXT_VERSION_IN_BASE_BRANCH=2.6.0 +BRANCH=release-${RELEASE} Version represents the release currently underway, while next version specifies the anticipated next version to be released from that branch. Normally, 1.2.0 is followed by 1.3.0, while 1.2.3 is followed by 1.2.4. -Use Maven release plugin to create the release branch and update the current branch to use the new development version. This command applies for the new major or minor version. (Warning: this command automatically pushes changes to the code repository.) +**NOTE**: Only if you are doing an incremental/hotfix releasei (e.g. 2.5.1), please check out the previous release tag, before running the following instructions: -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DdevelopmentVersion=${DEVELOPMENT_VERSION} +BASE_RELEASE=2.5.0 +RELEASE=2.5.1 +NEXT_VERSION_IN_BASE_BRANCH=2.5.0 +git checkout tags/${BASE_RELEASE} -However, if you are doing an incremental/hotfix release, please run the following command after checking out the release tag of the release being patched. +Create a new branch, and update version files in the master branch. -mvn release:branch \ --DbranchName=${BRANCH_NAME} \ --DupdateWorkingCopyVersions=false \ --DupdateBranchVersions=true \ --DreleaseVersion="${VERSION}-SNAPSHOT" +git branch ${BRANCH} Review comment: Do we need to clarify that the branch is to made on the upstream apache/beam repo and pushed, and not on a fork, or is something done by the release plugin? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 93204) Time Spent: 3h 20m (was: 3h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 3h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=92922=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-92922 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 19/Apr/18 23:23 Start Date: 19/Apr/18 23:23 Worklog Time Spent: 10m Work Description: pabloem opened a new pull request #424: [BEAM-3255] Updating release guide to use Gradle commands URL: https://github.com/apache/beam-site/pull/424 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 92922) Time Spent: 3h 10m (was: 3h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 3h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=92776=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-92776 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 19/Apr/18 18:38 Start Date: 19/Apr/18 18:38 Worklog Time Spent: 10m Work Description: pabloem commented on issue #5187: [BEAM-3255] Enabling gradle-based release process URL: https://github.com/apache/beam/pull/5187#issuecomment-382838886 This task is based on using the https://github.com/researchgate/gradle-release#introduction gradle plugin This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 92776) Time Spent: 3h (was: 2h 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 3h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=92775=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-92775 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 19/Apr/18 18:36 Start Date: 19/Apr/18 18:36 Worklog Time Spent: 10m Work Description: pabloem opened a new pull request #5187: [BEAM-3255] Enabling gradle-based release process URL: https://github.com/apache/beam/pull/5187 This creates a `release` task that emulates the workflow to create release candidates. The workflow for this is as follows: ``` # Create environment variables. Supposing that we're preparing the 2.5.0 release: RELEASE=2.5.0 NEXT_VERSION=2.6.0 CANDIDATE=1 BRANCH=release-${RELEASE} # Create a release branch git branch ${BRANCH} # Now change the version in existing gradle files sed -i 's/'$RELEASE'/'${NEXT_VERSION}'/g' build_rules.gradle sed -i 's/'$RELEASE'/'${NEXT_VERSION}'/g' gradle.properties # Save changes in master branch git add gradle.properties build_rules.gradle git commit -m "Moving ${NEXT_VERSION}-SNAPSHOT on master branch." # RELEASE TASK # In the release branch, run the release task git checkout ${BRANCH} ./gradlew release -Prelease.newVersion=${RELEASE}-SNAPSHOT \ -Prelease.releaseVersion=${RELEASE}-RC${CANDIDATE} \ -Prelease.useAutomaticVersion=true --info --no-daemon ``` The release task must be performed each time a new Release Candidate is created, and once one is approved, then it's just necessary to add a new tag for the release: ``` git tag ${RELEASE} ${RELEASE}-RC${CANDIDATE} ``` The release task does the following: - Checks that no commits / updates are needed to the code - Checks that project has no SNAPSHOT dependencies - Runs build - Changes version in gradle.properties to remove `-SNAPSHOT` - Performs a commit - Adds a tag like so: `v${RELEASE}-RC${CANDIDATE}` - Changes version in gradle.properties back to contain `-SNAPSHOT` - Performs a commit This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 92775) Time Spent: 2h 50m (was: 2h 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 2h 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=89058=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-89058 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 18:16 Start Date: 09/Apr/18 18:16 Worklog Time Spent: 10m Work Description: alanmyrvold commented on issue #5057: [BEAM-3255] Move from maven to gradle with nightly builds URL: https://github.com/apache/beam/pull/5057#issuecomment-379844934 Run Gradle Publish This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 89058) Time Spent: 2h 40m (was: 2.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 2h 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=89027=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-89027 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 17:08 Start Date: 09/Apr/18 17:08 Worklog Time Spent: 10m Work Description: alanmyrvold commented on issue #5057: [BEAM-3255] Move from maven to gradle with nightly builds URL: https://github.com/apache/beam/pull/5057#issuecomment-379824529 +R: @lukecwik Can you take a look? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 89027) Time Spent: 2h 20m (was: 2h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 2h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=89026=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-89026 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 17:08 Start Date: 09/Apr/18 17:08 Worklog Time Spent: 10m Work Description: alanmyrvold opened a new pull request #5057: [BEAM-3255] Move from maven to gradle with nightly builds URL: https://github.com/apache/beam/pull/5057 Move from maven to gradle with nightly builds Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/projects/BEAM/issues/) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand: - [ ] What the pull request does - [ ] Why it does it - [ ] How it does it - [ ] Why this approach - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 89026) Time Spent: 2h 10m (was: 2h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Fix For: Not applicable > > Time Spent: 2h 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88994=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88994 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 16:17 Start Date: 09/Apr/18 16:17 Worklog Time Spent: 10m Work Description: lukecwik closed pull request #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_JDKVersionsTest.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_JDKVersionsTest.groovy deleted file mode 100644 index a2f6aaf5052..000 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_JDKVersionsTest.groovy +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import common_job_properties - -// This job runs the Java postcommit tests cross multiple JDK versions. -matrixJob('beam_PostCommit_Java_JDK_Versions_Test') { - description('Runs postcommit tests on the Java SDK in multiple Jdk versions.') - - // Set common parameters. - common_job_properties.setTopLevelMainJobProperties(delegate) - - // Set JDK versions. - axes { -label('label', 'beam') -jdk('OpenJDK 8 (on Ubuntu only)') - } - - // Sets that this is a PostCommit job. - common_job_properties.setPostCommit( - delegate, - '0 */6 * * *', - false, - '', // TODO: Remove last two args once test is stable again. - false) - - // Allows triggering this build against pull requests. - common_job_properties.enablePhraseTriggeringFromPullRequest( - delegate, - 'Java JDK Version Test', - 'Run Java JDK Version Test') - - // Maven build for this job. - steps { -maven { - // Set maven parameters. - common_job_properties.setMavenConfig(delegate) - - // Maven build project. - // Skip beam-sdks-python since this test is only apply to Java. - // TODO[BEAM-2322,BEAM-2323,BEAM-2324]: Re-enable beam-runners-apex once the build is passed. - goals('-B -e -P dataflow-runner clean install -pl \'!org.apache.beam:beam-sdks-python,!org.apache.beam:beam-runners-apex\' -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=TestDataflowRunner" ]\'') -} - } -} diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy index f1c7e18c066..7b298c739fd 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy @@ -54,7 +54,7 @@ job('beam_PostCommit_Java_ValidatesRunner_Apex_Gradle') { steps { gradle { rootBuildScriptDir(common_job_properties.checkoutDir) - tasks(':runners:apex:validatesRunner') + tasks(':beam-runners-apex:validatesRunner') for (String gradle_switch : gradle_switches) { switches(gradle_switch) } diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy index 5159f8afae2..ee4def2f9ca 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy @@ -55,7 +55,7 @@ job('beam_PostCommit_Java_ValidatesRunner_Dataflow_Gradle') { steps { gradle { rootBuildScriptDir(common_job_properties.checkoutDir) - tasks(':runners:google-cloud-dataflow-java:validatesRunner') + tasks(':beam-runners-google-cloud-dataflow-java:validatesRunner') for (String gradle_switch : gradle_switches) {
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88981=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88981 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 15:47 Start Date: 09/Apr/18 15:47 Worklog Time Spent: 10m Work Description: swegner commented on a change in pull request #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#discussion_r180140165 ## File path: build_rules.gradle ## @@ -478,65 +475,264 @@ ext.applyJavaNature = { } testCompile.extendsFrom shadowTest } - // Ensure that shaded classes are part of the artifact set. artifacts.archives shadowJar -if (configuration.artifactId) { - task sourcesJar(type: Jar) { -from sourceSets.main.allSource -classifier = 'sources' +// TODO: Figure out how to create ShadowJar task for ShadowTestJar here +// that is extendable within each sub-project with any additional includes. +// This could mirror the "shadowJar" configuration block. +// Optionally, we could also copy the shading configuration from the main +// source set and apply it here. +// +// Shading the test jar has a lot less need but can still be beneficial for +// resolving class conflicts for tests during test execution or exposing +// test libraries for users. + } + + task sourcesJar(type: Jar) { +from sourceSets.main.allSource +classifier = 'sources' + } + artifacts.archives sourcesJar + + task testSourcesJar(type: Jar) { +from sourceSets.test.allSource +classifier = 'test-sources' + } + artifacts.archives testSourcesJar + + task javadocJar(type: Jar, dependsOn: javadoc) { +classifier = 'javadoc' +from javadoc.destinationDir + } + artifacts.archives javadocJar + + if (isRelease() || project.hasProperty('publishing')) { +apply plugin: "maven-publish" + +// Only sign artifacts if we are performing a release +if (isRelease()) { + apply plugin: "signing" + signing { +useGpgCmd() +// Drop the unshaded jar because we don't want to publish it. +// Otherwise the unshaded one is the only one published since they +// both have no classifier and the names conflict. +def unshaded = configurations.archives.getArtifacts().matching({ + artifact -> artifact.classifier == "" }) +configurations.archives.getArtifacts().removeAll(unshaded) +sign configurations.archives } - task testSourcesJar(type: Jar) { -from sourceSets.test.allSource -classifier = 'test-sources' + + model { +tasks.generatePomFileForMavenJavaPublication { + destination = file("$buildDir/generated-pom.xml") +} +tasks.publishMavenJavaPublicationToMavenLocal { + dependsOn project.tasks.signArchives +} +tasks.publishMavenJavaPublicationToMavenRepository { + dependsOn project.tasks.signArchives +} } - task javadocJar(type: Jar, dependsOn: javadoc) { -classifier = 'javadoc' -from javadoc.destinationDir +} + +uploadArchives { + repositories { +mavenDeployer { + beforeDeployment { MavenDeployment deployment -> isRelease() && signing.signPom(deployment) } +} } +} - // If a publication artifact id is supplied, publish the shadow jar. - publishing { -publications { - mavenJava(MavenPublication) { -artifact(shadowJar) { - groupId "org.apache.beam" - artifactId configuration.artifactId - // Strip the "shaded" classifier. - classifier null - // Set readable name to project description. - pom.withXml { -asNode().appendNode('name', description) +publishing { + repositories { +maven { + url(project.properties['distMgmtSnapshotsUrl'] ?: isRelease() + ? 'https://repository.apache.org/service/local/staging/deploy/maven2' + : 'https://repository.apache.org/content/repositories/snapshots') + + // We attempt to find and load credentials from ~/.m2/settings.xml file that a user + // has configured with the Apache release and snapshot staging credentials. + // + // + // + // apache.releases.https + // USER_TOKEN + // PASS_TOKEN + // + // + // apache.snapshots.https + // USER_TOKEN + // PASS_TOKEN + // + // + // + def settingsXml = new File(System.getProperty('user.home'), '.m2/settings.xml') +
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88965=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88965 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 14:56 Start Date: 09/Apr/18 14:56 Worklog Time Spent: 10m Work Description: lukecwik closed pull request #5054: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5054 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_JDKVersionsTest.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_JDKVersionsTest.groovy deleted file mode 100644 index a2f6aaf5052..000 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_JDKVersionsTest.groovy +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import common_job_properties - -// This job runs the Java postcommit tests cross multiple JDK versions. -matrixJob('beam_PostCommit_Java_JDK_Versions_Test') { - description('Runs postcommit tests on the Java SDK in multiple Jdk versions.') - - // Set common parameters. - common_job_properties.setTopLevelMainJobProperties(delegate) - - // Set JDK versions. - axes { -label('label', 'beam') -jdk('OpenJDK 8 (on Ubuntu only)') - } - - // Sets that this is a PostCommit job. - common_job_properties.setPostCommit( - delegate, - '0 */6 * * *', - false, - '', // TODO: Remove last two args once test is stable again. - false) - - // Allows triggering this build against pull requests. - common_job_properties.enablePhraseTriggeringFromPullRequest( - delegate, - 'Java JDK Version Test', - 'Run Java JDK Version Test') - - // Maven build for this job. - steps { -maven { - // Set maven parameters. - common_job_properties.setMavenConfig(delegate) - - // Maven build project. - // Skip beam-sdks-python since this test is only apply to Java. - // TODO[BEAM-2322,BEAM-2323,BEAM-2324]: Re-enable beam-runners-apex once the build is passed. - goals('-B -e -P dataflow-runner clean install -pl \'!org.apache.beam:beam-sdks-python,!org.apache.beam:beam-runners-apex\' -DskipITs=false -DintegrationTestPipelineOptions=\'[ "--project=apache-beam-testing", "--tempRoot=gs://temp-storage-for-end-to-end-tests", "--runner=TestDataflowRunner" ]\'') -} - } -} diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy index f1c7e18c066..7b298c739fd 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Apex.groovy @@ -54,7 +54,7 @@ job('beam_PostCommit_Java_ValidatesRunner_Apex_Gradle') { steps { gradle { rootBuildScriptDir(common_job_properties.checkoutDir) - tasks(':runners:apex:validatesRunner') + tasks(':beam-runners-apex:validatesRunner') for (String gradle_switch : gradle_switches) { switches(gradle_switch) } diff --git a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy index 5159f8afae2..ee4def2f9ca 100644 --- a/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy +++ b/.test-infra/jenkins/job_beam_PostCommit_Java_ValidatesRunner_Dataflow.groovy @@ -55,7 +55,7 @@ job('beam_PostCommit_Java_ValidatesRunner_Dataflow_Gradle') { steps { gradle { rootBuildScriptDir(common_job_properties.checkoutDir) - tasks(':runners:google-cloud-dataflow-java:validatesRunner') + tasks(':beam-runners-google-cloud-dataflow-java:validatesRunner') for (String gradle_switch : gradle_switches) {
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88964=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88964 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 14:53 Start Date: 09/Apr/18 14:53 Worklog Time Spent: 10m Work Description: lukecwik opened a new pull request #5054: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5054 This merges many changes from our Gradle fixit week for publishing and validating releases from Gradle. Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/projects/BEAM/issues/) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand: - [ ] What the pull request does - [ ] Why it does it - [ ] How it does it - [ ] Why this approach - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88964) Time Spent: 1.5h (was: 1h 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 1.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88933=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88933 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 13:48 Start Date: 09/Apr/18 13:48 Worklog Time Spent: 10m Work Description: lukecwik commented on a change in pull request #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#discussion_r180099520 ## File path: build_rules.gradle ## @@ -34,11 +34,19 @@ println "Applying build_rules.gradle to $project.name" /*/ Review comment: Opened https://github.com/swegner/beam/pull/19 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88933) Time Spent: 1h 20m (was: 1h 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 1h 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88924=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88924 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 13:29 Start Date: 09/Apr/18 13:29 Worklog Time Spent: 10m Work Description: lukecwik commented on a change in pull request #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#discussion_r180090526 ## File path: build_rules.gradle ## @@ -478,65 +475,264 @@ ext.applyJavaNature = { } testCompile.extendsFrom shadowTest } - // Ensure that shaded classes are part of the artifact set. artifacts.archives shadowJar -if (configuration.artifactId) { - task sourcesJar(type: Jar) { -from sourceSets.main.allSource -classifier = 'sources' +// TODO: Figure out how to create ShadowJar task for ShadowTestJar here +// that is extendable within each sub-project with any additional includes. +// This could mirror the "shadowJar" configuration block. +// Optionally, we could also copy the shading configuration from the main +// source set and apply it here. +// +// Shading the test jar has a lot less need but can still be beneficial for +// resolving class conflicts for tests during test execution or exposing +// test libraries for users. + } + + task sourcesJar(type: Jar) { +from sourceSets.main.allSource +classifier = 'sources' + } + artifacts.archives sourcesJar + + task testSourcesJar(type: Jar) { +from sourceSets.test.allSource +classifier = 'test-sources' + } + artifacts.archives testSourcesJar + + task javadocJar(type: Jar, dependsOn: javadoc) { +classifier = 'javadoc' +from javadoc.destinationDir + } + artifacts.archives javadocJar + + if (isRelease() || project.hasProperty('publishing')) { +apply plugin: "maven-publish" + +// Only sign artifacts if we are performing a release +if (isRelease()) { + apply plugin: "signing" + signing { +useGpgCmd() +// Drop the unshaded jar because we don't want to publish it. +// Otherwise the unshaded one is the only one published since they +// both have no classifier and the names conflict. +def unshaded = configurations.archives.getArtifacts().matching({ + artifact -> artifact.classifier == "" }) +configurations.archives.getArtifacts().removeAll(unshaded) +sign configurations.archives } - task testSourcesJar(type: Jar) { -from sourceSets.test.allSource -classifier = 'test-sources' + + model { +tasks.generatePomFileForMavenJavaPublication { + destination = file("$buildDir/generated-pom.xml") +} +tasks.publishMavenJavaPublicationToMavenLocal { + dependsOn project.tasks.signArchives +} +tasks.publishMavenJavaPublicationToMavenRepository { + dependsOn project.tasks.signArchives +} } - task javadocJar(type: Jar, dependsOn: javadoc) { -classifier = 'javadoc' -from javadoc.destinationDir +} + +uploadArchives { + repositories { +mavenDeployer { + beforeDeployment { MavenDeployment deployment -> isRelease() && signing.signPom(deployment) } +} } +} - // If a publication artifact id is supplied, publish the shadow jar. - publishing { -publications { - mavenJava(MavenPublication) { -artifact(shadowJar) { - groupId "org.apache.beam" - artifactId configuration.artifactId - // Strip the "shaded" classifier. - classifier null - // Set readable name to project description. - pom.withXml { -asNode().appendNode('name', description) +publishing { + repositories { +maven { + url(project.properties['distMgmtSnapshotsUrl'] ?: isRelease() + ? 'https://repository.apache.org/service/local/staging/deploy/maven2' + : 'https://repository.apache.org/content/repositories/snapshots') + + // We attempt to find and load credentials from ~/.m2/settings.xml file that a user + // has configured with the Apache release and snapshot staging credentials. + // + // + // + // apache.releases.https + // USER_TOKEN + // PASS_TOKEN + // + // + // apache.snapshots.https + // USER_TOKEN + // PASS_TOKEN + // + // + // + def settingsXml = new File(System.getProperty('user.home'), '.m2/settings.xml') +
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88920=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88920 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 13:22 Start Date: 09/Apr/18 13:22 Worklog Time Spent: 10m Work Description: lukecwik commented on issue #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#issuecomment-379749729 Run Python PreCommit This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88920) Time Spent: 50m (was: 40m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 50m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88921=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88921 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 09/Apr/18 13:22 Start Date: 09/Apr/18 13:22 Worklog Time Spent: 10m Work Description: lukecwik commented on issue #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#issuecomment-379749790 Run Java PreCommit This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88921) Time Spent: 1h (was: 50m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 1h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88667=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88667 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 07/Apr/18 02:01 Start Date: 07/Apr/18 02:01 Worklog Time Spent: 10m Work Description: aaltay commented on issue #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#issuecomment-379424432 cc: @robertwb Robert any clue about the following error: ``` Traceback (most recent call last): File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap self.run() File "/usr/lib/python2.7/multiprocessing/process.py", line 114, in run self._target(*self._args, **self._kwargs) File "/home/jenkins/jenkins-slave/workspace/beam_PreCommit_Python_GradleBuild/src/sdks/python/gen_protos.py", line 148, in _install_grpcio_tools_and_generate_proto_files shutil.rmtree(build_path) File "/usr/lib/python2.7/shutil.py", line 239, in rmtree onerror(os.listdir, path, sys.exc_info()) File "/usr/lib/python2.7/shutil.py", line 237, in rmtree names = os.listdir(path) OSError: [Errno 2] No such file or directory: '/home/jenkins/jenkins-slave/workspace/beam_PreCommit_Python_GradleBuild/src/sdks/python/.eggs/grpcio-wheels-build' Traceback (most recent call last): File "setup.py", line 234, in 'test': generate_protos_first(test), File "/home/jenkins/jenkins-slave/workspace/beam_PreCommit_Python_GradleBuild/src/sdks/python/build/gradleenv/local/lib/python2.7/site-packages/setuptools/__init__.py", line 129, in setup return distutils.core.setup(**attrs) File "/usr/lib/python2.7/distutils/core.py", line 151, in setup dist.run_commands() File "/usr/lib/python2.7/distutils/dist.py", line 953, in run_commands self.run_command(cmd) File "/usr/lib/python2.7/distutils/dist.py", line 972, in run_command cmd_obj.run() File "setup.py", line 142, in run gen_protos.generate_proto_files() File "/home/jenkins/jenkins-slave/workspace/beam_PreCommit_Python_GradleBuild/src/sdks/python/gen_protos.py", line 96, in generate_proto_files raise ValueError("Proto generation failed (see log for details).") ValueError: Proto generation failed (see log for details). ``` This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88667) Time Spent: 40m (was: 0.5h) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 40m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88642=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88642 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Apr/18 23:28 Start Date: 06/Apr/18 23:28 Worklog Time Spent: 10m Work Description: swegner commented on issue #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#issuecomment-379410215 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88642) Time Spent: 0.5h (was: 20m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 0.5h > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88640=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88640 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Apr/18 23:18 Start Date: 06/Apr/18 23:18 Worklog Time Spent: 10m Work Description: swegner commented on issue #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048#issuecomment-379408687 retest this please This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88640) Time Spent: 20m (was: 10m) > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 20m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work logged] (BEAM-3255) Update release process to use Gradle
[ https://issues.apache.org/jira/browse/BEAM-3255?focusedWorklogId=88613=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-88613 ] ASF GitHub Bot logged work on BEAM-3255: Author: ASF GitHub Bot Created on: 06/Apr/18 21:07 Start Date: 06/Apr/18 21:07 Worklog Time Spent: 10m Work Description: swegner opened a new pull request #5048: [BEAM-3255] Updates to support the release process via Gradle URL: https://github.com/apache/beam/pull/5048 This merges many changes from our Gradle fixit week for publishing and validating releases from Gradle. Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/projects/BEAM/issues/) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand: - [ ] What the pull request does - [ ] Why it does it - [ ] How it does it - [ ] Why this approach - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Run `mvn clean verify` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking --- Worklog Id: (was: 88613) Time Spent: 10m Remaining Estimate: 0h > Update release process to use Gradle > > > Key: BEAM-3255 > URL: https://issues.apache.org/jira/browse/BEAM-3255 > Project: Beam > Issue Type: Sub-task > Components: build-system >Reporter: Luke Cwik >Assignee: Alan Myrvold >Priority: Major > Time Spent: 10m > Remaining Estimate: 0h > > This task is about configuring Gradle to generate pom's and artifacts > required to perform a release and update the nightly release snapshot Jenkins > jobs found here > https://github.com/apache/beam/blob/master/.test-infra/jenkins/job_beam_Release_NightlySnapshot.groovy > We will also require some integration tests to run against the released > nightly snapshot artifacts to ensure that what was built is valid. -- This message was sent by Atlassian JIRA (v7.6.3#76005)