Ver código fonte

[livy] Explicitly use a version of httpcore and httpclient

This fixes compilation on the latest hadoop
Erick Tryzelaar 10 anos atrás
pai
commit
6c0011c
2 arquivos alterados com 36 adições e 0 exclusões
  1. 22 0
      apps/spark/java/livy-repl/pom.xml
  2. 14 0
      apps/spark/java/pom.xml

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

@@ -25,6 +25,28 @@
             <groupId>org.scalatra</groupId>
             <artifactId>scalatra-scalatest_${scala.binary.version}</artifactId>
             <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.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

+ 14 - 0
apps/spark/java/pom.xml

@@ -56,6 +56,8 @@
         <scalatra.version>2.3.0</scalatra.version>
         <dispatch.version>0.11.2</dispatch.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <httpclient.version>4.5</httpclient.version>
+        <httpcore.version>4.4.1</httpcore.version>
     </properties>
 
     <modules>
@@ -210,6 +212,18 @@
                 <version>${dispatch.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${httpcore.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>