From b555ddfe92df239517e28723c48b390215772ab1 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 11 Sep 2017 15:14:47 -0600 Subject: [PATCH 1/2] Move back to java7 compatible jgit. Fixes gh-780 --- spring-cloud-config-dependencies/pom.xml | 3 ++- .../server/environment/JGitEnvironmentRepository.java | 4 ++-- .../server/environment/JGitEnvironmentRepositoryTests.java | 6 +++--- .../server/ssh/PropertyBasedSshSessionFactoryTest.java | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 5f428051..f7fb34b6 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -38,7 +38,8 @@ org.eclipse.jgit org.eclipse.jgit - 4.6.0.201612231935-r + + 3.6.1.201501031845-r org.tmatesoft.svnkit diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index 7ad63742..6fb9ff7b 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -197,7 +197,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository checkout(git, label); } // always return what is currently HEAD as the version - return git.getRepository().findRef("HEAD").getObjectId().getName(); + return git.getRepository().getRef("HEAD").getObjectId().getName(); } catch (RefNotFoundException e) { throw new NoSuchLabelException("No such label: " + label, e); } catch (NoRemoteRepositoryException e) { @@ -311,7 +311,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository private MergeResult merge(Git git, String label) { try { MergeCommand merge = git.merge(); - merge.include(git.getRepository().findRef("origin/" + label)); + merge.include(git.getRepository().getRef("origin/" + label)); MergeResult result = merge.call(); if (!result.getMergeStatus().isSuccessful()) { this.logger.warn("Merged from remote " + label + " with result " + result.getMergeStatus()); diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java index 0d67d4ac..14a97124 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java @@ -379,7 +379,7 @@ public class JGitEnvironmentRepositoryTests { // refresh()->return // git.getRepository().getRef("HEAD").getObjectId().getName(); Ref headRef = mock(Ref.class); - when(repository.findRef(anyString())).thenReturn(headRef); + when(repository.getRef(anyString())).thenReturn(headRef); ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 }); when(headRef.getObjectId()).thenReturn(newObjectId); @@ -435,7 +435,7 @@ public class JGitEnvironmentRepositoryTests { //refresh()->return git.getRepository().getRef("HEAD").getObjectId().getName(); Ref headRef = mock(Ref.class); - when(repository.findRef(anyString())).thenReturn(headRef); + when(repository.getRef(anyString())).thenReturn(headRef); ObjectId newObjectId = ObjectId.fromRaw(new int[]{1,2,3,4,5}); when(headRef.getObjectId()).thenReturn(newObjectId); @@ -503,7 +503,7 @@ public class JGitEnvironmentRepositoryTests { // refresh()->return // git.getRepository().getRef("HEAD").getObjectId().getName(); Ref headRef = mock(Ref.class); - when(repository.findRef(anyString())).thenReturn(headRef); + when(repository.getRef(anyString())).thenReturn(headRef); ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 }); when(headRef.getObjectId()).thenReturn(newObjectId); 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 cf41ce6d..03e6abd7 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 @@ -19,6 +19,7 @@ package org.springframework.cloud.config.server.ssh; import com.jcraft.jsch.*; 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; @@ -117,6 +118,7 @@ public class PropertyBasedSshSessionFactoryTest { } @Test + @Ignore public void hostKeyIsUsed() throws Exception { SshUri sshKey = new SshUriProperties.SshUriPropertiesBuilder() .uri("git@gitlab.example.local:someorg/somerepo.git") From f995217841e0139c4886679cde10b3db7715acd6 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 11 Sep 2017 15:15:12 -0600 Subject: [PATCH 2/2] unignore test --- .../config/server/ssh/PropertyBasedSshSessionFactoryTest.java | 1 - 1 file changed, 1 deletion(-) 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 03e6abd7..318226fb 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 @@ -118,7 +118,6 @@ public class PropertyBasedSshSessionFactoryTest { } @Test - @Ignore public void hostKeyIsUsed() throws Exception { SshUri sshKey = new SshUriProperties.SshUriPropertiesBuilder() .uri("git@gitlab.example.local:someorg/somerepo.git")