Merge branch '2.7.x' into 3.0.x

Closes gh-34123
spring-projects · Feb 8, 2023 · 1cdc24a · 1cdc24a
2 parents 3551030 + 07fcb67
commit 1cdc24a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java b/buildSrc/src/main/java/org/springframework/boot/build/cli/HomebrewFormula.java
@@ -46,7 +46,7 @@ public class HomebrewFormula extends DefaultTask {
 
 	private static final String SPRING_REPO = "https://repo.spring.io/%s";
 
-	private static final String MAVEN_REPO = "https://repo1.maven.org/maven2";
+	private static final String MAVEN_REPO = "https://repo.maven.apache.org/maven2";
 
 	private Provider<RegularFile> archive;
 

diff --git a/...releasescripts/src/main/java/io/spring/concourse/releasescripts/sdkman/SdkmanService.java b/...releasescripts/src/main/java/io/spring/concourse/releasescripts/sdkman/SdkmanService.java
@@ -40,7 +40,7 @@ public class SdkmanService {
 
 	private static final String SDKMAN_URL = "https://vendors.sdkman.io/";
 
-	private static final String DOWNLOAD_URL = "https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-cli/"
+	private static final String DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/"
 			+ "%s/spring-boot-cli-%s-bin.zip";
 
 	private static final String CHANGELOG_URL = "https://github.com/spring-projects/spring-boot/releases/tag/v%s";

diff --git a/...sescripts/src/test/java/io/spring/concourse/releasescripts/sdkman/SdkmanServiceTests.java b/...sescripts/src/test/java/io/spring/concourse/releasescripts/sdkman/SdkmanServiceTests.java
@@ -55,7 +55,7 @@ void tearDown() {
 	@Test
 	void publishWhenMakeDefaultTrue() {
 		setupExpectation("https://vendors.sdkman.io/release",
-				"{\"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\"}");
+				"{\"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\"}");
 		setupExpectation("https://vendors.sdkman.io/default", "{\"candidate\": \"springboot\", \"version\": \"1.2.3\"}",
 				HttpMethod.PUT);
 		setupExpectation("https://vendors.sdkman.io/announce/struct",
@@ -67,7 +67,7 @@ void publishWhenMakeDefaultTrue() {
 	@Test
 	void publishWhenMakeDefaultFalse() {
 		setupExpectation("https://vendors.sdkman.io/release",
-				"{\"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\"}");
+				"{\"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\"}");
 		setupExpectation("https://vendors.sdkman.io/announce/struct",
 				"{\"candidate\": \"springboot\", \"version\": \"1.2.3\", \"hashtag\": \"springboot\", \"url\": \"https://github.com/spring-projects/spring-boot/releases/tag/v1.2.3\"}");
 		this.service.publish("1.2.3", false);

diff --git a/ci/scripts/update-homebrew-tap.sh b/ci/scripts/update-homebrew-tap.sh
@@ -7,7 +7,7 @@ git clone homebrew-tap-repo updated-homebrew-tap-repo > /dev/null
 
 if [[ $LATEST_GA = true ]]; then
 pushd updated-homebrew-tap-repo > /dev/null
-  curl https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-cli/${version}/spring-boot-cli-${version}-homebrew.rb --output spring-boot-cli-${version}-homebrew.rb 
+  curl https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/${version}/spring-boot-cli-${version}-homebrew.rb --output spring-boot-cli-${version}-homebrew.rb
   rm spring-boot.rb
   mv spring-boot-cli-*.rb spring-boot.rb
   git config user.name "Spring Builds" > /dev/null

diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
@@ -105,7 +105,7 @@
     <repository
         url="https://repo.spring.io/javaformat-eclipse-update-site/"/>
     <repository
-        url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
+        url="https://repo.maven.apache.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
     <repository
         url="https://download.springsource.com/release/TOOLS/sts4/update/latest/"/>
     <repository