You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/04/25 01:05:38 UTC
[29/50] git commit: Merge remote-tracking branch
'remotes/public/master'
Merge remote-tracking branch 'remotes/public/master'
Conflicts:
bigtop-tests/test-artifacts/longevity/pom.xml
bigtop-tests/test-artifacts/pom.xml
bigtop.mk
package.mk
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/960ad126
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/960ad126
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/960ad126
Branch: refs/heads/master
Commit: 960ad126dbaeb23ccb5e63f23057e65bcf3b9fa9
Parents: c5e33e2 54d4549
Author: Konstantin Boudnik <co...@apache.org>
Authored: Thu Feb 20 11:14:24 2014 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Thu Feb 20 11:14:24 2014 -0800
----------------------------------------------------------------------
.../src/common/bigtop-groovy/do-component-build | 19 ++++
.../src/common/bigtop-groovy/install_groovy.sh | 108 +++++++++++++++++++
bigtop-packages/src/common/solr/install_solr.sh | 2 +-
.../src/deb/bigtop-groovy/bigtop-groovy.install | 4 +
.../deb/bigtop-groovy/bigtop-groovy.postinst | 36 +++++++
bigtop-packages/src/deb/bigtop-groovy/changelog | 1 +
bigtop-packages/src/deb/bigtop-groovy/compat | 1 +
bigtop-packages/src/deb/bigtop-groovy/control | 27 +++++
bigtop-packages/src/deb/bigtop-groovy/copyright | 15 +++
bigtop-packages/src/deb/bigtop-groovy/rules | 39 +++++++
.../src/deb/bigtop-groovy/source/format | 1 +
.../src/rpm/bigtop-groovy/SPECS/.gitignore | 0
.../rpm/bigtop-groovy/SPECS/bigtop-groovy.spec | 60 +++++++++++
bigtop-tests/test-artifacts/longevity/pom.xml | 73 +++++++------
.../apache/bigtop/itest/iolongevity/.gitignore | 0
.../bigtop/itest/iolongevity/TestDFSIO.groovy | 97 +++++++++++++++++
.../package/src/main/resources/package_data.xml | 12 +++
bigtop-tests/test-artifacts/pom.xml | 6 +-
bigtop-tests/test-execution/README | 4 +
bigtop.mk | 14 +++
bigtop_toolchain/files/jenkins.sh.centos | 2 +-
bigtop_toolchain/files/jenkins.sh.ubu | 2 +-
package.mk | 60 ++++++-----
23 files changed, 516 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/960ad126/bigtop-tests/test-artifacts/pom.xml
----------------------------------------------------------------------
diff --cc bigtop-tests/test-artifacts/pom.xml
index 94d6ee3,e3963cb..50fb7b1
--- a/bigtop-tests/test-artifacts/pom.xml
+++ b/bigtop-tests/test-artifacts/pom.xml
@@@ -40,14 -40,17 +40,18 @@@
<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>longevity</module>
+ <module>s3hdfs</module>
+ <module>longevity</module>
<module>hcatalog</module>
<module>spark</module>
- <module>phoenix</module>
</modules>
<dependencies>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/960ad126/bigtop.mk
----------------------------------------------------------------------
diff --cc bigtop.mk
index 20aa46c,fb08fdf..4ac7b0c
--- a/bigtop.mk
+++ b/bigtop.mk
@@@ -224,13 -236,40 +224,27 @@@ SPARK_SITE=$(APACHE_MIRROR)$(SPARK_DOWN
SPARK_ARCHIVE=$(APACHE_ARCHIVE)$(SPARK_DOWNLOAD_PATH)
$(eval $(call PACKAGE,spark,SPARK))
-# Phoenix
-PHOENIX_NAME=phoenix
-PHOENIX_RELNOTES_NAME=Phoenix: A SQL skin over HBase
-PHOENIX_PKG_NAME=phoenix
-PHOENIX_BASE_VERSION=2.0.2
-PHOENIX_PKG_VERSION=2.0.2
-PHOENIX_RELEASE_VERSION=1
-PHOENIX_TARBALL_DST=phoenix-$(PHOENIX_BASE_VERSION).tar.gz
-PHOENIX_TARBALL_SRC=$(PHOENIX_BASE_VERSION).tar.gz
-PHOENIX_SITE=https://github.com/forcedotcom/phoenix/archive
-PHOENIX_ARCHIVE=$(PHOENIX_SITE)
-$(eval $(call PACKAGE,phoenix,PHOENIX))
-
+ # Groovy
+ BIGTOP_GROOVY_NAME=bigtop-groovy
+ BIGTOP_GROOVY_RELNOTES_NAME=Grovvy: a dynamic language for the Java platform
+ BIGTOP_GROOVY_PKG_NAME=bigtop-groovy
+ BIGTOP_GROOVY_BASE_VERSION=2.2.1
+ BIGTOP_GROOVY_PKG_VERSION=2.2.1
+ BIGTOP_GROOVY_RELEASE_VERSION=1
+ BIGTOP_GROOVY_TARBALL_DST=$(BIGTOP_GROOVY_NAME)-$(BIGTOP_GROOVY_BASE_VERSION).tar.gz
+ BIGTOP_GROOVY_TARBALL_SRC=groovy-binary-$(BIGTOP_GROOVY_BASE_VERSION).zip
+ BIGTOP_GROOVY_SITE=http://dist.groovy.codehaus.org/distributions/
+ BIGTOP_GROOVY_ARCHIVE=$(BIGTOP_GROOVY_SITE)
+ $(eval $(call PACKAGE,bigtop-groovy,BIGTOP_GROOVY))
+
# Bigtop-utils
BIGTOP_UTILS_NAME=bigtop-utils
BIGTOP_UTILS__RELNOTES_NAME=Bigtop-utils
BIGTOP_UTILS_PKG_NAME=bigtop-utils
BIGTOP_UTILS_BASE_VERSION=$(subst -,.,$(BIGTOP_VERSION))
-BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION)
+BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION)+WANdisco
BIGTOP_UTILS_RELEASE_VERSION=1
+ BIGTOP_UTILS_TARBALL_DST=$(BIGTOP_UTILS_PKG_NAME)-$(BIGTOP_UTILS_BASE_VERSION).tar.gz
$(eval $(call PACKAGE,bigtop-utils,BIGTOP_UTILS))
# Bigtop-jsvc
http://git-wip-us.apache.org/repos/asf/bigtop/blob/960ad126/package.mk
----------------------------------------------------------------------