You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/02/19 08:27:35 UTC
svn commit: r745765 - in /maven/components/branches/maven-2.1.x:
maven-core/src/main/java/org/apache/maven/DefaultMaven.java pom.xml
Author: brett
Date: Thu Feb 19 07:27:35 2009
New Revision: 745765
URL: http://svn.apache.org/viewvc?rev=745765&view=rev
Log:
[MNG-4043] [MNG-3842] remove temporary changes and upgrade to wagon 1.0-beta-5 to address some known issues
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-2.1.x/pom.xml
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=745765&r1=745764&r2=745765&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Thu Feb 19 07:27:35 2009
@@ -63,7 +63,6 @@
import org.apache.maven.settings.Settings;
import org.apache.maven.usability.SystemWarnings;
import org.apache.maven.usability.diagnostics.ErrorDiagnostics;
-import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
@@ -734,13 +733,6 @@
wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), passWord,
server.getPrivateKey(), passPhrase );
- // 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.1.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=745765&r1=745764&r2=745765&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/pom.xml Thu Feb 19 07:27:35 2009
@@ -261,7 +261,7 @@
<properties>
<mavenVersion>2.1.0-M2-SNAPSHOT</mavenVersion>
- <wagonVersion>1.0-beta-4</wagonVersion>
+ <wagonVersion>1.0-beta-5-SNAPSHOT</wagonVersion>
</properties>
<!--start-->