ZOOKEEPER-3030 - MAVEN MIGRATION - Step 1.3 - move contrib directories #574
Conversation
nkalmar
changed the title
|
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. |
nkalmar
force-pushed
the
ZOOKEEPER-3030
branch
4 times, most recently
from
966ff41
to
27776ac
Compare
|
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. |
|
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 Again the jar's did not change as packages remained the same! |
nkalmar
changed the title
nkalmar
force-pushed
the
ZOOKEEPER-3030
branch
2 times, most recently
from
a4b0c53
to
20362e8
Compare
nkalmar
changed the title
|
@nkalmar I think this is good to go as it. |
|
@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 |
nkalmar
force-pushed
the
ZOOKEEPER-3030
branch
2 times, most recently
from
0e62cfc
to
b433f35
Compare
nkalmar
force-pushed
the
ZOOKEEPER-3030
branch
2 times, most recently
from
b47379d
to
c6541cc
Compare
|
Committed to branch-3.5 and master. |
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) Author: Norbert Kalmar <nkalmar@yahoo.com> Reviewers: andor@apache.org Closes #574 from nkalmar/ZOOKEEPER-3030 and squashes the following commits: 49b7519 [Norbert Kalmar] ZOOKEEPER-3030 create maven dir structure 9f19ab0 [Norbert Kalmar] ZOOKEEPER-3030 fix releaseaudit license missing exclusions 59d9d17 [Norbert Kalmar] ZOOKEEPER-3030 add missing files in dist.dir 165d4dc [Norbert Kalmar] ZOOKEEPER-3030 - MAVEN MIGRATION - move contrib directories (cherry picked from commit b0df8fe) Signed-off-by: Andor Molnar <andor@apache.org>
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) Author: Norbert Kalmar <nkalmar@yahoo.com> Reviewers: andor@apache.org Closes apache#574 from nkalmar/ZOOKEEPER-3030 and squashes the following commits: 49b7519 [Norbert Kalmar] ZOOKEEPER-3030 create maven dir structure 9f19ab0 [Norbert Kalmar] ZOOKEEPER-3030 fix releaseaudit license missing exclusions 59d9d17 [Norbert Kalmar] ZOOKEEPER-3030 add missing files in dist.dir 165d4dc [Norbert Kalmar] 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. 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) Author: Norbert Kalmar <nkalmar@yahoo.com> Reviewers: andor@apache.org Closes apache#574 from nkalmar/ZOOKEEPER-3030 and squashes the following commits: 49b7519 [Norbert Kalmar] ZOOKEEPER-3030 create maven dir structure 9f19ab0 [Norbert Kalmar] ZOOKEEPER-3030 fix releaseaudit license missing exclusions 59d9d17 [Norbert Kalmar] ZOOKEEPER-3030 add missing files in dist.dir 165d4dc [Norbert Kalmar] 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.
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)