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/a73f187e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a73f187e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a73f187e

Branch: refs/heads/bigtop-alpha
Commit: a73f187e79e70f0756aed753ca9bcad2f0096b86
Parents: 7702076
Author: Olaf Flebbe <[email protected]>
Authored: Thu Dec 28 16:19:48 2017 +0100
Committer: Olaf Flebbe <[email protected]>
Committed: Thu Dec 28 16:19:48 2017 +0100

----------------------------------------------------------------------
 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 +------------
 4 files changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/a73f187e/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/a73f187e/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/a73f187e/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/a73f187e/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}"

Reply via email to