Merge branch '3.1.x' into 3.2.x

spring-projects · Sep 24, 2024 · 9fb958b · 9fb958b
2 parents 8095adc + 667fb98
commit 9fb958b
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 35 deletions.
diff --git a/aot-smoke-test-support/build.gradle b/aot-smoke-test-support/build.gradle
@@ -5,15 +5,32 @@ plugins {
 }
 
 repositories {
-	mavenCentral()
+	if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
+		maven {
+			name "Maven Central Mirror"
+			url "https://repo.spring.io/artifactory/repo1"
+			credentials {
+				username System.env['REPO_SPRING_IO_USERNAME']
+				password System.env['REPO_SPRING_IO_PASSWORD']
+			}
+			mavenContent {
+				releasesOnly()
+			}
+		}
+	}
+	else {
+		mavenCentral()
+	}
 	maven {
-		url "https://repo.spring.io/snapshot"
+		name "Spring Snapshot"
+		url "https://repo.spring.io/artifactory/snapshot"
 		mavenContent {
 			snapshotsOnly()
 		}
 	}
 	maven {
-		url "https://repo.spring.io/milestone"
+		name "Spring Milestone"
+		url "https://repo.spring.io/artifactory/milestone"
 		mavenContent {
 			releasesOnly()
 		}

diff --git a/aot-smoke-test-third-party-hints/build.gradle b/aot-smoke-test-third-party-hints/build.gradle
diff --git a/cloud/cloud-discovery-eureka/build.gradle b/cloud/cloud-discovery-eureka/build.gradle
@@ -6,7 +6,13 @@ plugins {
 }
 
 repositories {
-	maven { url "https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates" }
+	maven {
+		name "Netflix Release Candidate"
+		url "https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates"
+		mavenContent {
+			releasesOnly()
+		}
+	}
 }
 
 dependencies {

diff --git a/gradle/plugins/aot-smoke-test-plugin/build.gradle b/gradle/plugins/aot-smoke-test-plugin/build.gradle
@@ -5,15 +5,32 @@ plugins {
 }
 
 repositories {
-	mavenCentral()
+	if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
+		maven {
+			name "Maven Central Mirror"
+			url "https://repo.spring.io/artifactory/repo1"
+			credentials {
+				username System.env['REPO_SPRING_IO_USERNAME']
+				password System.env['REPO_SPRING_IO_PASSWORD']
+			}
+			mavenContent {
+				releasesOnly()
+			}
+		}
+	}
+	else {
+		mavenCentral()
+	}
 	maven {
-		url "https://repo.spring.io/snapshot"
+		name "Spring Snapshot"
+		url "https://repo.spring.io/artifactory/snapshot"
 		mavenContent {
 			snapshotsOnly()
 		}
 	}
 	maven {
-		url "https://repo.spring.io/milestone"
+		name "Spring Milestone"
+		url "https://repo.spring.io/artifactory/milestone"
 		mavenContent {
 			releasesOnly()
 		}

diff --git a/gradle/plugins/aot-smoke-test-plugin/settings.gradle b/gradle/plugins/aot-smoke-test-plugin/settings.gradle
@@ -12,8 +12,22 @@ pluginManagement {
 		id "io.spring.javaformat" version gradle.extensions.extraProperties.get("javaFormatVersion")
 	}
 	repositories {
-		mavenCentral()
-		gradlePluginPortal()
+		if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
+			maven {
+				name "Maven Central Mirror"
+				url "https://repo.spring.io/artifactory/repo1"
+				credentials {
+					username System.env['REPO_SPRING_IO_USERNAME']
+					password System.env['REPO_SPRING_IO_PASSWORD']
+				}
+				mavenContent {
+					releasesOnly()
+				}
+			}
+		}
+		else {
+			mavenCentral()
+		}
 	}
 }
 

diff --git a/...ot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java b/...ot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java
@@ -106,15 +106,29 @@ private void configureBootJavaProject(Project project) {
 			project.getConfigurations()
 				.all((configuration) -> configuration.getResolutionStrategy().eachDependency(forceSnapshots));
 		}
-		project.getRepositories().mavenCentral();
+		if (System.getenv().containsKey("REPO_SPRING_IO_USERNAME")
+				&& System.getenv().containsKey("REPO_SPRING_IO_PASSWORD")) {
+			project.getRepositories().maven((repo) -> {
+				repo.setName("Maven Central Mirror");
+				repo.setUrl("https://repo.spring.io/artifactory/repo1");
+				repo.credentials((credentials) -> {
+					credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME"));
+					credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD"));
+				});
+				repo.mavenContent((mavenContent) -> mavenContent.releasesOnly());
+			});
+		}
+		else {
+			project.getRepositories().mavenCentral();
+		}
 		project.getRepositories().maven((repo) -> {
 			repo.setName("Spring Snapshot");
-			repo.setUrl("https://repo.spring.io/snapshot");
+			repo.setUrl("https://repo.spring.io/artifactory/snapshot");
 			repo.mavenContent((mavenContent) -> mavenContent.snapshotsOnly());
 		});
 		project.getRepositories().maven((repo) -> {
 			repo.setName("Spring Milestone");
-			repo.setUrl("https://repo.spring.io/milestone");
+			repo.setUrl("https://repo.spring.io/artifactory/milestone");
 			repo.mavenContent((mavenContent) -> mavenContent.releasesOnly());
 		});
 

diff --git a/integration/spring-pulsar-reactive/build.gradle b/integration/spring-pulsar-reactive/build.gradle
@@ -5,10 +5,6 @@ plugins {
 	id "org.graalvm.buildtools.native"
 }
 
-repositories {
-	maven { url "https://repository.apache.org/content/repositories/snapshots" }
-}
-
 dependencies {
 	implementation(enforcedPlatform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter-pulsar-reactive")

diff --git a/settings.gradle b/settings.gradle
@@ -1,15 +1,33 @@
 pluginManagement {
 	includeBuild "gradle/plugins/aot-smoke-test-plugin"
 	repositories {
+		if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
+			maven {
+				name "Maven Central Mirror"
+				url "https://repo.spring.io/artifactory/repo1"
+				credentials {
+					username System.env['REPO_SPRING_IO_USERNAME']
+					password System.env['REPO_SPRING_IO_PASSWORD']
+				}
+				mavenContent {
+					releasesOnly()
+				}
+			}
+		}
+		else {
+			mavenCentral()
+		}
 		gradlePluginPortal()
 		maven {
-			url "https://repo.spring.io/snapshot"
+			name "Spring Snapshot"
+			url "https://repo.spring.io/artifactory/snapshot"
 			mavenContent {
 				snapshotsOnly()
 			}
 		}
 		maven {
-			url "https://repo.spring.io/milestone"
+			name "Spring Milestone"
+			url "https://repo.spring.io/artifactory/milestone"
 			mavenContent {
 				releasesOnly()
 			}
@@ -25,7 +43,6 @@ plugins {
 rootProject.name="spring-aot-smoke-tests"
 
 include "aot-smoke-test-support"
-include "aot-smoke-test-third-party-hints"
 
 ["batch", "boot", "cloud", "data", "framework", "graphql", "integration", "security", "session"].each { group ->
 	file(group).eachDirMatch(~/[a-z].*/) { smokeTest ->