commit 4637fbc56102cbcd9c0ddd6606987b7efc1d6b5a
author Lyor Goldstein <lyor.goldstein@gmail.com> Thu Jul 14 07:10:58 2016 +0300
committer Lyor Goldstein <lyor.goldstein@gmail.com> Thu Jul 14 07:10:58 2016 +0300
tree d7fdab64a94c6c7f5c2cf02064d7a5a170a35037
parent be446cc003f51b0470a5619a6aee03e15f36470f

[SSHD-674] Update minimum required Java version to 1.8

- Disabled GitPackCommandTest#testGitPack on Windows due to activation of TortoisePLink

pom.xml

diff --git a/pom.xml b/pom.xml
index 92dc6c6..5d8b186 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <java.major.version>1</java.major.version>
-        <java.minor.version>7</java.minor.version>
+        <java.minor.version>8</java.minor.version>
         <sniffer.signatures.version>1.0</sniffer.signatures.version>
         <javac.source>${java.major.version}.${java.minor.version}</javac.source>
         <project.build.java.source>${javac.source}</project.build.java.source>
@@ -412,7 +412,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>animal-sniffer-maven-plugin</artifactId>
-					<version>1.14</version>
+					<version>1.15</version>
 					<configuration>
 						<signature>
 							<groupId>org.codehaus.mojo.signature</groupId>

sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java

diff --git a/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java b/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java
index 37b79fe..be818b7 100644
--- a/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java
+++ b/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java
@@ -25,9 +25,11 @@
 import com.jcraft.jsch.JSch;
 
 import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.util.OsUtils;
 import org.apache.sshd.git.transport.GitSshdSessionFactory;
 import org.apache.sshd.server.Command;
 import org.apache.sshd.server.SshServer;
+import org.apache.sshd.server.auth.password.AcceptAllPasswordAuthenticator;
 import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
 import org.apache.sshd.util.test.BaseTestSupport;
 import org.apache.sshd.util.test.JSchLogger;
@@ -36,6 +38,7 @@
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.SshSessionFactory;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -54,8 +57,17 @@
         JSchLogger.init();
     }
 
+    @Override
+    protected SshServer setupTestServer() {
+        SshServer server = super.setupTestServer();
+        server.setPasswordAuthenticator(AcceptAllPasswordAuthenticator.INSTANCE);
+        return server;
+    }
+
     @Test
     public void testGitPack() throws Exception {
+        Assume.assumeFalse("On windows this activates TortoisePlink", OsUtils.isWin32());
+
         Path targetParent = detectTargetFolder().getParent();
         Path gitRootDir = getTempTargetRelativeFile(getClass().getSimpleName());