From cb8d7bc12f565f1c694d8ee17c9da635732018eb Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 22 Aug 2019 13:24:49 -0400
Subject: [PATCH] Cherry picking commit add8f26

---
 .../EnvironmentRepositoryConfiguration.java   |  1 -
 .../NativeBootstrapFailureAnalyzerTests.java  | 55 -------------------
 .../test/resources/enable-nativebootstrap.yml |  5 --
 3 files changed, 61 deletions(-)
 delete mode 100644 spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java
 delete mode 100644 spring-cloud-config-server/src/test/resources/enable-nativebootstrap.yml

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
index 37c5f2ff..30b04b5d 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
@@ -255,7 +255,6 @@ class DefaultRepositoryConfiguration {
 }
 
 @Configuration
-@ConditionalOnMissingBean(EnvironmentRepository.class)
 @Profile("native")
 class NativeRepositoryConfiguration {
 
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java
deleted file mode 100644
index 7d934a08..00000000
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.config.server;
-
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.test.rule.OutputCapture;
-import org.springframework.cloud.config.server.diagnostics.GitUriFailureAnalyzer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * @author Ryan Baxter
- */
-public class NativeBootstrapFailureAnalyzerTests {
-
-	@Rule
-	public OutputCapture outputCapture = new OutputCapture();
-
-	@Test
-	public void contextLoads() {
-		try {
-			new SpringApplicationBuilder(ConfigServerApplication.class)
-					.web(WebApplicationType.SERVLET)
-					.properties("spring.cloud.bootstrap.name:enable-nativebootstrap")
-					.profiles("test", "native").run();
-			fail("Application started successfully");
-		}
-		catch (Exception ex) {
-			assertThat(this.outputCapture.toString())
-					.contains(GitUriFailureAnalyzer.ACTION);
-			assertThat(this.outputCapture.toString())
-					.contains(GitUriFailureAnalyzer.DESCRIPTION);
-		}
-	}
-
-}
diff --git a/spring-cloud-config-server/src/test/resources/enable-nativebootstrap.yml b/spring-cloud-config-server/src/test/resources/enable-nativebootstrap.yml
deleted file mode 100644
index 66226479..00000000
--- a/spring-cloud-config-server/src/test/resources/enable-nativebootstrap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-spring:
-  cloud:
-    config:
-      server:
-        bootstrap: true