fix dependency converge issue for httpclient ( searchbox-io#102 )

allanim · Feb 26, 2014 · d59e26e · d59e26e
1 parent 3d5b579
commit d59e26e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/jest/pom.xml b/jest/pom.xml
@@ -25,10 +25,6 @@
         </dependency>
 
         <!-- Http components -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore-nio</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -71,8 +71,8 @@
         <elasticsearch.version>0.90.5</elasticsearch.version>
         <elasticsearch-test.version>0.90.5</elasticsearch-test.version>
 
-        <httpComponent.version>4.3.1</httpComponent.version>
-        <httpClient.version>4.3.2</httpClient.version>
+        <httpcore.version>4.3.1</httpcore.version>
+        <httpclient.version>4.3.2</httpclient.version>
         <httpAsyncClient.version>4.0</httpAsyncClient.version>
         <httpclientandroidlib.version>1.1.2</httpclientandroidlib.version>
 
@@ -224,25 +224,40 @@
             </dependency>
 
             <!-- Http components -->
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>${httpComponent.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore-nio</artifactId>
-                <version>${httpComponent.version}</version>
+                <version>${httpcore.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>${httpClient.version}</version>
+                <version>${httpclient.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpasyncclient</artifactId>
                 <version>${httpAsyncClient.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore-nio</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>