aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-11-07 05:23:23 +0000
committerOlivier Lamy <olamy@apache.org>2013-11-07 05:23:23 +0000
commitb115d52d9f3b417c288ecb43bd45756b58344cea (patch)
treed32a4dd8ae285d9a82e83cb368f716e8d0754015
parentdbc237dc0336080737d326f95a46cf755efd9716 (diff)
downloadarchiva-b115d52d9f3b417c288ecb43bd45756b58344cea.tar.gz
archiva-b115d52d9f3b417c288ecb43bd45756b58344cea.zip
enforce httpcomponent version in pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1539525 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml14
-rw-r--r--pom.xml6
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>