You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@zookeeper.apache.org by nkalmar <gi...@git.apache.org> on 2018/07/17 10:15:50 UTC
[GitHub] zookeeper pull request #574: ZOOKEEPER-3030 - MAVEN MIGRATION - move contrib...
GitHub user nkalmar opened a pull request:
https://github.com/apache/zookeeper/pull/574
ZOOKEEPER-3030 - MAVEN MIGRATION - move contrib directories
Move the contrib projects according to new directory structure.
In the PR src/contrib/zkperl/build/check_zk_version.c and .h looks like I removed the file. but everything looks good on my local (I just moved them, did not modify anything). Will investigate further.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/nkalmar/zookeeper ZOOKEEPER-3030
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zookeeper/pull/574.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #574
----
commit b46f7bfa910c6d018e09ec2122ec8712571b2e67
Author: Norbert Kalmar <nk...@...>
Date: 2018-07-17T10:08:16Z
ZOOKEEPER-3030 - MAVEN MIGRATION - move contrib directories
----
---
[GitHub] zookeeper issue #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move con...
Posted by anmolnar <gi...@git.apache.org>.
Github user anmolnar commented on the issue:
https://github.com/apache/zookeeper/pull/574
Committed to branch-3.5 and master.
Thanks @nkalmar !
Please close this PR and create another one for 3.4
---
[GitHub] zookeeper pull request #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - m...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/zookeeper/pull/574
---
[GitHub] zookeeper pull request #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - m...
Posted by nkalmar <gi...@git.apache.org>.
Github user nkalmar closed the pull request at:
https://github.com/apache/zookeeper/pull/574
---
[GitHub] zookeeper pull request #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - m...
Posted by nkalmar <gi...@git.apache.org>.
GitHub user nkalmar reopened a pull request:
https://github.com/apache/zookeeper/pull/574
ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move contrib directories
Move the contrib projects according to new directory structure.
In the PR src/contrib/zkperl/build/check_zk_version.c and .h looks like I removed the file. but everything looks good on my local (I just moved them, did not modify anything). Will investigate further.
DO-NOT-MERGE-YET: Checking if creating the maven structure of directories now will break anything other then the already different directory structure in build/zookeeper-[version]/src/ (I will write an e-mail about this on dev list)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/nkalmar/zookeeper ZOOKEEPER-3030
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zookeeper/pull/574.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #574
----
commit 165d4dc5d02ad37f2cb20c13681fd22efaf42fbc
Author: Norbert Kalmar <nk...@...>
Date: 2018-07-17T10:08:16Z
ZOOKEEPER-3030 - MAVEN MIGRATION - move contrib directories
commit 59d9d17d9ddadd5bfe6e37b8c4458b6920aa32eb
Author: Norbert Kalmar <nk...@...>
Date: 2018-07-20T14:28:24Z
ZOOKEEPER-3030 add missing files in dist.dir
commit 9f19ab06a73a3c75bacbe141f7fa469c4f9e4e60
Author: Norbert Kalmar <nk...@...>
Date: 2018-07-20T15:38:40Z
ZOOKEEPER-3030 fix releaseaudit license missing exclusions
commit 49b7519bed90a3bc2f87cfe39f77f9e6bcb13f98
Author: Norbert Kalmar <nk...@...>
Date: 2018-07-23T13:36:17Z
ZOOKEEPER-3030 create maven dir structure
----
---
[GitHub] zookeeper issue #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move con...
Posted by anmolnar <gi...@git.apache.org>.
Github user anmolnar commented on the issue:
https://github.com/apache/zookeeper/pull/574
@nkalmar I think this is good to go as it.
Would you please trigger a build, because it looks hasn't been started for the last commit.
---
[GitHub] zookeeper issue #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move con...
Posted by nkalmar <gi...@git.apache.org>.
Github user nkalmar commented on the issue:
https://github.com/apache/zookeeper/pull/574
So... The problem was that by moving directories from src, ant did not copy them to build/zookeeper-[version]/src/ - now I don't know why it is required here, as it won't be in the jars. I made a script to dif all the filenames in build directory and to diff all the jars (with jar tf output), and the jars do not differ, but the files do.
For example, used to be: build/zookeeper-3.6.0-SNAPSHOT/src/recipes/lock/build.xml
now: build/zookeeper-3.6.0-SNAPSHOT/src/zookeeper-recipes/zookeeper-recipes-lock/build.xml
Again the jar's did not change as packages remained the same!
---
[GitHub] zookeeper issue #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move con...
Posted by nkalmar <gi...@git.apache.org>.
Github user nkalmar commented on the issue:
https://github.com/apache/zookeeper/pull/574
The problem with that is that it requires a lot of ant change and the final artifact could change. I agree @tamaashu , that was the plan.
I will try to do this with the contrib directory (this PR), and carefully check the end artifacts.
---
[GitHub] zookeeper issue #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move con...
Posted by nkalmar <gi...@git.apache.org>.
Github user nkalmar commented on the issue:
https://github.com/apache/zookeeper/pull/574
@anmolnar I did an amend commit, it doesn't seem to trigger the build. I also did a normal commit yesterday on my other PR, which also didn't trigger the build. Strange. Maybe I'll closing and re-opening the PR
---
[GitHub] zookeeper issue #574: ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move con...
Posted by nkalmar <gi...@git.apache.org>.
Github user nkalmar commented on the issue:
https://github.com/apache/zookeeper/pull/574
Found the problem, fixed it with a quick amend commit. The problem was in .gitignore we have build/ and that matched the new directory, and I had to explicitly add them.
---