From b115d52d9f3b417c288ecb43bd45756b58344cea Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 7 Nov 2013 05:23:23 +0000
Subject: enforce httpcomponent version in pom

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1539525 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/archiva-web/archiva-webapp/pom.xml | 14 ++++++++++++--
 pom.xml                                            |  6 ++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 69b592e47..355459322 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -350,7 +350,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>${httpclient.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -361,7 +360,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>${httpclient.core.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -369,6 +367,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpasyncclient</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
diff --git a/pom.xml b/pom.xml
index 53ee97aef..8b9cc1378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1293,6 +1293,12 @@
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpasyncclient</artifactId>
         <version>4.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
-- 
cgit v1.2.3