Repository: bigtop Updated Branches: refs/heads/bigtop-alpha 4fca22ead -> cee130153 (forced update)
hadoop-3.0.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/cee13015 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/cee13015 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/cee13015 Branch: refs/heads/bigtop-alpha Commit: cee130153040aa055e6a9f999afb80a5ebbf31ea Parents: 9495355 Author: Olaf Flebbe <[email protected]> Authored: Thu Dec 28 16:19:48 2017 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Thu Dec 28 16:47:14 2017 +0100 ---------------------------------------------------------------------- bigtop-packages/src/common/hadoop/do-component-build | 2 +- .../common/hadoop/patch0-HADOOP-15122-trunk.002.diff | 13 +++++++++++++ bigtop-packages/src/deb/hadoop/control | 2 +- bigtop-packages/src/deb/hadoop/rules | 4 ---- bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 7 +------ bigtop.bom | 13 +------------ 6 files changed, 17 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/cee13015/bigtop-packages/src/common/hadoop/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/do-component-build b/bigtop-packages/src/common/hadoop/do-component-build index bf34274..b28c53f 100644 --- a/bigtop-packages/src/common/hadoop/do-component-build +++ b/bigtop-packages/src/common/hadoop/do-component-build @@ -55,7 +55,7 @@ mkdir build/src # Build artifacts MAVEN_OPTS="-DskipTests -DskipTest -DskipITs" -mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar ${MAVEN_OPTS}" install package "$@" +mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar ${MAVEN_OPTS} install package "$@" mvn site site:stage ${MAVEN_OPTS} $@ (cd build ; tar --strip-components=1 -xzvf ../hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz) http://git-wip-us.apache.org/repos/asf/bigtop/blob/cee13015/bigtop-packages/src/common/hadoop/patch0-HADOOP-15122-trunk.002.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/patch0-HADOOP-15122-trunk.002.diff b/bigtop-packages/src/common/hadoop/patch0-HADOOP-15122-trunk.002.diff new file mode 100644 index 0000000..73b153f --- /dev/null +++ b/bigtop-packages/src/common/hadoop/patch0-HADOOP-15122-trunk.002.diff @@ -0,0 +1,13 @@ +diff --git a/pom.xml b/pom.xml +index f0b3c8e3ccc..d7766783978 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -187,7 +187,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-markdown</artifactId> +- <version>1.8-SNAPSHOT</version> ++ <version>1.8</version> + </dependency> + </dependencies> + </plugin> http://git-wip-us.apache.org/repos/asf/bigtop/blob/cee13015/bigtop-packages/src/deb/hadoop/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/control b/bigtop-packages/src/deb/hadoop/control index 9ca5870..c30ae76 100644 --- a/bigtop-packages/src/deb/hadoop/control +++ b/bigtop-packages/src/deb/hadoop/control @@ -23,7 +23,7 @@ Homepage: http://hadoop.apache.org/core/ Package: hadoop Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils (>= 0.7), zookeeper (>= 3.4.0), psmisc, netcat-openbsd +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils (>= 0.7), psmisc, netcat-openbsd Description: Hadoop is a software platform for processing vast amounts of data Hadoop is a software platform that lets one easily write and run applications that process vast amounts of data. http://git-wip-us.apache.org/repos/asf/bigtop/blob/cee13015/bigtop-packages/src/deb/hadoop/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/rules b/bigtop-packages/src/deb/hadoop/rules index 58d4edc..b0f2167 100755 --- a/bigtop-packages/src/deb/hadoop/rules +++ b/bigtop-packages/src/deb/hadoop/rules @@ -67,10 +67,6 @@ override_dh_auto_install: --example-dir=debian/tmp/usr/share/doc/hadoop/examples \ --native-build-string=${native_dir} \ --installed-lib-dir=/usr/lib/hadoop - # Forcing Zookeeper dependency to be on the packaged jar - ln -sf /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hadoop/lib/zookeeper*.jar - # Workaround for BIGTOP-583 - rm -f debian/tmp/usr/lib/hadoop-*/lib/slf4j-log4j12-*.jar # FIXME: BIGTOP-463 mkdir -p debian/tmp/etc/default echo 'export JSVC_HOME=/usr/lib/bigtop-utils' >> debian/hadoop.default http://git-wip-us.apache.org/repos/asf/bigtop/blob/cee13015/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec index 5431570..15c8409 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -172,7 +172,7 @@ Source29: hadoop-yarn-timelineserver.svc #BIGTOP_PATCH_FILES Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n) BuildRequires: fuse-devel, fuse, cmake -Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils >= 0.7, zookeeper >= 3.4.0 +Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils >= 0.7 Requires: psmisc, %{netcat_package} # Sadly, Sun/Oracle JDK in RPM form doesn't provide libjvm.so, which means we have # to set AutoReq to no in order to minimize confusion. Not ideal, but seems to work. @@ -495,11 +495,6 @@ env HADOOP_VERSION=%{hadoop_base_version} bash %{SOURCE2} \ --installed-lib-dir=%{lib_hadoop} \ --man-dir=$RPM_BUILD_ROOT%{man_hadoop} \ -# Forcing Zookeeper dependency to be on the packaged jar -%__ln_s -f /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hadoop}/lib/zookeeper*.jar -# Workaround for BIGTOP-583 -%__rm -f $RPM_BUILD_ROOT/%{lib_hadoop}-*/lib/slf4j-log4j12-*.jar - # Init.d scripts %__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/cee13015/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 82132a7..57270c3 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -109,17 +109,6 @@ bigtop { To build a component with its dependencies, run build with -Dbuildwithdeps=true */ dependencies = [ - zookeeper:['hadoop', 'hbase'], - hadoop:['ignite-hadoop', 'hbase', 'crunch', 'pig', 'hive', 'tez', 'sqoop', 'sqoop2', - 'oozie', 'mahout', 'flume', 'giraph', 'solr', 'spark','spark1', - 'phoenix', 'alluxio', 'kafka', 'ycsb', 'hama', 'zeppelin', - 'tajo', 'apex' - ], - hbase:['phoenix','giraph','ycsb','hive'], - pig:['datafu', 'oozie'], - hive:['oozie', 'pig','zeppelin'], - 'ignite-hadoop':['zeppelin'], - spark:['zeppelin'] ] components { @@ -144,7 +133,7 @@ bigtop { 'hadoop' { name = 'hadoop' relNotes = 'Apache Hadoop' - version { base = '2.8.1'; pkg = base; release = 1 } + version { base = '3.0.0'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}.tar.gz" source = "${name}-${version.base}-src.tar.gz" } url { download_path = "/$name/common/$name-${version.base}"
