Sfoglia il codice sorgente

[livy] Optimize the livy-core maven dependencies

Erick Tryzelaar 10 anni fa
parent
commit
ea11bff

+ 20 - 42
apps/spark/java/livy-core/pom.xml

@@ -16,51 +16,44 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-access</artifactId>
         </dependency>
 
-        <!-- promoted to compile so they are included in the assembly. -->
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-http</artifactId>
-            <scope>compile</scope>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-continuation</artifactId>
-            <scope>compile</scope>
+            <artifactId>jetty-server</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <scope>compile</scope>
+            <artifactId>jetty-util</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <scope>compile</scope>
+            <groupId>org.json4s</groupId>
+            <artifactId>json4s-ast_${scala.binary.version}</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-plus</artifactId>
-            <scope>compile</scope>
+            <groupId>org.json4s</groupId>
+            <artifactId>json4s-core_${scala.binary.version}</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-            <scope>compile</scope>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
         </dependency>
 
         <dependency>
@@ -75,29 +68,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.scalatra</groupId>
-            <artifactId>scalatra-jetty_${scala.binary.version}</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scalatra</groupId>
-            <artifactId>scalatra-scalatest_${scala.binary.version}</artifactId>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_${scala.binary.version}</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.scalatra</groupId>
-            <artifactId>scalatra-json_2.10</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.json4s</groupId>
-            <artifactId>json4s_2.10</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.json4s</groupId>
-            <artifactId>json4s-jackson_2.10</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
 
     </dependencies>

+ 5 - 0
apps/spark/java/livy-repl/pom.xml

@@ -133,6 +133,11 @@
             <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.scalatra</groupId>
+            <artifactId>scalatra-json_${scala.binary.version}</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.py4j</groupId>
             <artifactId>py4j</artifactId>

+ 10 - 9
apps/spark/java/pom.xml

@@ -53,6 +53,7 @@
         <guava.version>11.0.2</guava.version>
         <httpclient.version>4.5</httpclient.version>
         <httpcore.version>4.4.1</httpcore.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <jetty.version>9.2.10.v20150310</jetty.version>
         <json4s.version>3.2.5</json4s.version>
         <logback.version>1.1.2</logback.version>
@@ -238,21 +239,20 @@
             </dependency>
 
             <dependency>
-                <groupId>org.scalatest</groupId>
-                <artifactId>scalatest_${scala.binary.version}</artifactId>
-                <version>${scalatest.version}</version>
-                <scope>test</scope>
+                <groupId>org.scalatra</groupId>
+                <artifactId>scalatra_${scala.binary.version}</artifactId>
+                <version>${scalatra.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.scalatra</groupId>
-                <artifactId>scalatra_${scala.binary.version}</artifactId>
+                <artifactId>scalatra-jetty_${scala.binary.version}</artifactId>
                 <version>${scalatra.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.scalatra</groupId>
-                <artifactId>scalatra-jetty_${scala.binary.version}</artifactId>
+                <artifactId>scalatra-json_${scala.binary.version}</artifactId>
                 <version>${scalatra.version}</version>
             </dependency>
 
@@ -264,9 +264,10 @@
             </dependency>
 
             <dependency>
-                <groupId>org.scalatra</groupId>
-                <artifactId>scalatra-json_${scala.binary.version}</artifactId>
-                <version>${scalatra.version}</version>
+                <groupId>org.scalatest</groupId>
+                <artifactId>scalatest_${scala.binary.version}</artifactId>
+                <version>${scalatest.version}</version>
+                <scope>test</scope>
             </dependency>
 
             <dependency>