diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-08-23 13:55:11 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-08-23 13:55:11 +0000 |
| commit | 95e2f5b63692cea6c70e29bce3437849f6a11f35 (patch) | |
| tree | 48c53a000b4d60c3112def7dd1e5ab704ae2ebe6 /archiva-modules/archiva-base | |
| parent | 97f001e967184eb422c44b64f480a40694f46864 (diff) | |
| download | archiva-95e2f5b63692cea6c70e29bce3437849f6a11f35.tar.gz archiva-95e2f5b63692cea6c70e29bce3437849f6a11f35.zip | |
[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
Diffstat (limited to 'archiva-modules/archiva-base')
3 files changed, 22 insertions, 5 deletions
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 2d78604cf..f731a632f 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -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> diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml index 8c9e3968c..72b5bca98 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml @@ -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> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 7ab1457fc..11b5457a9 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -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> |