svn commit: r686244 - in /maven/components/branches/maven-2.0.10-RC/maven-core: pom.xml src/main/java/org/apache/maven/DefaultMaven.java

[brett]

Author: brett
Date: Fri Aug 15 07:46:58 2008
New Revision: 686244

URL: http://svn.apache.org/viewvc?rev=686244&view=rev
Log:
[MNG-3717] Maven prompts for a password when one is provided over SSH in some 
circumstances

Modified:
    maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml
    
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml?rev=686244&r1=686243&r2=686244&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml Fri Aug 15 
07:46:58 2008
@@ -122,7 +122,9 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ssh</artifactId>
+<!-- reset once workaround in DefaultMaven removed
       <scope>runtime</scope>
+-->
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

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=686244&r1=686243&r2=686244&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
 Fri Aug 15 07:46:58 2008
@@ -671,6 +671,13 @@
                 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() );