Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1503] use wagon-http instead of wagon-http-lightweight (as it change proxy network system properties) 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160694 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-08-23 13:55:11 +00:00
parent 97f001e967
commit 95e2f5b636
6 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
View File

@ -44,6 +44,14 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
<!-- olamy : weird enforcer doesn't have it but failed IMHO issue in enforcer plugin !!
<exclusions>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</exclusion>
</exclusions>
-->
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>

11
archiva-modules/archiva-base/archiva-proxy-common/pom.xml
View File

@ -9,9 +9,6 @@
</parent>
<artifactId>archiva-proxy-common</artifactId>
<name>Archiva Base :: Proxy Common</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
@ -28,8 +25,14 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>

8
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -109,9 +109,15 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<artifactId>wagon-http</artifactId>
<version>${wagon.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

2
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -348,7 +348,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<artifactId>wagon-http</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>

2
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

@ -134,7 +134,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
<exclusions>
<!-- This triggers httpunit to use it instead, but it doesn't work -->

7
pom.xml
View File

@ -996,12 +996,12 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<artifactId>wagon-http</artifactId>
<version>${wagon.version}</version>
<exclusions>
<exclusion>
<groupId>nekohtml</groupId>
<artifactId>xercesMinimal</artifactId>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -1331,6 +1331,7 @@
<exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude>
<exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude>
<exclude>>org.codehaus.plexus:plexus-taskqueue</exclude>
<exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude>
</excludes>
</bannedDependencies>
</rules>