diff --git a/pom.xml b/pom.xml index 8ef959b40de..eaabc50f0c8 100644 --- a/pom.xml +++ b/pom.xml @@ -78,14 +78,6 @@ false - - spring-release - Spring Release - https://repo.spring.io/ext-release-local - - false - - spring-milestone Spring Milestone diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java index 0e96288b652..d6b6462c75f 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java @@ -61,8 +61,6 @@ public final class RepositoryConfigurationFactory { MavenSettings mavenSettings = new MavenSettingsReader().readSettings(); List 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/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java index ff1a70b6aee..dae3305c8ec 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java @@ -40,7 +40,7 @@ public class RepositoryConfigurationFactoryTests { List 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 class RepositoryConfigurationFactoryTests { SystemProperties.doWithSystemProperties(() -> { List 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 class RepositoryConfigurationFactoryTests { List 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 class RepositoryConfigurationFactoryTests { List 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 class RepositoryConfigurationFactoryTests { .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/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java index 8c4540dc76c..171b034f6f3 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java +++ b/spring-boot-project/spring-boot-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 repositoryConfigurations = new ArrayList<>(); @@ -69,7 +65,7 @@ public class AetherGrapeEngineTests { @Test public void dependencyResolution() { Map 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 class AetherGrapeEngineTests { 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);