You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2013/04/18 01:34:50 UTC
[1/3] git commit: BIGTOP-928. Hive can't be build against
non-published Hadoop artifacts
Updated Branches:
refs/heads/master 799387672 -> df1c345ae
BIGTOP-928. Hive can't be build against non-published Hadoop artifacts
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c3741c4f
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c3741c4f
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c3741c4f
Branch: refs/heads/master
Commit: c3741c4fa16221c6221a02f34fe91db885ca83d1
Parents: 7993876
Author: Konstantin Boudnik <co...@apache.org>
Authored: Tue Apr 16 18:27:12 2013 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Apr 16 18:27:49 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hive/do-component-build | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c3741c4f/bigtop-packages/src/common/hive/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/do-component-build b/bigtop-packages/src/common/hive/do-component-build
index 1f8e419..99d9088 100644
--- a/bigtop-packages/src/common/hive/do-component-build
+++ b/bigtop-packages/src/common/hive/do-component-build
@@ -38,6 +38,8 @@ hadoop.mapreduce.test.jar=\${hadoop.root}/share/hadoop/mapreduce/hadoop-mapreduc
hadoop.mapreduce.tools.jar=\${hadoop.root}/share/hadoop/mapreduce/hadoop-mapreduce-tools-\${hadoop.version.ant-internal}.jar
__EOT__
+sed -i.orig -e 's#<module organisation="org.apache.hadoop" name="hadoop-\*".*#<module organisation="org.apache.hadoop" name=".*" resolver="internal"/>#' src/ivy/ivysettings.xml
+
ant -f src/build.xml `bom2props | sed -e 's#^#-D#'` -Dhadoop.security.version.prefix=0.23 \
-Dversion=$HIVE_VERSION -Dinclude.postgres=true very-clean package "$@"
[2/3] git commit: BIGTOP-929. Pig component build needs to use
internal resolvers
Posted by co...@apache.org.
BIGTOP-929. Pig component build needs to use internal resolvers
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b60fbb4f
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b60fbb4f
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b60fbb4f
Branch: refs/heads/master
Commit: b60fbb4f601e294d2992f187b06748d44b121f7a
Parents: c3741c4
Author: Konstantin Boudnik <co...@apache.org>
Authored: Tue Apr 16 22:30:38 2013 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Apr 16 22:30:38 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/pig/do-component-build | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b60fbb4f/bigtop-packages/src/common/pig/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/pig/do-component-build b/bigtop-packages/src/common/pig/do-component-build
index f19d38f..1ee7a8c 100644
--- a/bigtop-packages/src/common/pig/do-component-build
+++ b/bigtop-packages/src/common/pig/do-component-build
@@ -39,6 +39,8 @@ BUILD_OPTS="-Djavac.version=1.6 -Dforrest.home=${FORREST_HOME} -Dversion=${PIG_V
export LC_ALL=en_US.UTF-8
rm test/org/apache/pig/test/TestHBaseStorage.java
+sed -i.orig -e 's#</modules>#<module organisation="org.apache.hadoop" name=".*" resolver="internal"/>\n</modules>#' ivy/ivysettings.xml
+
ant $BUILD_OPTS clean jar jar-withouthadoop pigunit-jar smoketests-jar "$@"
for build_file in contrib/piggybank/java/build.xml contrib/zebra/build.xml ; do
ant $BUILD_OPTS -buildfile $build_file clean jar "$@"
[3/3] git commit: Revert "BIGTOP-873. Hive needs Ivy cache cleared"
Posted by co...@apache.org.
Revert "BIGTOP-873. Hive needs Ivy cache cleared"
This reverts commit 6ef2d987f9cf56f846535e6d9400c82f0d47addf.
Conflicts:
bigtop-packages/src/common/hive/do-component-build
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/df1c345a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/df1c345a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/df1c345a
Branch: refs/heads/master
Commit: df1c345ae266a882836dda625619bd99cea2b136
Parents: b60fbb4
Author: Konstantin Boudnik <co...@apache.org>
Authored: Wed Apr 17 16:31:00 2013 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Wed Apr 17 16:31:00 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hive/do-component-build | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/df1c345a/bigtop-packages/src/common/hive/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/do-component-build b/bigtop-packages/src/common/hive/do-component-build
index 99d9088..3ce7f20 100644
--- a/bigtop-packages/src/common/hive/do-component-build
+++ b/bigtop-packages/src/common/hive/do-component-build
@@ -41,7 +41,7 @@ __EOT__
sed -i.orig -e 's#<module organisation="org.apache.hadoop" name="hadoop-\*".*#<module organisation="org.apache.hadoop" name=".*" resolver="internal"/>#' src/ivy/ivysettings.xml
ant -f src/build.xml `bom2props | sed -e 's#^#-D#'` -Dhadoop.security.version.prefix=0.23 \
- -Dversion=$HIVE_VERSION -Dinclude.postgres=true very-clean package "$@"
+ -Dversion=$HIVE_VERSION -Dinclude.postgres=true package "$@"
# Install Hive artifacts needed by other components into the local Maven cache
mvn install:install-file -DgroupId=org.apache.hive -DartifactId=hive-builtins -Dversion=$HIVE_VERSION -Dpackaging=jar -Dfile=src/build/builtins/hive-builtins-$HIVE_VERSION.jar