BIGTOP-1098. now that Saprk has had its first incubator release we have to adjust...
authorRoman Shaposhnik <rvs@cloudera.com>
Wed, 25 Sep 2013 22:38:44 +0000 (15:38 -0700)
committerRoman Shaposhnik <rvs@cloudera.com>
Wed, 25 Sep 2013 22:39:36 +0000 (15:39 -0700)
bigtop-tests/test-artifacts/spark/pom.xml
bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkSmoke.groovy
bigtop.mk
pom.xml

index a29f87f..cba3000 100644 (file)
   <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>
index 414ec9c..400cc92 100644 (file)
@@ -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 {
 
index 253a8b1..5765c8d 100644 (file)
--- 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
diff --git a/pom.xml b/pom.xml
index 0ac1d49..e92dcee 100644 (file)
--- 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>
         <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>