Fixed dependency on plexus-utils to use proper version 2.1 as requested via CQ 5630 Fixed dependency on HTTP wagon to use wagon-ahc:1.2.1 as requested via CQ 5659
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/a3a0594f Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/a3a0594f Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/a3a0594f Branch: refs/heads/demo Commit: a3a0594fa179276a52bebe6b1a3bf4eb6ea0a803 Parents: 2b0ef62 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Tue Nov 1 21:23:54 2011 +0100 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Tue Nov 1 21:23:54 2011 +0100 ---------------------------------------------------------------------- aether-demo-snippets/pom.xml | 14 ++++---------- .../aether/demo/manual/ManualWagonProvider.java | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/a3a0594f/aether-demo-snippets/pom.xml ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/pom.xml b/aether-demo-snippets/pom.xml index 9eeb35e..84e990f 100644 --- a/aether-demo-snippets/pom.xml +++ b/aether-demo-snippets/pom.xml @@ -93,20 +93,14 @@ <version>${wagonVersion}</version> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <version>${wagonVersion}</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-shared</artifactId> - </exclusion> - </exclusions> + <groupId>org.sonatype.maven</groupId> + <artifactId>wagon-ahc</artifactId> + <version>1.2.1</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>2.0.7</version> + <version>2.1</version> </dependency> <dependency> <groupId>org.sonatype.sisu</groupId> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/a3a0594f/aether-demo-snippets/src/main/java/org/eclipse/aether/demo/manual/ManualWagonProvider.java ---------------------------------------------------------------------- diff --git a/aether-demo-snippets/src/main/java/org/eclipse/aether/demo/manual/ManualWagonProvider.java b/aether-demo-snippets/src/main/java/org/eclipse/aether/demo/manual/ManualWagonProvider.java index af75da0..0a48c56 100644 --- a/aether-demo-snippets/src/main/java/org/eclipse/aether/demo/manual/ManualWagonProvider.java +++ b/aether-demo-snippets/src/main/java/org/eclipse/aether/demo/manual/ManualWagonProvider.java @@ -11,8 +11,8 @@ package org.eclipse.aether.demo.manual; import org.apache.maven.wagon.Wagon; -import org.apache.maven.wagon.providers.http.LightweightHttpWagon; import org.eclipse.aether.connector.wagon.WagonProvider; +import org.sonatype.maven.wagon.AhcWagon; /** * A simplistic provider for wagon instances when no Plexus-compatible IoC container is used. @@ -26,7 +26,7 @@ public class ManualWagonProvider { if ( "http".equals( roleHint ) ) { - return new LightweightHttpWagon(); + return new AhcWagon(); } return null; }
