diff --git a/aot-smoke-test-support/build.gradle b/aot-smoke-test-support/build.gradle index 17af88a5..35fa8f90 100644 --- a/aot-smoke-test-support/build.gradle +++ b/aot-smoke-test-support/build.gradle @@ -29,7 +29,17 @@ repositories { includeGroupByRegex("org.springframework.*") } } - mavenCentral() + maven { + name "Maven Central Mirror" + url "https://repo.spring.io/repo1" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + releasesOnly() + } + } maven { url "https://repo.spring.io/snapshot" mavenContent { diff --git a/aot-smoke-test-third-party-hints/build.gradle b/aot-smoke-test-third-party-hints/build.gradle deleted file mode 100644 index a25792a0..00000000 --- a/aot-smoke-test-third-party-hints/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - id "java" - id "io.spring.javaformat" - id "org.springframework.boot" apply false -} - -repositories { - mavenCentral() - maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/snapshot" } -} - -dependencies { - implementation(enforcedPlatform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation("org.springframework:spring-core") -} diff --git a/gradle/plugins/aot-smoke-test-plugin/build.gradle b/gradle/plugins/aot-smoke-test-plugin/build.gradle index b2225e22..4dd3f504 100644 --- a/gradle/plugins/aot-smoke-test-plugin/build.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/build.gradle @@ -29,7 +29,17 @@ repositories { includeGroupByRegex("org.springframework.*") } } - mavenCentral() + maven { + name "Maven Central Mirror" + url "https://repo.spring.io/repo1" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + releasesOnly() + } + } maven { url "https://repo.spring.io/snapshot" mavenContent { diff --git a/gradle/plugins/aot-smoke-test-plugin/settings.gradle b/gradle/plugins/aot-smoke-test-plugin/settings.gradle index 5a672a3e..8915ba8c 100644 --- a/gradle/plugins/aot-smoke-test-plugin/settings.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/settings.gradle @@ -12,7 +12,17 @@ pluginManagement { id "io.spring.javaformat" version gradle.extensions.extraProperties.get("javaFormatVersion") } repositories { - mavenCentral() + maven { + name "Maven Central Mirror" + url "https://repo.spring.io/repo1" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + releasesOnly() + } + } gradlePluginPortal() } } diff --git a/gradle/plugins/aot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java b/gradle/plugins/aot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java index 5868f1c4..f6b7ac7a 100644 --- a/gradle/plugins/aot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java +++ b/gradle/plugins/aot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java @@ -131,7 +131,15 @@ public class AotSmokeTestPlugin implements Plugin { mavenContent.includeGroupByRegex("org.springframework.*"); }); }); - project.getRepositories().mavenCentral(); + 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()); + }); project.getRepositories().maven((repo) -> { repo.setName("Spring Snapshot"); repo.setUrl("https://repo.spring.io/snapshot"); diff --git a/settings.gradle b/settings.gradle index 4a40d0b7..479936c6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -47,7 +47,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 ->