Author: brianf Date: Mon Dec 8 19:33:25 2008 New Revision: 724593 URL: http://svn.apache.org/viewvc?rev=724593&view=rev Log: Roll back 2.0.x to wagon beta-2
Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/components/branches/maven-2.0.10-RC/pom.xml Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=724593&r1=724592&r2=724593&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Dec 8 19:33:25 2008 @@ -50,7 +50,6 @@ import org.apache.maven.wagon.events.TransferListener; import org.apache.maven.wagon.observers.ChecksumObserver; import org.apache.maven.wagon.proxy.ProxyInfo; -import org.apache.maven.wagon.proxy.ProxyInfoProvider; import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.repository.RepositoryPermissions; import org.codehaus.plexus.PlexusConstants; @@ -241,11 +240,7 @@ } } - wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider(){ - public ProxyInfo getProxyInfo(String protocol) { - return (ProxyInfo) proxies.get( protocol ); - } - }); + wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), getProxy(protocol)); wagon.put( source, remotePath ); @@ -443,11 +438,7 @@ try { wagon.connect( new Repository( repository.getId(), repository.getUrl() ), - getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider(){ - public ProxyInfo getProxyInfo(String protocol) { - return (ProxyInfo) proxies.get( protocol ); - } - }); + getAuthenticationInfo( repository.getId() ),getProxy(protocol)); boolean firstRun = true; boolean retry = true; Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java?rev=724593&r1=724592&r2=724593&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java Mon Dec 8 19:33:25 2008 @@ -19,8 +19,6 @@ * under the License. */ -import java.io.File; -import java.io.InputStream; import java.util.HashMap; import java.util.Map; @@ -31,9 +29,7 @@ import org.apache.maven.wagon.StreamWagon; import org.apache.maven.wagon.TransferFailedException; import org.apache.maven.wagon.authentication.AuthenticationException; -import org.apache.maven.wagon.authorization.AuthorizationException; import org.apache.maven.wagon.resource.Resource; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringInputStream; import org.codehaus.plexus.util.StringOutputStream; @@ -58,7 +54,7 @@ } public void fillInputData( InputData inputData ) - throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + throws TransferFailedException, ResourceDoesNotExistException { Resource resource = inputData.getResource(); @@ -92,4 +88,10 @@ { expectedContent.clear(); } + + public void openConnection() throws ConnectionException, + AuthenticationException { + // TODO Auto-generated method stub + + } } Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java?rev=724593&r1=724592&r2=724593&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonString.java Mon Dec 8 19:33:25 2008 @@ -24,8 +24,10 @@ import java.util.Map; import org.apache.maven.wagon.AbstractWagon; +import org.apache.maven.wagon.ConnectionException; import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.TransferFailedException; +import org.apache.maven.wagon.authentication.AuthenticationException; import org.apache.maven.wagon.authorization.AuthorizationException; import org.apache.maven.wagon.events.TransferEvent; import org.apache.maven.wagon.resource.Resource; @@ -104,4 +106,10 @@ { return new String[] { "string" }; } + + public void openConnection() throws ConnectionException, + AuthenticationException { + // TODO Auto-generated method stub + + } } Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=724593&r1=724592&r2=724593&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon Dec 8 19:33:25 2008 @@ -633,12 +633,6 @@ wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), server.getPassword(), server.getPrivateKey(), server.getPassphrase() ); - // Remove once Wagon is upgraded to 1.0-beta-5 - if ( server.getPassword() != null ) - { - // setting this globally is not ideal, but not harmful - com.jcraft.jsch.JSch.setConfig( "PreferredAuthentications", "gssapi-with-mic,publickey,password,keyboard-interactive" ); - } wagonManager.addPermissionInfo( server.getId(), server.getFilePermissions(), server.getDirectoryPermissions() ); Modified: maven/components/branches/maven-2.0.10-RC/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=724593&r1=724592&r2=724593&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/pom.xml (original) +++ maven/components/branches/maven-2.0.10-RC/pom.xml Mon Dec 8 19:33:25 2008 @@ -259,7 +259,7 @@ <properties> <mavenVersion>2.0.10-RC5-SNAPSHOT</mavenVersion> - <wagonVersion>1.0-beta-4</wagonVersion> + <wagonVersion>1.0-beta-2</wagonVersion> </properties> <!--start-->