Repository: bigtop Updated Branches: refs/heads/master 84fc89857 -> c82359bb3
BIGTOP-1840: Add local resolver to datafu's ivy resolver chain When building datafu there is a sed replacement done to make sure that datafu pulls in the same version of pig that is in the BOM. However, the ivysettings for datafu do not actually resolve to the local repository so datafu does not pick up the locally built pick for the Bigtop. datafu instead grabs pig from the central repository. This is especially problematic when dealing with a custom version of Pig as it cannot be resolved. Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c82359bb Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c82359bb Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c82359bb Branch: refs/heads/master Commit: c82359bb3418a96dc8dc18f5d2d45c8d37a80283 Parents: 84fc898 Author: Rob Leidle <[email protected]> Authored: Tue Apr 21 10:12:11 2015 -0700 Committer: Konstantin Boudnik <[email protected]> Committed: Tue Apr 21 17:01:36 2015 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/datafu/do-component-build | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/c82359bb/bigtop-packages/src/common/datafu/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/datafu/do-component-build b/bigtop-packages/src/common/datafu/do-component-build index a680be8..7bb08a1 100644 --- a/bigtop-packages/src/common/datafu/do-component-build +++ b/bigtop-packages/src/common/datafu/do-component-build @@ -19,6 +19,8 @@ set -ex . `dirname $0`/bigtop.bom sed -i -e '/<dependency org="org.apache.pig"/s# rev=[^ >][^ >]*# rev="'$PIG_VERSION'"#' ivy.xml +sed -i -e 's/\(<settings defaultResolver="ivyrep"\/>\)/\1\n<property name="m2-pattern" value="${user.home}\/.m2\/repository\/[organisation]\/[module]\/[revision]\/[module]-[revision](-[classifier]).[ext]" override="false"\/>/' ivysettings.xml +sed -i -e 's/\(^ *<ibiblio\)/ <filesystem name="local-maven2" m2compatible="true">\n <artifact pattern="${m2-pattern}"\/>\n <ivy pattern="${m2-pattern}"\/>\n <\/filesystem>\n\1/' ivysettings.xml ant jar -Dversion=$DATAFU_VERSION "$@"
