lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-05-16 21:19:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #960 from htztomic

Browse Source 
* pr/960:
  Polish "Do not add snapshot repo unless absolutely necessary"
  Do not add snapshot repo unless absolutely necessary

Closes gh-960
This commit is contained in:
Stephane Nicoll 2019-07-25 12:31:27 +02:00
commit 7a1b986f2a
5 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
View File

@ -39,16 +39,25 @@ class SpringBootVersionRepositoriesBuildCustomizer implements BuildCustomizer<Bu
build.repositories().add("maven-central");
String qualifier = this.springBootVersion.getQualifier().getQualifier();
if (!"RELEASE".equals(qualifier)) {
MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots",
"https://repo.spring.io/snapshot", true);
build.repositories().add(snapshotRepository);
build.pluginRepositories().add(snapshotRepository);
MavenRepository milestoneRepository = new MavenRepository("spring-milestones", "Spring Milestones",
"https://repo.spring.io/milestone");
build.repositories().add(milestoneRepository);
build.pluginRepositories().add(milestoneRepository);
addMilestoneRepository(build);
if ("BUILD-SNAPSHOT".equals(qualifier)) {
addSnapshotRepository(build);
}
}
}
private void addSnapshotRepository(Build build) {
MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots",
"https://repo.spring.io/snapshot", true);
build.repositories().add(snapshotRepository);
build.pluginRepositories().add(snapshotRepository);
}
private void addMilestoneRepository(Build build) {
MavenRepository milestoneRepository = new MavenRepository("spring-milestones", "Spring Milestones",
"https://repo.spring.io/milestone");
build.repositories().add(milestoneRepository);
build.pluginRepositories().add(milestoneRepository);
}
}

22
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
View File

@ -41,17 +41,17 @@ class SpringBootVersionRepositoriesBuildCustomizerTests {
}
@Test
void addMavenCentralAndNonReleaseWhenUsingMilestone() {
void addMavenCentralAndMilestonesWhenUsingMilestone() {
MavenBuild build = new MavenBuild();
new SpringBootVersionRepositoriesBuildCustomizer(Version.parse("2.1.0.M1")).customize(build);
assertNonReleaseRepositories(build);
assertMavenCentralAndMilestonesRepositories(build);
}
@Test
void addMavenCentralAndNonReleaseWhenUsingReleaseCandidate() {
void addMavenCentralAndMilestonesWhenUsingReleaseCandidate() {
MavenBuild build = new MavenBuild();
new SpringBootVersionRepositoriesBuildCustomizer(Version.parse("2.1.0.RC1")).customize(build);
assertNonReleaseRepositories(build);
assertMavenCentralAndMilestonesRepositories(build);
}
@Test
@ -65,11 +65,21 @@ class SpringBootVersionRepositoriesBuildCustomizerTests {
List<MavenRepository> repositories = build.repositories().items().collect(Collectors.toList());
assertThat(repositories).hasSize(3);
assertThat(repositories.get(0)).isEqualTo(MavenRepository.MAVEN_CENTRAL);
assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-snapshots")
assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-milestones")
.hasFieldOrPropertyWithValue("name", "Spring Milestones")
.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/milestone")
.hasFieldOrPropertyWithValue("snapshotsEnabled", false);
assertThat(repositories.get(2)).hasFieldOrPropertyWithValue("id", "spring-snapshots")
.hasFieldOrPropertyWithValue("name", "Spring Snapshots")
.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/snapshot")
.hasFieldOrPropertyWithValue("snapshotsEnabled", true);
assertThat(repositories.get(2)).hasFieldOrPropertyWithValue("id", "spring-milestones")
}
private void assertMavenCentralAndMilestonesRepositories(MavenBuild build) {
List<MavenRepository> repositories = build.repositories().items().collect(Collectors.toList());
assertThat(repositories).hasSize(2);
assertThat(repositories.get(0)).isEqualTo(MavenRepository.MAVEN_CENTRAL);
assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-milestones")
.hasFieldOrPropertyWithValue("name", "Spring Milestones")
.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/milestone")
.hasFieldOrPropertyWithValue("snapshotsEnabled", false);

1
initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
View File

@ -11,7 +11,6 @@ sourceCompatibility = '1.8'
repositories {
mavenCentral()
maven { url 'https://repo.spring.io/snapshot' }
maven { url 'https://repo.spring.io/milestone' }
}

1
initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen
View File

@ -10,7 +10,6 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
repositories {
mavenCentral()
maven { url = uri("https://repo.spring.io/snapshot") }
maven { url = uri("https://repo.spring.io/milestone") }
}

16
initializr-generator-spring/src/test/resources/project/maven/repositories-milestone-pom.xml.gen
View File

@ -41,14 +41,6 @@
</build>
<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
@ -56,14 +48,6 @@
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>