Merge branch 'master' into 2.0.x

circle.yml

@@ -4,7 +4,7 @@ general:
       - gh-pages # list of branches to ignore
 machine:
   java:
-    version: openjdk8 #Open JDK has the JCE extentions installed by default
+    version: openjdk7 #Open JDK has the JCE extentions installed by default
   environment:
     _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
 dependencies:

spring-cloud-config-client/pom.xml

@@ -81,6 +81,11 @@
 			<artifactId>spring-cloud-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>

spring-cloud-config-dependencies/pom.xml

@@ -40,6 +40,11 @@
 			<artifactId>org.eclipse.jgit</artifactId>
 			<version>4.8.0.201706111038-r</version>
 		</dependency>
+		<dependency>
+			<groupId>com.jcraft</groupId>
+			<artifactId>jsch</artifactId>
+			<version>0.1.54</version>
+		</dependency>
 		<dependency>
 			<groupId>org.tmatesoft.svnkit</groupId>
 			<artifactId>svnkit</artifactId>

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java

@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.eclipse.jgit.transport.OpenSshConfig.Host;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -43,6 +42,11 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 /**
  * Unit tests for property based SSH config processor
  * @author William Tran