diff --git a/aot-smoke-test-support/build.gradle b/aot-smoke-test-support/build.gradle index 5b8096b2..15797051 100644 --- a/aot-smoke-test-support/build.gradle +++ b/aot-smoke-test-support/build.gradle @@ -5,21 +5,44 @@ plugins { } 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() - } + maven { + name "Spring Commercial Snapshot" + url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + snapshotsOnly() + includeGroupByRegex("io.micrometer.*") + includeGroupByRegex("org.springframework.*") + includeGroupByRegex("io.projectreactor.*") } } - else { - mavenCentral() + maven { + name "Spring Commercial Release" + url "https://repo.spring.io/artifactory/spring-commercial-release-remote" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + releasesOnly() + includeGroupByRegex("io.micrometer.*") + includeGroupByRegex("org.springframework.*") + includeGroupByRegex("io.projectreactor.*") + } + } + 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() + } } maven { name "Spring Snapshot" diff --git a/gradle.properties b/gradle.properties index 666bffd6..c101d1b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ reachabilityMetadataVersion=0.3.14 kotlinVersion=1.9.24 javaFormatVersion=0.0.39 nbtVersion=0.9.28 -springBootVersion=3.2.12-SNAPSHOT +springBootVersion=3.2.13-SNAPSHOT springCloudVersion=2023.0.4-SNAPSHOT springBootGeneration=3.2.x diff --git a/gradle/plugins/aot-smoke-test-plugin/build.gradle b/gradle/plugins/aot-smoke-test-plugin/build.gradle index 9b106d7a..404ca400 100644 --- a/gradle/plugins/aot-smoke-test-plugin/build.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/build.gradle @@ -5,21 +5,44 @@ plugins { } 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() - } + maven { + name "Spring Commercial Snapshot" + url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + snapshotsOnly() + includeGroupByRegex("io.micrometer.*") + includeGroupByRegex("org.springframework.*") + includeGroupByRegex("io.projectreactor.*") } } - else { - mavenCentral() + maven { + name "Spring Commercial Release" + url "https://repo.spring.io/artifactory/spring-commercial-release-remote" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + releasesOnly() + includeGroupByRegex("io.micrometer.*") + includeGroupByRegex("org.springframework.*") + includeGroupByRegex("io.projectreactor.*") + } + } + 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() + } } maven { name "Spring Snapshot" diff --git a/gradle/plugins/aot-smoke-test-plugin/settings.gradle b/gradle/plugins/aot-smoke-test-plugin/settings.gradle index 0e0d70a7..9247a156 100644 --- a/gradle/plugins/aot-smoke-test-plugin/settings.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/settings.gradle @@ -12,21 +12,16 @@ pluginManagement { id "io.spring.javaformat" version gradle.extensions.extraProperties.get("javaFormatVersion") } 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() - } + 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/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 1b534d67..3a0dcce9 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 @@ -111,21 +111,43 @@ public class AotSmokeTestPlugin implements Plugin { project.getConfigurations() .all((configuration) -> configuration.getResolutionStrategy().eachDependency(forceSnapshots)); } - 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()); + project.getRepositories().maven((repo) -> { + repo.setName("Spring Commercial Snapshot"); + repo.setUrl("https://repo.spring.io/artifactory/spring-commercial-snapshot-remote"); + repo.credentials((credentials) -> { + credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME")); + credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD")); }); - } - else { - project.getRepositories().mavenCentral(); - } + repo.mavenContent((mavenContent) -> { + mavenContent.snapshotsOnly(); + mavenContent.includeGroupByRegex("io.micrometer.*"); + mavenContent.includeGroupByRegex("org.springframework.*"); + mavenContent.includeGroupByRegex("io.projectreactor.*"); + }); + }); + project.getRepositories().maven((repo) -> { + repo.setName("Spring Commercial Release"); + repo.setUrl("https://repo.spring.io/artifactory/spring-commercial-release-remote"); + 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(); + mavenContent.includeGroupByRegex("io.micrometer.*"); + mavenContent.includeGroupByRegex("org.springframework.*"); + mavenContent.includeGroupByRegex("io.projectreactor.*"); + }); + }); + 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/artifactory/snapshot"); diff --git a/settings.gradle b/settings.gradle index 7b38f766..85987aae 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,21 +1,42 @@ 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() - } + maven { + name "Spring Commercial Snapshot" + url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + snapshotsOnly() + includeGroupByRegex("org.springframework.*") + includeGroupByRegex("io.projectreactor.*") } } - else { - mavenCentral() + maven { + name "Spring Commercial Release" + url "https://repo.spring.io/artifactory/spring-commercial-release-remote" + credentials { + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] + } + mavenContent { + releasesOnly() + includeGroupByRegex("org.springframework.*") + includeGroupByRegex("io.projectreactor.*") + } + } + 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() + } } gradlePluginPortal() maven {