You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/09/06 04:17:32 UTC
[1/2] git commit: BIGTOP-1429. Apache build of Bigtop test artifacts
fails to find correct Hbase jars
Repository: bigtop
Updated Branches:
refs/heads/master 848433ade -> 731bb4409
BIGTOP-1429. Apache build of Bigtop test artifacts fails to find correct Hbase jars
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/731bb440
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/731bb440
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/731bb440
Branch: refs/heads/master
Commit: 731bb44099f5b663aad665ef4d6d0008cf775b8b
Parents: 0a02b1a
Author: Konstantin Boudnik <co...@wandisco.com>
Authored: Thu Sep 4 22:58:13 2014 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Fri Sep 5 19:17:28 2014 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hbase/do-component-build | 7 +++++--
pom.xml | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/731bb440/bigtop-packages/src/common/hbase/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index a8f7d07..e12b656 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -18,14 +18,17 @@ set -ex
. `dirname $0`/bigtop.bom
+#An awful hack for BIGTOP-1429 to satisfy ASF CI build deps. resolution
+bash -x ./dev-support/generate-hadoopX-poms.sh $HBASE_VERSION $HBASE_VERSION-hadoop2
+
mvn -DskipTests -Dslf4j.version=1.6.1 \
-Dhadoop-two.version=$HADOOP_VERSION \
-Dzookeeper.version=$ZOOKEEPER_VERSION \
- clean install "$@" && \
+ clean install -f pom.xml.hadoop2 "$@" && \
mvn -DskipTests -Dslf4j.version=1.6.1 \
-Dhadoop-two.version=$HADOOP_VERSION \
-Dzookeeper.version=$ZOOKEEPER_VERSION \
- install site assembly:single "$@"
+ install site assembly:single -f pom.xml.hadoop2 "$@"
rm -rf build
mkdir build
tar -C build --strip-components=1 -xzf hbase-assembly/target/hbase*.tar.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/731bb440/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fcc7f47..9cf2cf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,8 @@
<properties>
<hadoop.version>2.3.0</hadoop.version>
- <hbase.version>0.98.2</hbase.version>
+ <!--An awful hack for BIGTOP-1429-->
+ <hbase.version>0.98.2-hadoop2</hbase.version>
<pig.version>0.12.1</pig.version>
<pig-smoke.version>0.12.1</pig-smoke.version>
<sqoop.version>1.99.2</sqoop.version>
[2/2] git commit: BIGTOP-1426. Bump version of Hadoop to 2.4.1
Posted by rv...@apache.org.
BIGTOP-1426. Bump version of Hadoop to 2.4.1
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0a02b1a5
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0a02b1a5
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0a02b1a5
Branch: refs/heads/master
Commit: 0a02b1a5cf17d7b416a85f0693c49a0cd37582b7
Parents: 848433a
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Fri Sep 5 12:48:50 2014 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Fri Sep 5 19:17:28 2014 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/oozie/do-component-build | 2 +-
bigtop.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a02b1a5/bigtop-packages/src/common/oozie/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index 0af95ac..2ecd660 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -78,7 +78,7 @@ fi
## Update hardcoded version of the Hadoop base to the current HADOOP VERSION
## This approach might need to be reconsidered once OOZIE-1201 is fixed
-OLD_VERSION="2.0.2-alpha"
+OLD_VERSION="2.3.0"
echo "Replacing old target Hadoop version ${OLD_VERSION} with ${HADOOP_VERSION}"
POM_FILES="${WORKDIR}/hadooplibs/hadoop-2/pom.xml ${WORKDIR}/hadooplibs/hadoop-distcp-2/pom.xml ${WORKDIR}/hadooplibs/hadoop-test-2/pom.xml ${WORKDIR}/pom.xml"
for pom in $POM_FILES; do
http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a02b1a5/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 4a01f03..73befb5 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -24,8 +24,8 @@ $(eval BIGTOP_BOM += JDK_VERSION=$(JDK_VERSION))
# Hadoop 0.20.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=2.4.0
-HADOOP_PKG_VERSION=2.4.0
+HADOOP_BASE_VERSION=2.4.1
+HADOOP_PKG_VERSION=2.4.1
HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz