Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A11EE10C83 for ; Wed, 25 Sep 2013 23:16:53 +0000 (UTC) Received: (qmail 79760 invoked by uid 500); 25 Sep 2013 23:16:53 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 79676 invoked by uid 500); 25 Sep 2013 23:16:53 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 79660 invoked by uid 99); 25 Sep 2013 23:16:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Sep 2013 23:16:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D1FA990A50F; Wed, 25 Sep 2013 23:16:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rvs@apache.org To: commits@bigtop.apache.org Date: Wed, 25 Sep 2013 23:16:52 -0000 Message-Id: <10bac46c4e4e464483ff9295b6478192@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: BIGTOP-1098. now that Saprk has had its first incubator release we have to adjust bigtop accordingly Updated Branches: refs/heads/master 3d5a79f9b -> 7d7843855 BIGTOP-1098. now that Saprk has had its first incubator release we have to adjust bigtop accordingly Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2a1dda80 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2a1dda80 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2a1dda80 Branch: refs/heads/master Commit: 2a1dda80d8fc029f3c0c37fdfd28ee859adf632e Parents: 3d5a79f Author: Roman Shaposhnik Authored: Wed Sep 25 15:38:44 2013 -0700 Committer: Roman Shaposhnik Committed: Wed Sep 25 15:39:36 2013 -0700 ---------------------------------------------------------------------- bigtop-tests/test-artifacts/spark/pom.xml | 31 ++------------------ .../bigtop/itest/spark/TestSparkSmoke.groovy | 4 +-- bigtop.mk | 11 +++---- pom.xml | 6 ++++ 4 files changed, 16 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/2a1dda80/bigtop-tests/test-artifacts/spark/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/spark/pom.xml b/bigtop-tests/test-artifacts/spark/pom.xml index a29f87f..cba3000 100644 --- a/bigtop-tests/test-artifacts/spark/pom.xml +++ b/bigtop-tests/test-artifacts/spark/pom.xml @@ -16,37 +16,10 @@ 0.7.0-SNAPSHOT sparksmoke - - - akka-repo - Akka Repository - http://repo.akka.io/releases/ - - true - - - false - - - - spray-repo - Spray Repository - http://repo.spray.cc/ - - true - - - false - - - - - org.spark-project - spark-core - 0.8.0-SNAPSHOT - hadoop2-yarn + org.apache.spark + spark-core_2.9.3 org.apache.hadoop http://git-wip-us.apache.org/repos/asf/bigtop/blob/2a1dda80/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkSmoke.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkSmoke.groovy b/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkSmoke.groovy index 414ec9c..400cc92 100644 --- a/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkSmoke.groovy +++ b/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkSmoke.groovy @@ -29,8 +29,8 @@ import static org.junit.Assert.assertEquals import static org.apache.bigtop.itest.LogErrorsUtils.logError -import spark.api.java.* -import spark.api.java.function.Function +import org.apache.spark.api.java.* +import org.apache.spark.api.java.function.Function public class TestSparkSmoke implements Serializable { http://git-wip-us.apache.org/repos/asf/bigtop/blob/2a1dda80/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 253a8b1..5765c8d 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -241,13 +241,14 @@ $(eval $(call PACKAGE,crunch,CRUNCH)) SPARK_NAME=spark SPARK_RELNOTES_NAME=Spark SPARK_PKG_NAME=spark -SPARK_BASE_VERSION=0.8.0-incubating-SNAPSHOT +SPARK_BASE_VERSION=0.8.0-incubating SPARK_PKG_VERSION=0.8.0 SPARK_RELEASE_VERSION=1 -SPARK_TARBALL_DST=spark-${SPARK_BASE_VERSION}.tar.gz -SPARK_TARBALL_SRC=branch-0.8.tar.gz -SPARK_SITE=https://github.com/mesos/spark/archive -SPARK_ARCHIVE=${SPARK_SITE} +SPARK_TARBALL_DST=spark-$(SPARK_BASE_VERSION).tar.gz +SPARK_TARBALL_SRC=spark-$(SPARK_BASE_VERSION).tgz +SPARK_DOWNLOAD_PATH=/incubator/spark/spark-$(SPARK_BASE_VERSION) +SPARK_SITE=$(APACHE_MIRROR)$(SPARK_DOWNLOAD_PATH) +SPARK_ARCHIVE=$(APACHE_ARCHIVE)$(SPARK_DOWNLOAD_PATH) $(eval $(call PACKAGE,spark,SPARK)) # Bigtop-utils http://git-wip-us.apache.org/repos/asf/bigtop/blob/2a1dda80/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0ac1d49..e92dcee 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 3.4.5 0.2-SNAPSHOT 4.2.1 + 0.8.0-incubating

${project.version}

${project.version} @@ -216,6 +217,11 @@ sqoop-client ${sqoop.version} + + org.apache.spark + spark-core_2.9.3 + ${spark.version} +