Repository: bigtop
Updated Branches:
  refs/heads/bigtop-alpha ca403ed77 -> 2ba34084d (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/2ba34084
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2ba34084
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2ba34084

Branch: refs/heads/bigtop-alpha
Commit: 2ba34084dde5f88319e748ca35e23c9444118a2f
Parents: 9495355
Author: Olaf Flebbe <[email protected]>
Authored: Thu Dec 28 16:19:48 2017 +0100
Committer: Olaf Flebbe <[email protected]>
Committed: Fri Dec 29 14:14:47 2017 +0100

----------------------------------------------------------------------
 .../src/common/hadoop/do-component-build        |  4 +--
 .../src/common/hadoop/install_hadoop.sh         | 36 +++++++++-----------
 .../hadoop/patch0-HADOOP-15122-trunk.002.diff   | 13 +++++++
 bigtop-packages/src/deb/hadoop/control          |  4 +--
 .../src/deb/hadoop/hadoop-httpfs.install        |  1 -
 .../src/deb/hadoop/hadoop-mapreduce.install     |  1 -
 bigtop-packages/src/deb/hadoop/hadoop.install   |  2 --
 bigtop-packages/src/deb/hadoop/rules            |  4 ---
 .../src/rpm/hadoop/SPECS/hadoop.spec            | 17 ++++-----
 bigtop.bom                                      | 13 +------
 10 files changed, 41 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/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..156d16c 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)
@@ -66,7 +66,7 @@ mkdir -p build/share
 cp -r target/staging/hadoop-project build/share/doc
 
 # Create a manifest for hadoop client package
-(cd hadoop-client/target/hadoop-client-*/share/hadoop/client/lib ; ls) > 
build/hadoop-client.list
+(cd 
hadoop-client-modules/hadoop-client/target/hadoop-client-*/share/hadoop/client/lib
 ; ls) > build/hadoop-client.list
 
 # Copy fuse output to the build directory
 cp 
hadoop-hdfs-project/hadoop-hdfs-native-client/target/main/native/fuse-dfs/fuse_dfs
 build/bin

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/bigtop-packages/src/common/hadoop/install_hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh 
b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index f8aef9b..40d92d1 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -181,7 +181,7 @@ done
 
 #libexec
 install -d -m 0755 ${SYSTEM_LIBEXEC_DIR}
-cp ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
+cp -r ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
 cp ${DISTRO_DIR}/hadoop-layout.sh ${SYSTEM_LIBEXEC_DIR}/
 install -m 0755 ${DISTRO_DIR}/init-hdfs.sh ${SYSTEM_LIBEXEC_DIR}/
 install -m 0755 ${DISTRO_DIR}/init-hcfs.json ${SYSTEM_LIBEXEC_DIR}/
@@ -192,7 +192,7 @@ rm -rf ${SYSTEM_LIBEXEC_DIR}/*.cmd
 install -d -m 0755 ${HADOOP_DIR}
 cp ${BUILD_DIR}/share/hadoop/common/*.jar ${HADOOP_DIR}/
 cp ${BUILD_DIR}/share/hadoop/common/lib/hadoop-auth*.jar ${HADOOP_DIR}/
-cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/hadoop-annotations*.jar 
${HADOOP_DIR}/
+cp ${BUILD_DIR}/share/hadoop/common/lib/hadoop-annotations*.jar ${HADOOP_DIR}/
 install -d -m 0755 ${MAPREDUCE_DIR}
 cp ${BUILD_DIR}/share/hadoop/mapreduce/hadoop-mapreduce*.jar ${MAPREDUCE_DIR}
 cp ${BUILD_DIR}/share/hadoop/tools/lib/*.jar ${MAPREDUCE_DIR}
@@ -205,20 +205,18 @@ chmod 644 ${HADOOP_DIR}/*.jar ${MAPREDUCE_DIR}/*.jar 
${HDFS_DIR}/*.jar ${YARN_DI
 # lib jars
 install -d -m 0755 ${HADOOP_DIR}/lib
 cp ${BUILD_DIR}/share/hadoop/common/lib/*.jar ${HADOOP_DIR}/lib
-install -d -m 0755 ${MAPREDUCE_DIR}/lib
-cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${MAPREDUCE_DIR}/lib
 install -d -m 0755 ${HDFS_DIR}/lib 
 cp ${BUILD_DIR}/share/hadoop/hdfs/lib/*.jar ${HDFS_DIR}/lib
 install -d -m 0755 ${YARN_DIR}/lib
 cp ${BUILD_DIR}/share/hadoop/yarn/lib/*.jar ${YARN_DIR}/lib
-chmod 644 ${HADOOP_DIR}/lib/*.jar ${MAPREDUCE_DIR}/lib/*.jar 
${HDFS_DIR}/lib/*.jar ${YARN_DIR}/lib/*.jar
+chmod 644 ${HADOOP_DIR}/lib/*.jar ${HDFS_DIR}/lib/*.jar ${YARN_DIR}/lib/*.jar
 
 # Install webapps
 cp -ra ${BUILD_DIR}/share/hadoop/hdfs/webapps ${HDFS_DIR}/
 
 # bin
 install -d -m 0755 ${HADOOP_DIR}/bin
-cp -a ${BUILD_DIR}/bin/{hadoop,rcc,fuse_dfs} ${HADOOP_DIR}/bin
+cp -a ${BUILD_DIR}/bin/{hadoop,fuse_dfs} ${HADOOP_DIR}/bin
 install -d -m 0755 ${HDFS_DIR}/bin
 cp -a ${BUILD_DIR}/bin/hdfs ${HDFS_DIR}/bin
 install -d -m 0755 ${YARN_DIR}/bin
@@ -230,7 +228,7 @@ cp -a ${BUILD_DIR}/bin/mapred ${YARN_DIR}/bin
 
 # sbin
 install -d -m 0755 ${HADOOP_DIR}/sbin
-cp -a ${BUILD_DIR}/sbin/{hadoop-daemon,hadoop-daemons,slaves}.sh 
${HADOOP_DIR}/sbin
+cp -a ${BUILD_DIR}/sbin/{hadoop-daemon,hadoop-daemons}.sh ${HADOOP_DIR}/sbin
 install -d -m 0755 ${HDFS_DIR}/sbin
 cp -a ${BUILD_DIR}/sbin/{distribute-exclude,refresh-namenodes}.sh 
${HDFS_DIR}/sbin
 install -d -m 0755 ${YARN_DIR}/sbin
@@ -244,7 +242,7 @@ install -d -m 0755 ${HADOOP_NATIVE_LIB_DIR}
 for library in libhdfs.so.0.0.0; do
   cp ${BUILD_DIR}/lib/native/${library} ${SYSTEM_LIB_DIR}/
   ldconfig -vlN ${SYSTEM_LIB_DIR}/${library}
-  ln -s ${library} ${SYSTEM_LIB_DIR}/${library/.so.*/}.so
+  ln -sf ${library} ${SYSTEM_LIB_DIR}/${library/.so.*/}.so
 done
 
 install -d -m 0755 ${SYSTEM_INCLUDE_DIR}
@@ -254,7 +252,7 @@ cp ${BUILD_DIR}/lib/native/*.a ${HADOOP_NATIVE_LIB_DIR}/
 for library in `cd ${BUILD_DIR}/lib/native ; ls libsnappy.so.1.* 2>/dev/null` 
libhadoop.so.1.0.0; do
   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
+  ln -sf ${library} ${HADOOP_NATIVE_LIB_DIR}/${library/.so.*/}.so
 done
 
 # Install fuse wrapper
@@ -304,7 +302,7 @@ cp ${DISTRO_DIR}/conf.empty/mapred-site.xml 
$HADOOP_ETC_DIR/conf.empty
 # so that it can still be used as example, but doesn't affect anything
 # by default
 sed -i -e '/^[^#]/s,^,#,' ${BUILD_DIR}/etc/hadoop/hadoop-env.sh
-cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
+cp -r ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
 rm -rf $HADOOP_ETC_DIR/conf.empty/*.cmd
 
 # docs
@@ -321,7 +319,7 @@ done
 # HTTPFS
 install -d -m 0755 ${HTTPFS_DIR}/sbin
 cp ${BUILD_DIR}/sbin/httpfs.sh ${HTTPFS_DIR}/sbin/
-cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/webapps ${HTTPFS_DIR}/webapps
+#???cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/webapps ${HTTPFS_DIR}/webapps
 install -d -m 0755 ${PREFIX}/var/lib/hadoop-httpfs
 install -d -m 0755 $HTTPFS_ETC_DIR/conf.empty
 
@@ -331,14 +329,14 @@ HTTP_DIRECTORY=$HTTPFS_ETC_DIR/tomcat-conf.dist
 HTTPS_DIRECTORY=$HTTPFS_ETC_DIR/tomcat-conf.https
 
 install -d -m 0755 ${HTTP_DIRECTORY}
-cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/conf ${HTTP_DIRECTORY}
-chmod 644 ${HTTP_DIRECTORY}/conf/*
+#??cp -r ${BUILD_DIR}/share/hadoop/httpfs/tomcat/conf ${HTTP_DIRECTORY}
+#?? chmod 644 ${HTTP_DIRECTORY}/conf/*
 install -d -m 0755 ${HTTP_DIRECTORY}/WEB-INF
-mv ${HTTPFS_DIR}/webapps/webhdfs/WEB-INF/*.xml ${HTTP_DIRECTORY}/WEB-INF/
+#??mv ${HTTPFS_DIR}/webapps/webhdfs/WEB-INF/*.xml ${HTTP_DIRECTORY}/WEB-INF/
 
 cp -r ${HTTP_DIRECTORY} ${HTTPS_DIRECTORY}
-mv ${HTTPS_DIRECTORY}/conf/ssl-server.xml ${HTTPS_DIRECTORY}/conf/server.xml
-rm ${HTTP_DIRECTORY}/conf/ssl-server.xml
+#??mv ${HTTPS_DIRECTORY}/conf/ssl-server.xml ${HTTPS_DIRECTORY}/conf/server.xml
+#?? rm ${HTTP_DIRECTORY}/conf/ssl-server.xml
 
 mv $HADOOP_ETC_DIR/conf.empty/httpfs* $HTTPFS_ETC_DIR/conf.empty
 sed -i -e '/<\/configuration>/i\
@@ -361,7 +359,7 @@ sed -i -e '/<\/configuration>/i\
 for conf in conf.pseudo ; do
   install -d -m 0755 $HADOOP_ETC_DIR/$conf
   # Install the upstream config files
-  cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/$conf
+  cp -r ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/$conf
   # Remove the ones that shouldn't be installed
   rm -rf $HADOOP_ETC_DIR/$conf/httpfs*
   rm -rf $HADOOP_ETC_DIR/$conf/*.cmd
@@ -375,9 +373,9 @@ cp ${BUILD_DIR}/etc/hadoop/log4j.properties 
$HADOOP_ETC_DIR/conf.pseudo
 
 # FIXME: Provide a convenience link for configuration (HADOOP-7939)
 install -d -m 0755 ${HADOOP_DIR}/etc
-ln -s ${HADOOP_ETC_DIR##${PREFIX}}/conf ${HADOOP_DIR}/etc/hadoop
+ln -sf ${HADOOP_ETC_DIR##${PREFIX}}/conf ${HADOOP_DIR}/etc/hadoop
 install -d -m 0755 ${YARN_DIR}/etc
-ln -s ${HADOOP_ETC_DIR##${PREFIX}}/conf ${YARN_DIR}/etc/hadoop
+ln -sf ${HADOOP_ETC_DIR##${PREFIX}}/conf ${YARN_DIR}/etc/hadoop
 
 # Create log, var and lib
 install -d -m 0755 $PREFIX/var/{log,run,lib}/hadoop-hdfs

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/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/2ba34084/bigtop-packages/src/deb/hadoop/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/control 
b/bigtop-packages/src/deb/hadoop/control
index 9ca5870..fc3f3c9 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.
@@ -195,7 +195,7 @@ Description: Development support for libhdfs0
 
 Package: hadoop-httpfs
 Architecture: any
-Depends: hadoop-hdfs (= ${binary:Version}), bigtop-tomcat
+Depends: hadoop-hdfs (= ${binary:Version})
 Description: HTTPFS for Hadoop
   The server providing HTTP REST API support for the complete 
FileSystem/FileContext
   interface in HDFS.

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install 
b/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install
index a594bc0..19cd6f5 100644
--- a/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install
+++ b/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install
@@ -1,5 +1,4 @@
 /etc/default/hadoop-httpfs
 /etc/hadoop-httpfs
-/usr/lib/hadoop/libexec/httpfs-config.sh
 /usr/lib/hadoop-httpfs
 /var/lib/hadoop-httpfs

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install 
b/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
index 34a3796..ee971a9 100644
--- a/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
+++ b/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
@@ -2,7 +2,6 @@
 /etc/hadoop/conf.empty/mapred-site.xml
 /etc/hadoop/conf.empty/mapred-env.sh
 /etc/hadoop/conf.empty/mapred-queues.xml.template
-/etc/hadoop/conf.empty/mapred-site.xml.template
 /usr/lib/hadoop-mapreduce
 /usr/lib/hadoop/libexec/mapred-config.sh
 /usr/bin/mapred

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/bigtop-packages/src/deb/hadoop/hadoop.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/hadoop.install 
b/bigtop-packages/src/deb/hadoop/hadoop.install
index 2700cb6..7fd0f34 100644
--- a/bigtop-packages/src/deb/hadoop/hadoop.install
+++ b/bigtop-packages/src/deb/hadoop/hadoop.install
@@ -1,7 +1,5 @@
-/etc/hadoop/conf.empty/hadoop-metrics.properties
 /etc/hadoop/conf.empty/hadoop-metrics2.properties
 /etc/hadoop/conf.empty/log4j.properties
-/etc/hadoop/conf.empty/slaves
 /etc/hadoop/conf.empty/ssl-client.xml.example
 /etc/hadoop/conf.empty/ssl-server.xml.example
 /etc/hadoop/conf.empty/core-site.xml

http://git-wip-us.apache.org/repos/asf/bigtop/blob/2ba34084/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/2ba34084/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..36660c4 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.
@@ -326,7 +326,7 @@ blocks of data over the network to Hadoop Distributed 
Filesystem
 %package httpfs
 Summary: HTTPFS for Hadoop
 Group: System/Daemons
-Requires: %{name}-hdfs = %{version}-%{release}, bigtop-tomcat
+Requires: %{name}-hdfs = %{version}-%{release}
 Requires(pre): %{name} = %{version}-%{release}
 Requires(pre): %{name}-hdfs = %{version}-%{release}
 
@@ -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}/
 
@@ -625,7 +620,7 @@ fi
 
 %files mapreduce
 %defattr(-,root,root)
-%config(noreplace) %{etc_hadoop}/conf.empty/mapred-site.xml
+#%config(noreplace) %{etc_hadoop}/conf.empty/mapred-site.xml
 %config(noreplace) %{etc_hadoop}/conf.empty/mapred-env.sh
 %config(noreplace) %{etc_hadoop}/conf.empty/mapred-queues.xml.template
 %config(noreplace) %{etc_hadoop}/conf.empty/mapred-site.xml.template
@@ -642,10 +637,10 @@ fi
 %files
 %defattr(-,root,root)
 %config(noreplace) %{etc_hadoop}/conf.empty/core-site.xml
-%config(noreplace) %{etc_hadoop}/conf.empty/hadoop-metrics.properties
+#%config(noreplace) %{etc_hadoop}/conf.empty/hadoop-metrics.properties
 %config(noreplace) %{etc_hadoop}/conf.empty/hadoop-metrics2.properties
 %config(noreplace) %{etc_hadoop}/conf.empty/log4j.properties
-%config(noreplace) %{etc_hadoop}/conf.empty/slaves
+#%config(noreplace) %{etc_hadoop}/conf.empty/slaves
 %config(noreplace) %{etc_hadoop}/conf.empty/ssl-client.xml.example
 %config(noreplace) %{etc_hadoop}/conf.empty/ssl-server.xml.example
 %config(noreplace) %{etc_hadoop}/conf.empty/configuration.xsl
@@ -682,7 +677,7 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{etc_httpfs}
 %config(noreplace) /etc/default/%{name}-httpfs
-%{lib_hadoop}/libexec/httpfs-config.sh
+#%{lib_hadoop}/libexec/httpfs-config.sh
 %{initd_dir}/%{name}-httpfs
 %{lib_httpfs}
 %attr(0775,httpfs,httpfs) %{run_httpfs}

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