Skip to content
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

Closed
wants to merge 1 commit into from

Conversation

eolivelli
Copy link
Contributor

  • 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
@eolivelli
Copy link
Contributor Author

@anmolnar @nkalmar I need a little help merging this patch.
Please cherry pick to branch-3.6 and release-3.6.0

I saw that the source release tarball still does not reflect perfectly the repository

in order to build the tarball the command is:
mvn clean install -DskipTests -Pfull-build -Papache-release

a shortcut is to add '-N' (non recursive) in order to build only the top level project
mvn clean install -DskipTests -Pfull-build -Papache-release -N

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.
btw This patch does not address this issue, and the package is built correctly only if you start with a clean git repository

@eolivelli
Copy link
Contributor Author

current master build is broken.
The patch applies cleanly to branch 3.6 without problem

@eolivelli
Copy link
Contributor Author

retest this please

@eolivelli
Copy link
Contributor Author

PR #1239 has been fixed, now this branch is good for merge.
Let's wait CI

Copy link
Contributor

@nkalmar nkalmar left a 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?

@eolivelli
Copy link
Contributor Author

eolivelli commented Jan 31, 2020

Maybe we can just do the change about disabling the remote resources plugin.
Nothing more

Did you have time to test this patch locally? This way we can save time and prevent -1s during the VOTE

@eolivelli eolivelli closed this in d3ce1fa Feb 1, 2020
eolivelli added a commit that referenced this pull request Feb 1, 2020
….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>
eolivelli added a commit that referenced this pull request Feb 1, 2020
….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>
junyoungKimGit pushed a commit to junyoungKimGit/zookeeper that referenced this pull request Feb 7, 2020
….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
stickyhipp pushed a commit to stickyhipp/zookeeper that referenced this pull request Aug 19, 2020
….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
RokLenarcic pushed a commit to RokLenarcic/zookeeper that referenced this pull request Aug 31, 2022
….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
RokLenarcic pushed a commit to RokLenarcic/zookeeper that referenced this pull request Sep 3, 2022
….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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants