Fixing mege conflicts

spring-cloud-config-dependencies/pom.xml

@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-config-dependencies</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-config-dependencies</name>
 	<description>Spring Cloud Config Dependencies</description>
@@ -68,14 +68,9 @@
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jgit</groupId>
-				<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
+				<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
 				<version>${jgit.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.jcraft</groupId>
-				<artifactId>jsch</artifactId>
-				<version>0.1.55</version>
-			</dependency>
 			<dependency>
 				<groupId>org.tmatesoft.svnkit</groupId>
 				<artifactId>svnkit</artifactId>

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java

@@ -50,10 +50,7 @@ import org.eclipse.jgit.lib.BranchTrackingStatus;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.FetchResult;
-import org.eclipse.jgit.transport.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.OpenSshConfig.Host;
 import org.eclipse.jgit.transport.ReceiveCommand;
-import org.eclipse.jgit.transport.SshSessionFactory;
 import org.eclipse.jgit.transport.TagOpt;
 import org.eclipse.jgit.transport.TrackingRefUpdate;
 import org.eclipse.jgit.util.FileUtils;
@@ -135,8 +132,6 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 	 */
 	private boolean forcePull;
 
-	private boolean initialized;
-
 	/**
 	 * Flag to indicate that the branch should be deleted locally if it's origin tracked
 	 * branch was removed.
@@ -151,8 +146,11 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 
 	private boolean tryMasterBranch;
 
-	public JGitEnvironmentRepository(ConfigurableEnvironment environment, JGitEnvironmentProperties properties) {
-		super(environment, properties);
+	private final ObservationRegistry observationRegistry;
+
+	public JGitEnvironmentRepository(ConfigurableEnvironment environment, JGitEnvironmentProperties properties,
+			ObservationRegistry observationRegistry) {
+		super(environment, properties, observationRegistry);
 		this.cloneOnStart = properties.isCloneOnStart();
 		this.defaultLabel = properties.getDefaultLabel();
 		this.forcePull = properties.isForcePull();
@@ -162,6 +160,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 		this.skipSslValidation = properties.isSkipSslValidation();
 		this.gitFactory = new JGitFactory(properties.isCloneSubmodules());
 		this.tryMasterBranch = properties.isTryMasterBranch();
+		this.observationRegistry = observationRegistry;
 	}
 
 	public boolean isTryMasterBranch() {
@@ -279,7 +278,6 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 	@Override
 	public synchronized void afterPropertiesSet() throws Exception {
 		Assert.state(getUri() != null, MESSAGE);
-		initialize();
 		if (this.cloneOnStart) {
 			initClonedRepository();
 		}
@@ -677,18 +675,6 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 		}
 	}
 
-	private void initialize() {
-		if (!this.initialized) {
-			SshSessionFactory.setInstance(new JschConfigSessionFactory() {
-				@Override
-				protected void configure(Host hc, Session session) {
-					session.setConfig("StrictHostKeyChecking", isStrictHostKeyChecking() ? "yes" : "no");
-				}
-			});
-			this.initialized = true;
-		}
-	}
-
 	private void configureCommand(TransportCommand<?, ?> command) {
 		command.setTimeout(this.timeout);
 		if (this.transportConfigCallback != null) {

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java

@@ -805,7 +805,7 @@ public class AwsParameterStoreEnvironmentRepositoryTests {
 	public void testOrderPopulation() {
 		int expectedOrder = Ordered.HIGHEST_PRECEDENCE;
 		AwsParameterStoreEnvironmentRepositoryFactory factory = new AwsParameterStoreEnvironmentRepositoryFactory(
-			new ConfigServerProperties());
+				new ConfigServerProperties());
 		AwsParameterStoreEnvironmentProperties properties = new AwsParameterStoreEnvironmentProperties();
 		properties.setRegion("us-east-1");
 		properties.setEndpoint("https://myawsendpoint/");