-
Notifications
You must be signed in to change notification settings - Fork 7.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ZOOKEEPER-3695: Source release tarball does not match repository in 3.6.0 - part2 #1238
Conversation
eolivelli
commented
Jan 30, 2020
- upgrade to Apache Parent 23
- disable maven remote plugin
- move source assembly execution before sources generation
- move git properties resolution to the correct phase
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase
@anmolnar @nkalmar I need a little help merging this patch. I saw that the source release tarball still does not reflect perfectly the repository in order to build the tarball the command is: a shortcut is to add '-N' (non recursive) in order to build only the top level project remember to issue a "git clean -xfd" in order to have a clean git repository I feel that zookeeper-server/src/main/resources/git.properties is in the wrong place, it is a generated resource and it should stay in zookeeper-server/target/generated-resources/git.properties or something like that. |
current master build is broken. |
retest this please |
PR #1239 has been fixed, now this branch is good for merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. None of the differences fixed with this and last part of the PR concerns 3.5 branch?
Maybe we can just do the change about disabling the remote resources plugin. Did you have time to test this patch locally? This way we can save time and prevent -1s during the VOTE |
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: Norbert Kalmar <nkalmar@apache.org> Closes #1238 from eolivelli/fix/ZOOKEEPER-3695-part2 (cherry picked from commit d3ce1fa) Signed-off-by: Enrico Olivelli <eolivelli@apache.org>
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: Norbert Kalmar <nkalmar@apache.org> Closes #1238 from eolivelli/fix/ZOOKEEPER-3695-part2 (cherry picked from commit d3ce1fa) Signed-off-by: Enrico Olivelli <eolivelli@apache.org>
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: Norbert Kalmar <nkalmar@apache.org> Closes apache#1238 from eolivelli/fix/ZOOKEEPER-3695-part2
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: Norbert Kalmar <nkalmar@apache.org> Closes apache#1238 from eolivelli/fix/ZOOKEEPER-3695-part2
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: Norbert Kalmar <nkalmar@apache.org> Closes apache#1238 from eolivelli/fix/ZOOKEEPER-3695-part2
….6.0 - part2 - upgrade to Apache Parent 23 - disable maven remote plugin - move source assembly execution before sources generation - move git properties resolution to the correct phase Author: Enrico Olivelli <eolivelli@apache.org> Reviewers: Norbert Kalmar <nkalmar@apache.org> Closes apache#1238 from eolivelli/fix/ZOOKEEPER-3695-part2