root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

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

This commit reverts:

 - 362735c
 - a6a8195

Closes gh-10738
This commit is contained in:
Andy Wilkinson 2017-10-21 11:35:31 +01:00
parent a6a8195ea8
commit b7ce3e00a1
4 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -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>

2
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
View File

@ -61,8 +61,6 @@ public final class RepositoryConfigurationFactory {
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);

13
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java
View File

@ -40,7 +40,7 @@ public class RepositoryConfigurationFactoryTests {
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 class RepositoryConfigurationFactoryTests {
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 class RepositoryConfigurationFactoryTests {
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 class RepositoryConfigurationFactoryTests {
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 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");
}

8
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
View File

@ -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 @@ public class AetherGrapeEngineTests {
@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 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);