upgraded to svnkit 1.1.6

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@8154 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -266,19 +266,7 @@
     <dependency>
       <groupId>org.jvnet.hudson.svnkit</groupId>
       <artifactId>svnkit</artifactId>
-      <version>1.1.4-hudson-6</version>
-      <exclusions>
-        <!-- replaced by out patched version -->
-        <exclusion>
-          <groupId>ch.ethz.ganymed</groupId>
-          <artifactId>ganymed-ssh2</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>ganymed-ssh2</artifactId>
-      <version>build210-hudson-1</version>
+      <version>1.1.6-hudson-1</version>
     </dependency>
     <dependency>
       <groupId>${groupId}</groupId>

core/src/main/java/hudson/scm/SubversionSCM.java

 package hudson.scm;
 
-import ch.ethz.ssh2.SCPClient;
 import com.thoughtworks.xstream.XStream;
+import com.trilead.ssh2.SCPClient;
+import com.trilead.ssh2.DebugLogger;
 import hudson.FilePath;
 import hudson.FilePath.FileCallable;
 import hudson.Launcher;
@@ -1346,15 +1347,16 @@ public class SubversionSCM extends SCM implements Serializable {
      */
     public static void enableSshDebug(Level level) {
         if(level==null)     level= Level.FINEST; // default
-        
-        Logger ganymedLogger = Logger.getLogger(SCPClient.class.getPackage().getName());
-        ganymedLogger.setLevel(level);
-        ganymedLogger.setUseParentHandlers(false);
-        ConsoleHandler handler = new ConsoleHandler();
-        handler.setLevel(level);
-        ganymedLogger.addHandler(handler);
-
-        ch.ethz.ssh2.log.Logger.logLevel = 100;
+
+        final Level lv = level;
+
+        com.trilead.ssh2.log.Logger.enabled=true;
+        com.trilead.ssh2.log.Logger.logger = new DebugLogger() {
+            private final Logger LOGGER = Logger.getLogger(SCPClient.class.getPackage().getName());
+            public void log(int level, String className, String message) {
+                LOGGER.log(lv,className+' '+message);
+            }
+        };
     }
 
     /**

core/src/main/java/hudson/util/Protector.java

 package hudson.util;
 
-import ch.ethz.ssh2.crypto.Base64;
-
 import javax.crypto.SecretKey;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -10,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
 
+import com.trilead.ssh2.crypto.Base64;
+
 /**
  * Encrypt/decrypt data by using a "session" key that only lasts for
  * the duration of the server instance.

core/src/main/java/hudson/util/Scrambler.java

 package hudson.util;
 
-import ch.ethz.ssh2.crypto.Base64;
+import com.trilead.ssh2.crypto.Base64;
 
-import javax.crypto.SecretKey;
-import javax.crypto.KeyGenerator;
-import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.BadPaddingException;
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
-import java.security.GeneralSecurityException;
+import java.io.UnsupportedEncodingException;
 
 /**
  * Used when storing passwords in configuration files.