Author: jdcasey
Date: Tue Apr 28 14:09:19 2009
New Revision: 769417
URL: http://svn.apache.org/viewvc?rev=769417&view=rev
Log:
update to use http wagon instead of lightweight http wagon, since httpclient is
already present for use in the webdav wagon.
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/branches/maven-2.1.x/maven-core/pom.xml
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/maven-2.1.x/pom.xml
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml?rev=769417&r1=769416&r2=769417&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml
(original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/pom.xml Tue
Apr 28 14:09:19 2009
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=769417&r1=769416&r2=769417&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Tue Apr 28 14:09:19 2009
@@ -34,7 +34,7 @@
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.UnsupportedProtocolException;
import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.providers.http.LightweightHttpWagon;
+import org.apache.maven.wagon.providers.http.HttpWagon;
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -420,7 +420,7 @@
private void runThread()
throws Exception
{
- LightweightHttpWagon wagon = (LightweightHttpWagon)
wagonManager.getWagon( repository );
+ HttpWagon wagon = (HttpWagon) wagonManager.getWagon(
repository );
assertEquals( TEST_USER_AGENT,
wagon.getHttpHeaders().getProperty( "User-Agent" ) );
container.release( wagon );
}
Modified: maven/components/branches/maven-2.1.x/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/pom.xml?rev=769417&r1=769416&r2=769417&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core/pom.xml Tue Apr 28
14:09:19 2009
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-http</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=769417&r1=769416&r2=769417&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Tue Apr 28 14:09:19 2009
@@ -619,5 +619,7 @@
<_configuration-file>~/.m2/settings-security.xml</_configuration-file>
</configuration>
</component>
+<!--
+ -->
</components>
</component-set>
Modified: maven/components/branches/maven-2.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=769417&r1=769416&r2=769417&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/pom.xml Tue Apr 28 14:09:19 2009
@@ -411,7 +411,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -471,7 +471,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version>
</dependency>
<dependency>
