Skip to content

Commit 17ee49b

Browse files
snicollsnicoll
committed
Stop using repo.spring.io/milestone
As of this new major, all milestones should be shipped to central as well. This commit removes the inclusion of the milestone repository as this shouldn't be needed anymore. Closes gh-46420
1 parent 5620be0 commit 17ee49b

File tree

5 files changed

+29
-43
lines changed

5 files changed

+29
-43
lines changed

‎buildSrc/SpringRepositorySupport.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ class SpringRepositoriesExtension {
101101

102102
private void addRepositories(action) {
103103
addCommercialRepository("release", false, "/spring-enterprise-maven-prod-local", action)
104-
if (this.version.contains("-")) {
105-
addOssRepository("milestone", false, "/milestone", action)
106-
}
107104
if (this.version.endsWith("-SNAPSHOT")) {
108105
addCommercialRepository("snapshot", true, "/spring-enterprise-maven-dev-local", action)
109106
addOssRepository("snapshot", true, "/snapshot", action)

‎buildSrc/src/main/java/org/springframework/boot/build/artifacts/ArtifactRelease.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
public final class ArtifactRelease {
3030

31-
private static final String SPRING_REPO = "https://repo.spring.io/%s";
31+
private static final String SPRING_SNAPSHOT_REPO = "https://repo.spring.io/snapshot";
3232

3333
private static final String MAVEN_REPO = "https://repo.maven.apache.org/maven2";
3434

@@ -43,7 +43,7 @@ public String getType() {
4343
}
4444

4545
public String getDownloadRepo() {
46-
return (this.isRelease()) ? MAVEN_REPO : String.format(SPRING_REPO, this.getType());
46+
return (this.type == Type.SNAPSHOT) ? SPRING_SNAPSHOT_REPO : MAVEN_REPO;
4747
}
4848

4949
public boolean isRelease() {

‎buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void urlArtifactRepositoryWhenRelease() {
134134
void urlArtifactRepositoryWhenMilestone() {
135135
AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3-M1", true, BuildType.OPEN_SOURCE,
136136
null, mockDependencyVersions(), null);
137-
assertThat(attributes.get()).containsEntry("url-artifact-repository", "https://repo.spring.io/milestone");
137+
assertThat(attributes.get()).containsEntry("url-artifact-repository", "https://repo.maven.apache.org/maven2");
138138
}
139139

140140
@Test

‎buildSrc/src/test/java/org/springframework/boot/build/artifacts/ArtifactReleaseTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,19 @@ void whenProjectVersionIsSnapshotThenRepositoryIsArtifactorySnapshot() {
6666
}
6767

6868
@Test
69-
void whenProjectVersionIsMilestoneThenRepositoryIsArtifactoryMilestone() {
69+
void whenProjectVersionIsMilestoneThenRepositoryIsMavenCentral() {
7070
Project project = ProjectBuilder.builder().build();
71-
project.setVersion("1.2.3-M1");
72-
assertThat(ArtifactRelease.forProject(project).getDownloadRepo()).contains("repo.spring.io/milestone");
71+
project.setVersion("4.0.0-M1");
72+
assertThat(ArtifactRelease.forProject(project).getDownloadRepo())
73+
.contains("https://repo.maven.apache.org/maven2");
7374
}
7475

7576
@Test
76-
void whenProjectVersionIsReleaseCandidateThenRepositoryIsArtifactoryMilestone() {
77+
void whenProjectVersionIsReleaseCandidateThenRepositoryIsMavenCentral() {
7778
Project project = ProjectBuilder.builder().build();
78-
project.setVersion("1.2.3-RC1");
79-
assertThat(ArtifactRelease.forProject(project).getDownloadRepo()).contains("repo.spring.io/milestone");
79+
project.setVersion("4.0.0-RC1");
80+
assertThat(ArtifactRelease.forProject(project).getDownloadRepo())
81+
.contains("https://repo.maven.apache.org/maven2");
8082
}
8183

8284
@Test

‎buildSrc/src/test/java/org/springframework/boot/build/groovyscripts/SpringRepositoriesExtensionTests.java

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -80,57 +80,45 @@ static void cleanup() throws Exception {
8080
void mavenRepositoriesWhenNotCommercialSnapshot() {
8181
SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "oss");
8282
extension.mavenRepositories();
83-
assertThat(this.repositories).hasSize(2);
84-
verify(this.repositories.get(0)).setName("spring-oss-milestone");
85-
verify(this.repositories.get(0)).setUrl("https://repo.spring.io/milestone");
86-
verify(this.mavenContent.get(0)).releasesOnly();
87-
verify(this.repositories.get(1)).setName("spring-oss-snapshot");
88-
verify(this.repositories.get(1)).setUrl("https://repo.spring.io/snapshot");
89-
verify(this.mavenContent.get(1)).snapshotsOnly();
83+
assertThat(this.repositories).hasSize(1);
84+
verify(this.repositories.get(0)).setName("spring-oss-snapshot");
85+
verify(this.repositories.get(0)).setUrl("https://repo.spring.io/snapshot");
86+
verify(this.mavenContent.get(0)).snapshotsOnly();
9087
}
9188

9289
@Test
9390
void mavenRepositoriesWhenCommercialSnapshot() {
9491
SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "commercial");
9592
extension.mavenRepositories();
96-
assertThat(this.repositories).hasSize(4);
93+
assertThat(this.repositories).hasSize(3);
9794
verify(this.repositories.get(0)).setName("spring-commercial-release");
9895
verify(this.repositories.get(0))
9996
.setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local");
10097
verify(this.mavenContent.get(0)).releasesOnly();
101-
verify(this.repositories.get(1)).setName("spring-oss-milestone");
102-
verify(this.repositories.get(1)).setUrl("https://repo.spring.io/milestone");
103-
verify(this.mavenContent.get(1)).releasesOnly();
104-
verify(this.repositories.get(2)).setName("spring-commercial-snapshot");
105-
verify(this.repositories.get(2)).setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-dev-local");
98+
verify(this.repositories.get(1)).setName("spring-commercial-snapshot");
99+
verify(this.repositories.get(1)).setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-dev-local");
100+
verify(this.mavenContent.get(1)).snapshotsOnly();
101+
verify(this.repositories.get(2)).setName("spring-oss-snapshot");
102+
verify(this.repositories.get(2)).setUrl("https://repo.spring.io/snapshot");
106103
verify(this.mavenContent.get(2)).snapshotsOnly();
107-
verify(this.repositories.get(3)).setName("spring-oss-snapshot");
108-
verify(this.repositories.get(3)).setUrl("https://repo.spring.io/snapshot");
109-
verify(this.mavenContent.get(3)).snapshotsOnly();
110104
}
111105

112106
@Test
113107
void mavenRepositoriesWhenNotCommercialMilestone() {
114108
SpringRepositoriesExtension extension = createExtension("0.0.0-M1", "oss");
115109
extension.mavenRepositories();
116-
assertThat(this.repositories).hasSize(1);
117-
verify(this.repositories.get(0)).setName("spring-oss-milestone");
118-
verify(this.repositories.get(0)).setUrl("https://repo.spring.io/milestone");
119-
verify(this.mavenContent.get(0)).releasesOnly();
110+
assertThat(this.repositories).isEmpty();
120111
}
121112

122113
@Test
123114
void mavenRepositoriesWhenCommercialMilestone() {
124115
SpringRepositoriesExtension extension = createExtension("0.0.0-M1", "commercial");
125116
extension.mavenRepositories();
126-
assertThat(this.repositories).hasSize(2);
117+
assertThat(this.repositories).hasSize(1);
127118
verify(this.repositories.get(0)).setName("spring-commercial-release");
128119
verify(this.repositories.get(0))
129120
.setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local");
130121
verify(this.mavenContent.get(0)).releasesOnly();
131-
verify(this.repositories.get(1)).setName("spring-oss-milestone");
132-
verify(this.repositories.get(1)).setUrl("https://repo.spring.io/milestone");
133-
verify(this.mavenContent.get(1)).releasesOnly();
134122
}
135123

136124
@Test
@@ -155,7 +143,7 @@ void mavenRepositoriesWhenCommercialRelease() {
155143
void mavenRepositoriesWhenConditionMatches() {
156144
SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "oss");
157145
extension.mavenRepositories(true);
158-
assertThat(this.repositories).hasSize(2);
146+
assertThat(this.repositories).hasSize(1);
159147
}
160148

161149
@Test
@@ -169,9 +157,8 @@ void mavenRepositoriesWhenConditionDoesNotMatch() {
169157
void mavenRepositoriesExcludingBootGroup() {
170158
SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "oss");
171159
extension.mavenRepositoriesExcludingBootGroup();
172-
assertThat(this.contents).hasSize(2);
160+
assertThat(this.contents).hasSize(1);
173161
verify(this.contents.get(0)).excludeGroup("org.springframework.boot");
174-
verify(this.contents.get(1)).excludeGroup("org.springframework.boot");
175162
}
176163

177164
@Test
@@ -185,9 +172,9 @@ void mavenRepositoriesWithRepositorySpecificEnvironmentVariables() {
185172
environment.put("COMMERCIAL_SNAPSHOT_REPO_PASSWORD", "spass");
186173
SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "commercial", environment::get);
187174
extension.mavenRepositories();
188-
assertThat(this.repositories).hasSize(4);
175+
assertThat(this.repositories).hasSize(3);
189176
verify(this.repositories.get(0)).setUrl("curl");
190-
verify(this.repositories.get(2)).setUrl("surl");
177+
verify(this.repositories.get(1)).setUrl("surl");
191178
assertThat(this.credentials).hasSize(2);
192179
verify(this.credentials.get(0)).setUsername("cuser");
193180
verify(this.credentials.get(0)).setPassword("cpass");
@@ -203,9 +190,9 @@ void mavenRepositoriesWhenRepositoryEnvironmentVariables() {
203190
environment.put("COMMERCIAL_REPO_PASSWORD", "pass");
204191
SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "commercial", environment::get);
205192
extension.mavenRepositories();
206-
assertThat(this.repositories).hasSize(4);
193+
assertThat(this.repositories).hasSize(3);
207194
verify(this.repositories.get(0)).setUrl("url");
208-
verify(this.repositories.get(2)).setUrl("url");
195+
verify(this.repositories.get(1)).setUrl("url");
209196
assertThat(this.credentials).hasSize(2);
210197
verify(this.credentials.get(0)).setUsername("user");
211198
verify(this.credentials.get(0)).setPassword("pass");

0 commit comments

Comments
 (0)