From 426ccd3a659afc2c3814385c0129736e74ef790c Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 11 Sep 2017 15:53:20 -0600
Subject: [PATCH 1/3] compile with java7

---
 circle.yml                         | 2 +-
 spring-cloud-config-client/pom.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index d2f65f74..b3446ba3 100644
--- a/circle.yml
+++ b/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:
diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml
index 686f090f..4fb76004 100644
--- a/spring-cloud-config-client/pom.xml
+++ b/spring-cloud-config-client/pom.xml
@@ -82,6 +82,11 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>

From 6d89ed8059bfbcbeb27063b1f2c73e0a81bf73aa Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 11 Sep 2017 15:53:51 -0600
Subject: [PATCH 2/3] Update jsch for newer keys

fixes gh-780
---
 spring-cloud-config-dependencies/pom.xml       |  5 +++++
 .../PropertyBasedSshSessionFactoryTest.java    | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
index f7fb34b6..c8de615e 100644
--- a/spring-cloud-config-dependencies/pom.xml
+++ b/spring-cloud-config-dependencies/pom.xml
@@ -41,6 +41,11 @@
 			<!--<version>4.6.0.201612231935-r</version>-->
 			<version>3.6.1.201501031845-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>
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
index 318226fb..904a4d7b 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
@@ -16,10 +16,14 @@
 
 package org.springframework.cloud.config.server.ssh;
 
-import com.jcraft.jsch.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+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;
@@ -28,11 +32,11 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
+import com.jcraft.jsch.HostKey;
+import com.jcraft.jsch.HostKeyRepository;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.UserInfo;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.verify;

From 90564e05722090f05b8fb805ed53a7261d7620d6 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 11 Sep 2017 16:01:56 -0600
Subject: [PATCH 3/3] Add missing import

---
 .../config/server/ssh/PropertyBasedSshSessionFactoryTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
index 8e614e5e..3528b52a 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
@@ -38,6 +38,7 @@ import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.Session;
 import com.jcraft.jsch.UserInfo;
 
+import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;