Revert Reactor Bismuth-SR1 work arounds as it is now in Central

This commit reverts: - 362735c - a6a8195 Closes spring-projectsgh-10738
kekemu · Oct 21, 2017 · b7ce3e0 · b7ce3e0
1 parent a6a8195
commit b7ce3e0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -78,14 +78,6 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>spring-release</id>
-			<name>Spring Release</name>
-			<url>https://repo.spring.io/ext-release-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
 		<repository>
 			<id>spring-milestone</id>
 			<name>Spring Milestone</name>

diff --git a/...i/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/...i/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
@@ -61,8 +61,6 @@ public static List<RepositoryConfiguration> createDefaultRepositoryConfiguration
 		MavenSettings mavenSettings = new MavenSettingsReader().readSettings();
 		List<RepositoryConfiguration> repositoryConfiguration = new ArrayList<>();
 		repositoryConfiguration.add(MAVEN_CENTRAL);
-		repositoryConfiguration.add(new RepositoryConfiguration("spring-ext-release",
-				URI.create("https://repo.spring.io/ext-release-local"), false));
 		if (!Boolean.getBoolean("disableSpringSnapshotRepos")) {
 			repositoryConfiguration.add(SPRING_MILESTONE);
 			repositoryConfiguration.add(SPRING_SNAPSHOT);

diff --git a/.../test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java b/.../test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java
@@ -40,7 +40,7 @@ public void defaultRepositories() {
 			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
 					.createDefaultRepositoryConfiguration();
 			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-					"spring-snapshot", "spring-milestone", "spring-ext-release");
+					"spring-snapshot", "spring-milestone");
 		}, "user.home:src/test/resources/maven-settings/basic");
 	}
 
@@ -49,8 +49,7 @@ public void snapshotRepositoriesDisabled() {
 		SystemProperties.doWithSystemProperties(() -> {
 			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
 					.createDefaultRepositoryConfiguration();
-			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-					"spring-ext-release");
+			assertRepositoryConfiguration(repositoryConfiguration, "central", "local");
 		}, "user.home:src/test/resources/maven-settings/basic",
 				"disableSpringSnapshotRepos:true");
 	}
@@ -61,8 +60,7 @@ public void activeByDefaultProfileRepositories() {
 			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
 					.createDefaultRepositoryConfiguration();
 			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-					"spring-snapshot", "spring-milestone", "active-by-default",
-					"spring-ext-release");
+					"spring-snapshot", "spring-milestone", "active-by-default");
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories");
 	}
 
@@ -72,8 +70,7 @@ public void activeByPropertyProfileRepositories() {
 			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
 					.createDefaultRepositoryConfiguration();
 			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-					"spring-snapshot", "spring-milestone", "active-by-property",
-					"spring-ext-release");
+					"spring-snapshot", "spring-milestone", "active-by-property");
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories",
 				"foo:bar");
 	}
@@ -85,7 +82,7 @@ public void interpolationProfileRepositories() {
 					.createDefaultRepositoryConfiguration();
 			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
 					"spring-snapshot", "spring-milestone", "interpolate-releases",
-					"interpolate-snapshots", "spring-ext-release");
+					"interpolate-snapshots");
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories",
 				"interpolate:true");
 	}

diff --git a/...cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/...cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
@@ -49,10 +49,6 @@ public class AetherGrapeEngineTests {
 	private final RepositoryConfiguration springMilestones = new RepositoryConfiguration(
 			"spring-milestones", URI.create("https://repo.spring.io/milestone"), false);
 
-	private final RepositoryConfiguration springExtRelease = new RepositoryConfiguration(
-			"spring-milestones", URI.create("https://repo.spring.io/ext-release-local"),
-			false);
-
 	private AetherGrapeEngine createGrapeEngine(
 			RepositoryConfiguration... additionalRepositories) {
 		List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<>();
@@ -69,7 +65,7 @@ private AetherGrapeEngine createGrapeEngine(
 	@Test
 	public void dependencyResolution() {
 		Map<String, Object> args = new HashMap<>();
-		createGrapeEngine(this.springMilestones, this.springExtRelease).grab(args,
+		createGrapeEngine(this.springMilestones).grab(args,
 				createDependency("org.springframework", "spring-jdbc", null));
 		assertThat(this.groovyClassLoader.getURLs()).hasSize(5);
 	}
@@ -134,7 +130,7 @@ public void dependencyResolutionWithCustomClassLoader() {
 		GroovyClassLoader customClassLoader = new GroovyClassLoader();
 		args.put("classLoader", customClassLoader);
 
-		createGrapeEngine(this.springMilestones, this.springExtRelease).grab(args,
+		createGrapeEngine(this.springMilestones).grab(args,
 				createDependency("org.springframework", "spring-jdbc", null));
 
 		assertThat(this.groovyClassLoader.getURLs().length).isEqualTo(0);