bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [1/2] git commit: BIGTOP-1098. now that Saprk has had its first incubator release we have to adjust bigtop accordingly
Date Wed, 25 Sep 2013 23:16:52 GMT
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 <rvs@cloudera.com>
Authored: Wed Sep 25 15:38:44 2013 -0700
Committer: Roman Shaposhnik <rvs@cloudera.com>
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 @@
   <version>0.7.0-SNAPSHOT</version>
   <name>sparksmoke</name>
 
-  <repositories>
-    <repository>
-      <id>akka-repo</id>
-      <name>Akka Repository</name>
-      <url>http://repo.akka.io/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>spray-repo</id>
-      <name>Spray Repository</name>
-      <url>http://repo.spray.cc/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
-      <groupId>org.spark-project</groupId>
-      <artifactId>spark-core</artifactId>
-      <version>0.8.0-SNAPSHOT</version>
-      <classifier>hadoop2-yarn</classifier>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-core_2.9.3</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>

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 @@
     <zookeeper.version>3.4.5</zookeeper.version>
     <giraph.version>0.2-SNAPSHOT</giraph.version>
     <solr.version>4.2.1</solr.version>
+    <spark.version>0.8.0-incubating</spark.version>
     <spark-smoke.version>${project.version}</spark-smoke.version>
 
     <itest-common.version>${project.version}</itest-common.version>
@@ -216,6 +217,11 @@
         <artifactId>sqoop-client</artifactId>
         <version>${sqoop.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-core_2.9.3</artifactId>
+        <version>${spark.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 


Mime
View raw message