From 3b2e5e5292720397c9a599837ca8580c59928223 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 11 Jan 2023 17:03:45 +0000
Subject: [PATCH] Remove references to https://repo.spring.io/release

---
 buildSrc/build.gradle                                  |  1 -
 .../spring-boot-actuator-autoconfigure/build.gradle    | 10 ----------
 .../compiler/grape/MavenResolverGrapeEngineTests.java  |  8 +++-----
 .../spring-boot-antlib/src/it/sample/ivysettings.xml   |  1 -
 .../spring-boot-maven-plugin/build.gradle              | 10 ----------
 .../spring-boot-smoke-test-ant/ivysettings.xml         |  1 -
 6 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 057afcf3b3..f1ee4b8752 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -7,7 +7,6 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
-	maven { url "https://repo.spring.io/release" }
 }
 
 sourceCompatibility = 1.8
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
index 69be895607..df8a1d03e3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
@@ -13,16 +13,6 @@ configurations {
 	documentation
 }
 
-repositories {
-	maven {
-		url "https://repo.spring.io/release"
-		mavenContent {
-			includeGroup "io.spring.asciidoctor"
-			includeGroup "io.spring.asciidoctor.backends"
-		}
-	}
-}
-
 dependencies {
 	asciidoctorExtensions("org.springframework.restdocs:spring-restdocs-asciidoctor")
 	asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java
index 8d9d7fb4eb..82263cc58e 100644
--- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java
+++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/MavenResolverGrapeEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -141,10 +141,8 @@ class MavenResolverGrapeEngineTests {
 	void resolutionWithCustomResolver() {
 		Map<String, Object> args = new HashMap<>();
 		GrapeEngine grapeEngine = createGrapeEngine();
-		grapeEngine.addResolver(createResolver("spring-releases", "https://repo.spring.io/release"));
-		Map<String, Object> dependency = createDependency("io.spring.docresources", "spring-doc-resources",
-				"0.1.1.RELEASE");
-		dependency.put("ext", "zip");
+		grapeEngine.addResolver(createResolver("spring-milestones", "https://repo.spring.io/milestone"));
+		Map<String, Object> dependency = createDependency("org.springframework", "spring-jcl", "5.3.0-M1");
 		grapeEngine.grab(args, dependency);
 		assertThat(this.groovyClassLoader.getURLs()).hasSize(1);
 	}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml b/spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
index fb484496f5..67038fba90 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
@@ -8,7 +8,6 @@
 				<ivy pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
 			</filesystem>
 			<ibiblio name="ibiblio" m2compatible="true" />
-			<ibiblio name="spring-releases" m2compatible="true" root="https://repo.spring.io/release" />
 			<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
 			<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
 		</chain>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
index 9e2679d4b8..819f025811 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
@@ -12,16 +12,6 @@ configurations {
 	documentation
 }
 
-repositories {
-	maven {
-		url "https://repo.spring.io/release"
-		mavenContent {
-			includeGroup "io.spring.asciidoctor"
-			includeGroup "io.spring.asciidoctor.backends"
-		}
-	}
-}
-
 dependencies {
 	compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
 	compileOnly("org.sonatype.plexus:plexus-build-api")
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml
index 6a7b3b1bc1..50eb4fcb7d 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/ivysettings.xml
@@ -9,7 +9,6 @@
 				<ivy pattern="${projectDir}/build/test-repository/[organisation]/[module]/[revision]/[module]-[revision].pom" />
 			</filesystem>
 			<ibiblio name="ibiblio" m2compatible="true" />
-			<ibiblio name="spring-releases" m2compatible="true" root="https://repo.spring.io/release" />
 			<ibiblio name="spring-milestones" m2compatible="true" root="https://repo.spring.io/milestone" />
 			<ibiblio name="spring-snapshots" m2compatible="true" root="https://repo.spring.io/snapshot" />
 		</chain>