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 2012/01/04 19:24:33 UTC
svn commit: r1227253 - in /incubator/bigtop/branches/hadoop-0.23: ./
bigtop-packages/src/common/hadoop/ bigtop-packages/src/common/mahout/
bigtop-packages/src/common/oozie/ bigtop-packages/src/common/sqoop/
bigtop-packages/src/deb/hadoop/ bigtop-packag...
Author: rvs
Date: Wed Jan 4 18:24:33 2012
New Revision: 1227253
URL: http://svn.apache.org/viewvc?rev=1227253&view=rev
Log:
BIGTOP-332. it would be nice to bump hadoop version to 0.23.1-SNAPSHOT across the stack
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/hbase/pom.xml
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build Wed Jan 4 18:24:33 2012
@@ -35,6 +35,6 @@ pushd hadoop-mapreduce-project/hadoop-ya
popd
mvn site site:stage ${MAVEN_SKIP_TESTS} $@
-(cd build ; tar --strip-components=1 -xzvf ../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT.tar.gz)
-(cd build/src ; tar --strip-components=1 -xzvf ../../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT-src.tar.gz)
+(cd build ; tar --strip-components=1 -xzvf ../hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz)
+(cd build/src ; tar --strip-components=1 -xzvf ../../hadoop-dist/target/hadoop-${HADOOP_VERSION}-src.tar.gz)
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh Wed Jan 4 18:24:33 2012
@@ -131,7 +131,7 @@ HADOOP_SBIN_DIR=${HADOOP_DIR}/sbin
HADOOP_LIB_DIR=${HADOOP_DIR}/lib
HADOOP_NATIVE_LIB_DIR=${HADOOP_LIB_DIR}/native
-HADOOP_VERSION=0.23.0-SNAPSHOT
+HADOOP_VERSION=0.23.1-SNAPSHOT
##Needed for some distros to find ldconfig
export PATH="/sbin/:$PATH"
@@ -167,8 +167,6 @@ done
install -d -m 0755 ${SYSTEM_LIBEXEC_DIR}
rm -fv ${BUILD_DIR}/libexec/jsvc
mv ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
-mv ${BUILD_DIR}/bin/*-config.sh ${SYSTEM_LIBEXEC_DIR}/
-
# bin
install -d -m 0755 ${HADOOP_BIN_DIR}
@@ -180,7 +178,7 @@ cp ${BUILD_DIR}/sbin/* ${HADOOP_SBIN_DIR
# jars
install -d -m 0755 ${HADOOP_LIB_DIR}
-cp ${BUILD_DIR}/lib/*.jar ${HADOOP_LIB_DIR}/
+cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${HADOOP_LIB_DIR}/
cp ${BUILD_DIR}/share/hadoop/common/lib/*.jar ${HADOOP_LIB_DIR}/
cp ${BUILD_DIR}/share/hadoop/hdfs/lib/*.jar ${HADOOP_LIB_DIR}/
chmod 644 ${HADOOP_LIB_DIR}/*.jar
@@ -192,7 +190,7 @@ rm -fv ${HADOOP_LIB_DIR}/netty-3.2.3.Fin
# hadoop jar
install -d -m 0755 ${HADOOP_DIR}
-cp ${BUILD_DIR}/modules/*.jar ${HADOOP_DIR}/
+cp ${BUILD_DIR}/share/hadoop/mapreduce/*.jar ${HADOOP_DIR}/
cp ${BUILD_DIR}/share/hadoop/common/*.jar ${HADOOP_DIR}/
cp ${BUILD_DIR}/share/hadoop/hdfs/*.jar ${HADOOP_DIR}/
mv ${HADOOP_LIB_DIR}/hadoop*.jar ${HADOOP_DIR}/
@@ -202,16 +200,17 @@ chmod 644 ${HADOOP_DIR}/*.jar
install -d -m 0755 ${SYSTEM_LIB_DIR}
install -d -m 0755 ${HADOOP_NATIVE_LIB_DIR}
for library in libhdfs.so.0.0.0; do
- cp ${BUILD_DIR}/lib/${library} ${SYSTEM_LIB_DIR}/
+ cp ${BUILD_DIR}/lib/native/${library} ${SYSTEM_LIB_DIR}/
ldconfig -vlN ${SYSTEM_LIB_DIR}/${library}
ln -s ${library} ${SYSTEM_LIB_DIR}/${library/.so.*/}.so
done
+
install -d -m 0755 ${SYSTEM_INCLUDE_DIR}
-cp ${BUILD_DIR}/../hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h ${SYSTEM_INCLUDE_DIR}/
+cp ${BUILD_DIR}/include/hdfs.h ${SYSTEM_INCLUDE_DIR}/
-cp ${BUILD_DIR}/lib/*.a ${HADOOP_NATIVE_LIB_DIR}/
+cp ${BUILD_DIR}/lib/native/*.a ${HADOOP_NATIVE_LIB_DIR}/
for library in `cd ${BUILD_DIR}/lib ; ls libsnappy.so.1.* 2>/dev/null` libhadoop.so.1.0.0; do
- cp ${BUILD_DIR}/lib/${library} ${HADOOP_NATIVE_LIB_DIR}/
+ cp ${BUILD_DIR}/lib/native/${library} ${HADOOP_NATIVE_LIB_DIR}/
ldconfig -vlN ${HADOOP_NATIVE_LIB_DIR}/${library}
ln -s ${library} ${HADOOP_NATIVE_LIB_DIR}/${library/.so.*/}.so
done
@@ -219,19 +218,12 @@ done
# conf
install -d -m 0755 $HADOOP_ETC_DIR/conf.empty
-cp ${BUILD_DIR}/conf/* $HADOOP_ETC_DIR/conf.empty
cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/conf.empty
# docs
install -d -m 0755 ${DOC_DIR}
-pushd ${BUILD_DIR}/../
- cp hadoop-common-project/hadoop-common/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-common
- cp hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-hdfs
- mkdir target/staging/hadoop-project/hadoop-project-dist/hadoop-mapreduce
- cp hadoop-mapreduce-project/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-mapreduce
-popd
-cp -r ${BUILD_DIR}/../target/staging/hadoop-project/* ${DOC_DIR}/
+cp -r ${BUILD_DIR}/share/doc/* ${DOC_DIR}/
# man pages
mkdir -p $MAN_DIR/man1
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build Wed Jan 4 18:24:33 2012
@@ -16,7 +16,7 @@
set -ex
-mvn clean install -Dmahout.skip.distribution=false -DskipTests -Dhadoop.version=0.23.0-SNAPSHOT "$@"
+mvn clean install -Dmahout.skip.distribution=false -DskipTests -Dhadoop.version=0.23.1-SNAPSHOT "$@"
mkdir build
for i in distribution/target/mahout*.tar.gz ; do
tar -C build --strip-components=1 -xzf $i
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/do-component-build Wed Jan 4 18:24:33 2012
@@ -84,7 +84,7 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ];
fi
# Invoke Oozie build script with CDH options
-${WORKDIR}/bin/mkdistro.sh -Pmr2 -Dhadoop.version=0.23.0-SNAPSHOT -DskipTests -Dnot.cdh.release.build=false ${EXTRA_GOALS} "$@"
+${WORKDIR}/bin/mkdistro.sh -Pmr2 -Dhadoop.version=0.23.1-SNAPSHOT -DskipTests -Dnot.cdh.release.build=false ${EXTRA_GOALS} "$@"
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/patch?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/patch (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/patch Wed Jan 4 18:24:33 2012
@@ -551,7 +551,7 @@ Index: pom.xml
+ </property>
+ </activation>
+ <properties>
-+ <hadoop.version>0.23.0</hadoop.version>
++ <hadoop.version>0.23.1</hadoop.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/patch?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/patch (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/patch Wed Jan 4 18:24:33 2012
@@ -63,7 +63,7 @@ Index: ivy/libraries.properties
-# Cloudera Distribution dependency version
-hadoop-core.cloudera.version=0.20.2-cdh3u1
-+hadoop.version=0.23.0-SNAPSHOT
++hadoop.version=0.23.1-SNAPSHOT
hbase.version=0.90.3-cdh3u1
zookeeper.version=3.3.3-cdh3u1
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules Wed Jan 4 18:24:33 2012
@@ -24,8 +24,8 @@
export DH_OPTIONS
-hadoop_version=${HADOOP_VERSION}
-hadoop_build_path=$(shell pwd)/build
+hadoop_version=${HADOOP_BASE_VERSION}
+hadoop_build_path=$(shell pwd)/hadoop-dist/target/hadoop-${hadoop_version}
ifeq (${DEB_BUILD_ARCH},amd64)
native_dir=Linux-amd64-64
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Wed Jan 4 18:24:33 2012
@@ -257,7 +257,7 @@ AutoReq: no
Hadoop Filesystem Library
%prep
-%setup -n apache-hadoop-common-61572bb
+%setup -n apache-hadoop-common-915892c
%patch0 -p0
%build
@@ -265,7 +265,7 @@ Hadoop Filesystem Library
# This assumes that you installed Java JDK 5 and set JAVA5_HOME
# This assumes that you installed Forrest and set FORREST_HOME
-env HADOOP_VERSION=%{hadoop_version} HADOOP_ARCH=%{hadoop_arch} bash %{SOURCE1}
+env HADOOP_VERSION=%{hadoop_base_version} HADOOP_ARCH=%{hadoop_arch} bash %{SOURCE1}
%clean
%__rm -rf $RPM_BUILD_ROOT
@@ -280,7 +280,7 @@ env HADOOP_VERSION=%{hadoop_version} HAD
bash %{SOURCE2} \
--distro-dir=$RPM_SOURCE_DIR \
- --build-dir=$PWD/build \
+ --build-dir=$PWD/hadoop-dist/target/hadoop-%{hadoop_base_version} \
--system-include-dir=$RPM_BUILD_ROOT%{_includedir} \
--system-lib-dir=$RPM_BUILD_ROOT%{_libdir} \
--system-libexec-dir=$RPM_BUILD_ROOT%{libexecdir} \
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/hbase/pom.xml?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/hbase/pom.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-tests/test-artifacts/hbase/pom.xml Wed Jan 4 18:24:33 2012
@@ -34,12 +34,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>0.23.0-SNAPSHOT</version>
+ <version>0.23.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>0.23.0-SNAPSHOT</version>
+ <version>0.23.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1227253&r1=1227252&r2=1227253&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Wed Jan 4 18:24:33 2012
@@ -18,13 +18,13 @@ BIGTOP_VERSION=0.3.0-hadoop23-incubating
# Hadoop 0.20.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=0.23.0
-HADOOP_PKG_VERSION=0.23.0
+HADOOP_BASE_VERSION=0.23.1-SNAPSHOT
+HADOOP_PKG_VERSION=0.23.1
HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
-HADOOP_TARBALL_SRC=61572bb
+HADOOP_TARBALL_SRC=915892c
HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
$(eval $(call PACKAGE,hadoop,HADOOP))