Эх сурвалжийг харах

[livy] Update spark version to 1.3.0-cdh5.5.0-SNAPSHOT

Erick Tryzelaar 10 жил өмнө
parent
commit
93455b8

+ 33 - 6
apps/spark/java/livy-repl/pom.xml

@@ -21,11 +21,44 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.scalatra</groupId>
+            <artifactId>scalatra-scalatest_${scala.binary.version}</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-assembly_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_${scala.binary.version}</artifactId>
             <version>${spark.version}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -41,12 +74,6 @@
             <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.scalatra</groupId>
-            <artifactId>scalatra-scalatest_${scala.binary.version}</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>net.sf.py4j</groupId>
             <artifactId>py4j</artifactId>

+ 1 - 1
maven/pom.xml

@@ -39,7 +39,7 @@
   <properties>
     <hadoop-mr1.version>2.6.0-mr1-cdh5.5.0-SNAPSHOT</hadoop-mr1.version>
     <hadoop.version>2.6.0-cdh5.5.0-SNAPSHOT</hadoop.version>
-    <spark.version>1.2.1</spark.version>
+    <spark.version>1.3.0-cdh5.5.0-SNAPSHOT</spark.version>
     <slf4j.version>1.6.1</slf4j.version>
     <commons-logging.version>1.0.4</commons-logging.version>
     <thrift.version>0.9.0</thrift.version>