Merge remote-tracking branch 'public/master'
Conflicts:
bigtop-tests/test-execution/smokes/pom.xml
bigtop.mk
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/4f81598e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/4f81598e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/4f81598e
Branch: refs/heads/master
Commit: 4f81598e601596bc6424c01a6385e010bf8f7fa0
Parents: 2199231 c8aa355
Author: Konstantin Boudnik <[email protected]>
Authored: Wed Jan 22 16:43:35 2014 -0800
Committer: Konstantin Boudnik <[email protected]>
Committed: Wed Jan 22 16:43:35 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 91 +-
README | 119 -
README.md | 131 +
bigtop-deploy/puppet/README.md | 2 +-
bigtop-deploy/puppet/config/site.csv.example | 9 +
bigtop-deploy/puppet/manifests/cluster.pp | 314 +-
.../modules/hadoop-hbase/manifests/init.pp | 25 +-
.../puppet/modules/hadoop-hbase/tests/init.pp | 5 +-
.../puppet/modules/hue/manifests/init.pp | 3 +-
.../puppet/modules/hue/templates/hue.ini | 85 +-
bigtop-deploy/puppet/modules/hue/tests/init.pp | 3 +
.../puppet/modules/solr/manifests/init.pp | 45 +-
.../puppet/modules/solr/templates/jaas.conf | 24 +
.../puppet/modules/solr/templates/solr | 19 +-
.../puppet/modules/solr/templates/solr.xml | 26 -
bigtop-deploy/puppet/modules/solr/tests/init.pp | 3 +-
.../puppet/modules/spark/manifests/init.pp | 51 +
.../puppet/modules/spark/templates/spark-env.sh | 52 +
.../puppet/modules/spark/tests/init.pp | 25 +
bigtop-deploy/vm/vagrant-puppet/README | 16 +
bigtop-deploy/vm/vagrant-puppet/Vagrantfile | 47 +
bigtop-deploy/vm/vagrant-puppet/hbase-test.sh | 9 +
bigtop-deploy/vm/vagrant-puppet/provision.sh | 14 +
bigtop-deploy/vm/vagrant/README | 11 +
bigtop-deploy/vm/vagrant/Vagrantfile | 39 +
bigtop-deploy/vm/vagrant/provision.sh | 31 +
.../common/bigtop-utils/bigtop-detect-javahome | 45 +-
.../src/common/flume/do-component-build | 3 +
.../src/common/hadoop/conf.pseudo/core-site.xml | 2 +-
.../src/common/hadoop/conf.secure/core-site.xml | 2 +-
.../src/common/hadoop/hadoop-httpfs.svc | 4 +-
bigtop-packages/src/common/hadoop/init-hdfs.sh | 4 +-
.../src/common/hadoop/install_hadoop.sh | 12 +-
.../src/common/hbase/install_hbase.sh | 4 +-
.../src/common/hbase/regionserver-init.d.tpl | 15 +-
.../src/common/hcatalog/install_hcatalog.sh | 6 +-
.../common/hive/hive-hcatalog-server.default | 25 +
.../src/common/hive/hive-hcatalog-server.svc | 23 +
bigtop-packages/src/common/hive/hive-hcatalog.1 | 71 +
.../src/common/hive/hive-server2.default | 20 +
.../src/common/hive/hive-server2.svc | 71 +
.../src/common/hive/hive-webhcat-server.default | 23 +
.../src/common/hive/hive-webhcat-server.svc | 24 +
bigtop-packages/src/common/hive/install_hive.sh | 148 +-
.../src/common/hue/do-component-build | 6 +-
bigtop-packages/src/common/hue/install_hue.sh | 6 +-
.../src/common/oozie/catalina.properties | 2 +-
.../src/common/oozie/install_oozie.sh | 60 +-
bigtop-packages/src/common/oozie/oozie.init | 9 +-
.../src/common/phoenix/do-component-build | 27 +
.../src/common/phoenix/install_phoenix.sh | 133 +
bigtop-packages/src/common/solr/install_solr.sh | 15 +-
.../src/common/solr/solr-server.init.debian | 7 +-
.../src/common/spark/compute-classpath.sh | 14 +
.../src/common/spark/do-component-build | 2 +-
.../src/common/spark/install_spark.sh | 26 +
bigtop-packages/src/common/spark/run | 15 +
.../src/common/sqoop/catalina.properties | 2 +-
.../src/common/sqoop/install_sqoop.sh | 12 +-
.../src/common/sqoop/sqoop-server.sh | 9 +-
bigtop-packages/src/deb/bigtop-jsvc/control | 1 +
bigtop-packages/src/deb/bigtop-tomcat/control | 1 +
.../src/deb/hadoop/hadoop-httpfs.postinst | 1 +
.../src/deb/hadoop/hadoop-httpfs.prerm | 1 +
.../src/deb/hadoop/libhdfs0-dev.install | 1 -
bigtop-packages/src/deb/hadoop/libhdfs0.install | 2 +-
bigtop-packages/src/deb/hive/control | 34 +
bigtop-packages/src/deb/hive/hive-hbase.install | 1 +
bigtop-packages/src/deb/hive/hive-hcatalog.dirs | 2 +
.../src/deb/hive/hive-hcatalog.install | 9 +
.../src/deb/hive/hive-hcatalog.postinst | 35 +
.../src/deb/hive/hive-hcatalog.prerm | 57 +
bigtop-packages/src/deb/hive/hive-jdbc.install | 10 +
.../src/deb/hive/hive-webhcat.install | 4 +
.../src/deb/hive/hive-webhcat.postinst | 34 +
bigtop-packages/src/deb/hive/hive-webhcat.prerm | 57 +
bigtop-packages/src/deb/hive/hive.dirs | 1 +
bigtop-packages/src/deb/hive/hive.install | 55 +
bigtop-packages/src/deb/hive/rules | 26 +-
bigtop-packages/src/deb/hue/control | 5 +
bigtop-packages/src/deb/hue/hue-common.install | 1 +
bigtop-packages/src/deb/hue/hue-doc.install | 1 +
bigtop-packages/src/deb/oozie/oozie.postinst | 6 +-
bigtop-packages/src/deb/oozie/oozie.prerm | 3 +-
bigtop-packages/src/deb/oozie/rules | 3 -
bigtop-packages/src/deb/phoenix/changelog | 1 +
bigtop-packages/src/deb/phoenix/compat | 1 +
bigtop-packages/src/deb/phoenix/control | 34 +
bigtop-packages/src/deb/phoenix/copyright | 15 +
bigtop-packages/src/deb/phoenix/phoenix.install | 2 +
.../src/deb/phoenix/phoenix.postinst | 35 +
bigtop-packages/src/deb/phoenix/phoenix.prerm | 57 +
bigtop-packages/src/deb/phoenix/rules | 56 +
bigtop-packages/src/deb/phoenix/source/format | 1 +
bigtop-packages/src/deb/solr/solr.install | 2 +-
bigtop-packages/src/deb/solr/solr.postinst | 3 +-
bigtop-packages/src/deb/solr/solr.prerm | 1 +
bigtop-packages/src/deb/spark/compat | 2 +-
bigtop-packages/src/deb/spark/control | 23 +-
bigtop-packages/src/deb/spark/rules | 73 +-
bigtop-packages/src/deb/spark/source/format | 1 +
.../src/deb/spark/spark-core.install | 21 +
.../src/deb/spark/spark-core.postinst | 35 +
.../src/deb/spark/spark-core.preinst | 61 +
bigtop-packages/src/deb/spark/spark-core.prerm | 38 +
.../src/deb/spark/spark-python.install | 4 +
bigtop-packages/src/deb/spark/spark.postinst | 34 -
bigtop-packages/src/deb/spark/spark.prerm | 38 -
bigtop-packages/src/deb/sqoop/control | 1 +
bigtop-packages/src/deb/sqoop/sqoop.install | 1 +
bigtop-packages/src/deb/sqoop/sqoop.postinst | 3 +-
bigtop-packages/src/deb/sqoop/sqoop.prerm | 1 +
.../src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec | 1 +
.../rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec | 1 +
.../src/rpm/hadoop/SPECS/hadoop.spec | 14 +-
bigtop-packages/src/rpm/hive/SPECS/hive.spec | 177 +-
bigtop-packages/src/rpm/hue/SPECS/hue.spec | 13 +-
bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 20 +-
bigtop-packages/src/rpm/phoenix/RPMS/.gitignore | 1 +
.../src/rpm/phoenix/SOURCES/.gitignore | 0
.../src/rpm/phoenix/SPECS/.gitignore | 3 +
.../src/rpm/phoenix/SPECS/phoenix.spec | 147 +
.../src/rpm/phoenix/SRPMS/.gitignore | 0
.../src/rpm/solr/SOURCES/solr-server.init | 7 +-
bigtop-packages/src/rpm/solr/SPECS/solr.spec | 4 +
bigtop-packages/src/rpm/spark/SPECS/spark.spec | 80 +-
bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec | 6 +
bigtop-test-framework/pom.xml | 4 +-
bigtop-tests/test-artifacts/crunch/pom.xml | 4 +-
bigtop-tests/test-artifacts/datafu/pom.xml | 4 +-
bigtop-tests/test-artifacts/fatjar/pom.xml | 4 +-
bigtop-tests/test-artifacts/flume/pom.xml | 4 +-
bigtop-tests/test-artifacts/giraph/pom.xml | 4 +-
bigtop-tests/test-artifacts/hadoop/pom.xml | 4 +-
.../bigtop/itest/hadoop/yarn/TestNode.groovy | 58 +
bigtop-tests/test-artifacts/hbase/pom.xml | 4 +-
bigtop-tests/test-artifacts/hcatalog/pom.xml | 4 +-
bigtop-tests/test-artifacts/hive/pom.xml | 4 +-
bigtop-tests/test-artifacts/hue/pom.xml | 4 +-
bigtop-tests/test-artifacts/mahout/pom.xml | 4 +-
.../mahout/smoke/TestMahoutExamples.groovy | 132 +-
bigtop-tests/test-artifacts/oozie/pom.xml | 4 +-
bigtop-tests/test-artifacts/package/pom.xml | 4 +-
.../src/main/resources/apt/package_data.xml | 16 +-
.../package/src/main/resources/package_data.xml | 148 +-
.../src/main/resources/yum/package_data.xml | 16 +-
.../src/main/resources/zypper/package_data.xml | 16 +-
bigtop-tests/test-artifacts/phoenix/pom.xml | 33 +
.../itest/phoenix/smoke/TestPhoenixSmoke.groovy | 296 +
bigtop-tests/test-artifacts/pom.xml | 5 +-
bigtop-tests/test-artifacts/solr/pom.xml | 4 +-
bigtop-tests/test-artifacts/spark/pom.xml | 20 +-
bigtop-tests/test-artifacts/sqoop/pom.xml | 4 +-
bigtop-tests/test-execution/common/pom.xml | 4 +-
bigtop-tests/test-execution/conf/pom.xml | 4 +-
bigtop-tests/test-execution/integration/pom.xml | 4 +-
.../test-execution/integration/sqoop/pom.xml | 4 +-
bigtop-tests/test-execution/package/pom.xml | 4 +-
bigtop-tests/test-execution/pom.xml | 4 +-
.../test-execution/smokes/crunch/pom.xml | 4 +-
.../test-execution/smokes/datafu/pom.xml | 4 +-
.../test-execution/smokes/flume/pom.xml | 4 +-
.../test-execution/smokes/giraph/pom.xml | 4 +-
.../test-execution/smokes/hadoop/pom.xml | 4 +-
.../test-execution/smokes/hbase/pom.xml | 4 +-
.../test-execution/smokes/hcatalog/pom.xml | 4 +-
bigtop-tests/test-execution/smokes/hive/pom.xml | 4 +-
bigtop-tests/test-execution/smokes/hue/pom.xml | 4 +-
.../test-execution/smokes/mahout/pom.xml | 4 +-
.../test-execution/smokes/oozie/pom.xml | 4 +-
.../test-execution/smokes/phoenix/pom.xml | 60 +
bigtop-tests/test-execution/smokes/pig/pom.xml | 4 +-
bigtop-tests/test-execution/smokes/pom.xml | 4 +-
bigtop-tests/test-execution/smokes/solr/pom.xml | 4 +-
.../test-execution/smokes/spark/pom.xml | 4 +-
.../test-execution/smokes/sqoop/pom.xml | 6 +-
bigtop.mk | 22 +-
bigtop_toolchain/README.md | 2 -
pom.xml | 128 +-
src/site/docbookx/apache-bigtop-user-guide.xml | 85 +
src/site/docbookx/customization.xsl | 33 +
src/site/docbookx/userguide/introduction.xml | 32 +
src/site/docbookx/userguide/preface.xml | 28 +
src/site/docbookx/userguide/what-s-new.xml | 32 +
src/site/resources/bigtop.rdf | 40 +
src/site/resources/css/freebsd_docbook.css | 208 +
src/site/site.xml | 58 +-
src/site/xdoc/index.xml | 266 +-
src/site/xdoc/irc-channel.xml | 51 +-
src/site/xdoc/issue-tracking.xml | 60 +-
src/site/xdoc/mail-lists.xml | 136 +-
src/site/xdoc/release-notes.xml | 5953 ++++++++++++++----
src/site/xdoc/team-list.xml | 360 +-
193 files changed, 9199 insertions(+), 2664 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/deb/bigtop-jsvc/control
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/deb/bigtop-tomcat/control
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/deb/hive/control
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/deb/hue/control
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/deb/sqoop/control
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/hive/SPECS/hive.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/hue/SPECS/hue.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/solr/SPECS/solr.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-artifacts/pom.xml
----------------------------------------------------------------------
diff --cc bigtop-tests/test-artifacts/pom.xml
index d77832a,a83a477..f9eeb71
--- a/bigtop-tests/test-artifacts/pom.xml
+++ b/bigtop-tests/test-artifacts/pom.xml
@@@ -40,13 -40,16 +40,14 @@@
<module>hbase</module>
<module>flume</module>
<module>sqoop</module>
- <module>mahout</module>
- <module>giraph</module>
<module>hue</module>
- <module>solr</module>
- <module>crunch</module>
<module>datafu</module>
<module>fatjar</module>
+ <module>cnode</module>
+ <module>s3hdfs</module>
<module>hcatalog</module>
<module>spark</module>
+ <module>phoenix</module>
</modules>
<dependencies>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/common/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/smokes/crunch/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/smokes/flume/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/smokes/giraph/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/smokes/hadoop/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/smokes/hive/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop-tests/test-execution/smokes/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/bigtop.mk
----------------------------------------------------------------------
diff --cc bigtop.mk
index f5be02e,35d1f98..20aa46c
--- a/bigtop.mk
+++ b/bigtop.mk
@@@ -13,77 -13,21 +13,77 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
- BIGTOP_VERSION=0.7.0
+ BIGTOP_VERSION=0.8.0
-# Hadoop 0.20.0-based hadoop package
+# WDD release RPM
+WDD_NAME=wdd-release
+WDD_RELNOTES_NAME=WDD release
+WDD_BASE_VERSION=4
+WDD_PKG_VERSION=4+WANdisco
+WDD_RELEASE_VERSION=1
+WDD_TARBALL_DST=RPM-GPG-KEY-WANdisco
+WDD_TARBALL_SRC=RPM-GPG-KEY-WANdisco
+WDD_DOWNLOAD_PATH=/
+WDD_SITE=$(WANDISCO_ARCHIVE)$(WDD_DOWNLOAD_PATH)
+WDD_ARCHIVE=$(WDD_SITE)
+$(eval $(call PACKAGE,wdd-release,WDD))
+
+# Hadoop 2.0.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=2.0.6-alpha
-HADOOP_PKG_VERSION=2.0.6
+HADOOP_BASE_VERSION=2.0.6.15-wdd3.8-SNAPSHOT
+HADOOP_PKG_VERSION=2.0.6.15+WANdisco
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
-HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
-HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
-HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
+HADOOP_DOWNLOAD_PATH=/hadoop/core/${HADOOP_NAME}-${HADOOP_BASE_VERSION}
+HADOOP_SITE=$(WANDISCO_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_ARCHIVE=$(HADOOP_SITE)
$(eval $(call PACKAGE,hadoop,HADOOP))
+# S3HDFS-Bridge
+HDFSB_NAME=wdd-s3hdfs
+HDFSB_RELNOTES_NAME=WANdisco S3HDFS Bridge
+HDFSB_BASE_VERSION=3.6.0
+HDFSB_PKG_VERSION=3.6.0+WANdisco
+HDFSB_RELEASE_VERSION=1
+HDFSB_TARBALL_DST=s3hdfs-$(HDFSB_BASE_VERSION).tar.gz
+HDFSB_TARBALL_SRC=$(HDFSB_TARBALL_DST)
+HDFSB_DOWNLOAD_PATH=/S3HDFS/
+HDFSB_SITE=$(WANDISCO_IP)${HDFSB_DOWNLOAD_PATH}
+HDFSB_ARCHIVE=$(HDFSB_SITE)
+$(eval $(call PACKAGE,wdd-s3hdfs,HDFSB))
+
+# consensus name-node
+## DOWNLOAD_URL is comprised from _SITE + _TARBALL_SRC
+NONSTOP_NAME=wdd-namenode-nonstop
+NONSTOP_RELNOTES_NAME=WANdisco Non-Stop Namenode
+## simply use make -e NONSTOP_BASE_VERSION=... to override
+NONSTOP_BASE_VERSION=1.2-SNAPSHOT
+# Make sure that something like -SNAPSHOT isn't present
+NONSTOP_PKG_VERSION=`echo $(NONSTOP_BASE_VERSION) | sed -e "s/-SNAPSHOT//" -e
"s/-/+/"`+WANdisco
+NONSTOP_RELEASE_VERSION=1
+NONSTOP_TARBALL_DST=namenode-$(NONSTOP_BASE_VERSION).tar.gz
+NONSTOP_TARBALL_SRC=namenode-$(NONSTOP_BASE_VERSION)-src.tar.gz
+NONSTOP_DOWNLOAD_PATH=/NsNN/
+NONSTOP_SITE=$(WANDISCO_IP)${NONSTOP_DOWNLOAD_PATH}
+NONSTOP_ARCHIVE=$(NONSTOP_SITE)
+$(eval $(call PACKAGE,wdd-namenode-nonstop,NONSTOP))
+
+# Hippo: WDD UI project
+HIPPO_NAME=hippo
+HIPPO_RELNOTES_NAME=Hippo UI
+HIPPO_PKG_NAME=hippo
+HIPPO_BASE_VERSION=1.2-SNAPSHOT
+HIPPO_PKG_VERSION=1.2+WANdisco
+HIPPO_RELEASE_VERSION=1
+HIPPO_TARBALL_SRC=hadoop-ui-$(HIPPO_BASE_VERSION)-src.tar.gz
+HIPPO_TARBALL_DST=hippo-$(HIPPO_BASE_VERSION).tar.gz
+HIPPO_DOWNLOAD_PATH=/HadoopUI/
+HIPPO_SITE=$(WANDISCO_IP)$(HIPPO_DOWNLOAD_PATH)
+HIPPO_ARCHIVE=$(HIPPO_SITE)
+$(eval $(call PACKAGE,hippo,HIPPO))
+
# ZooKeeper
ZOOKEEPER_NAME=zookeeper
ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper
@@@ -187,8 -144,8 +187,8 @@@ $(eval $(call PACKAGE,oozie,OOZIE)
FLUME_NAME=flume
FLUME_RELNOTES_NAME=Flume
FLUME_PKG_NAME=flume
- FLUME_BASE_VERSION=1.3.1
- FLUME_PKG_VERSION=1.3.1+WANdisco
+ FLUME_BASE_VERSION=1.4.0
-FLUME_PKG_VERSION=1.4.0
++FLUME_PKG_VERSION=1.4.0+WANdisco
FLUME_RELEASE_VERSION=1
FLUME_TARBALL_DST=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION)-src.tar.gz
FLUME_TARBALL_SRC=$(FLUME_TARBALL_DST)
@@@ -201,8 -185,8 +201,8 @@@ $(eval $(call PACKAGE,flume,FLUME)
DATAFU_NAME=datafu
DATAFU_RELNOTES_NAME=Collection of user-defined functions
DATAFU_PKG_NAME=pig-udf-datafu
- DATAFU_BASE_VERSION=0.0.6
- DATAFU_PKG_VERSION=0.0.6+WANdisco
+ DATAFU_BASE_VERSION=1.0.0
-DATAFU_PKG_VERSION=1.0.0
++DATAFU_PKG_VERSION=1.0.0+WANdisco
DATAFU_RELEASE_VERSION=1
DATAFU_TARBALL_DST=datafu-$(DATAFU_BASE_VERSION).tar.gz
DATAFU_TARBALL_SRC=v$(DATAFU_BASE_VERSION).tar.gz
@@@ -210,12 -194,40 +210,12 @@@ DATAFU_SITE=https://github.com/linkedin
DATAFU_ARCHIVE=$(DATAFU_SITE)
$(eval $(call PACKAGE,datafu,DATAFU))
- # Spark
-# Solr
-SOLR_NAME=solr
-SOLR_RELNOTES_NAME=Search engine server
-SOLR_PKG_NAME=solr
-SOLR_BASE_VERSION=4.5.0
-SOLR_PKG_VERSION=4.5.0
-SOLR_RELEASE_VERSION=1
-SOLR_TARBALL_DST=solr-$(SOLR_BASE_VERSION)-src.tgz
-SOLR_TARBALL_SRC=$(SOLR_TARBALL_DST)
-SOLR_DOWNLOAD_PATH=/lucene/solr/$(SOLR_BASE_VERSION)
-SOLR_SITE=$(APACHE_MIRROR)$(SOLR_DOWNLOAD_PATH)
-SOLR_ARCHIVE=$(APACHE_ARCHIVE)$(SOLR_DOWNLOAD_PATH)
-$(eval $(call PACKAGE,solr,SOLR))
-
-# Crunch
-CRUNCH_NAME=crunch
-CRUNCH_RELNOTES_NAME=Java library for MapReduce pipelines
-CRUNCH_PKG_NAME=crunch
-CRUNCH_BASE_VERSION=0.7.0
-CRUNCH_PKG_VERSION=0.7.0
-CRUNCH_RELEASE_VERSION=1
-CRUNCH_TARBALL_DST=apache-crunch-$(CRUNCH_BASE_VERSION)-src.tar.gz
-CRUNCH_TARBALL_SRC=$(CRUNCH_TARBALL_DST)
-CRUNCH_DOWNLOAD_PATH=/crunch/crunch-$(CRUNCH_BASE_VERSION)
-CRUNCH_SITE=$(APACHE_MIRROR)$(CRUNCH_DOWNLOAD_PATH)
-CRUNCH_ARCHIVE=$(APACHE_ARCHIVE)$(CRUNCH_DOWNLOAD_PATH)
-$(eval $(call PACKAGE,crunch,CRUNCH))
-
+ # Spark
SPARK_NAME=spark
SPARK_RELNOTES_NAME=Spark
- SPARK_PKG_NAME=spark
+ SPARK_PKG_NAME=spark-core
SPARK_BASE_VERSION=0.8.0-incubating
--SPARK_PKG_VERSION=0.8.0
++SPARK_PKG_VERSION=0.8.0+WANdisco
SPARK_RELEASE_VERSION=1
SPARK_TARBALL_DST=spark-$(SPARK_BASE_VERSION).tar.gz
SPARK_TARBALL_SRC=spark-$(SPARK_BASE_VERSION).tgz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4f81598e/pom.xml
----------------------------------------------------------------------
