Skip to content

Commit 07fcb67

Browse files
committed
Use repo.maven.apache.org consistently
Maven Central has two canonical URLs [1]: - https://repo1.maven.org - https://repo.maven.apache.org This commit updates the codebase to only use repo.maven.apache.org. Closes gh-33938 [1] https://central.sonatype.org/news/20190715_http_deprecation_update/#canonical-urls
1 parent 2518139 commit 07fcb67

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class HomebrewFormula extends DefaultTask {
4646

4747
private static final String SPRING_REPO = "https://repo.spring.io/%s";
4848

49-
private static final String MAVEN_REPO = "https://repo1.maven.org/maven2";
49+
private static final String MAVEN_REPO = "https://repo.maven.apache.org/maven2";
5050

5151
private Provider<RegularFile> archive;
5252

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sdkman/SdkmanService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class SdkmanService {
4040

4141
private static final String SDKMAN_URL = "https://vendors.sdkman.io/";
4242

43-
private static final String DOWNLOAD_URL = "https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-cli/"
43+
private static final String DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/"
4444
+ "%s/spring-boot-cli-%s-bin.zip";
4545

4646
private static final String CHANGELOG_URL = "https://github.com/spring-projects/spring-boot/releases/tag/v%s";

ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/sdkman/SdkmanServiceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void tearDown() {
5555
@Test
5656
void publishWhenMakeDefaultTrue() {
5757
setupExpectation("https://vendors.sdkman.io/release",
58-
"{\"candidate\": \"springboot\", \"version\": \"1.2.3\", \"url\": \"https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-cli/1.2.3/spring-boot-cli-1.2.3-bin.zip\"}");
58+
"{\"candidate\": \"springboot\", \"version\": \"1.2.3\", \"url\": \"https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/1.2.3/spring-boot-cli-1.2.3-bin.zip\"}");
5959
setupExpectation("https://vendors.sdkman.io/default", "{\"candidate\": \"springboot\", \"version\": \"1.2.3\"}",
6060
HttpMethod.PUT);
6161
setupExpectation("https://vendors.sdkman.io/announce/struct",
@@ -67,7 +67,7 @@ void publishWhenMakeDefaultTrue() {
6767
@Test
6868
void publishWhenMakeDefaultFalse() {
6969
setupExpectation("https://vendors.sdkman.io/release",
70-
"{\"candidate\": \"springboot\", \"version\": \"1.2.3\", \"url\": \"https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-cli/1.2.3/spring-boot-cli-1.2.3-bin.zip\"}");
70+
"{\"candidate\": \"springboot\", \"version\": \"1.2.3\", \"url\": \"https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/1.2.3/spring-boot-cli-1.2.3-bin.zip\"}");
7171
setupExpectation("https://vendors.sdkman.io/announce/struct",
7272
"{\"candidate\": \"springboot\", \"version\": \"1.2.3\", \"hashtag\": \"springboot\", \"url\": \"https://github.com/spring-projects/spring-boot/releases/tag/v1.2.3\"}");
7373
this.service.publish("1.2.3", false);

eclipse/spring-boot-project.setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<repository
106106
url="https://repo.spring.io/javaformat-eclipse-update-site/"/>
107107
<repository
108-
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
108+
url="https://repo.maven.apache.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
109109
<repository
110110
url="https://download.springsource.com/release/TOOLS/sts4/update/latest/"/>
111111
<repository

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class MavenResolverGrapeEngineTests {
5757
private GrapeEngine createGrapeEngine(RepositoryConfiguration... additionalRepositories) {
5858
List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<>();
5959
repositoryConfigurations
60-
.add(new RepositoryConfiguration("central", URI.create("https://repo1.maven.org/maven2"), false));
60+
.add(new RepositoryConfiguration("central", URI.create("https://repo.maven.apache.org/maven2"), false));
6161
repositoryConfigurations.addAll(Arrays.asList(additionalRepositories));
6262
DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext();
6363
dependencyResolutionContext.addDependencyManagement(new SpringBootDependenciesDependencyManagement());

0 commit comments

Comments
 (0)