From f9d575f3196302d528efe08fb70c5cf3a9d88f6e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Sep 2024 09:37:39 +0100 Subject: [PATCH] Polish repository declarations --- aot-smoke-test-support/build.gradle | 10 +++++++--- cloud/cloud-discovery-eureka/build.gradle | 8 +++++++- .../aot-smoke-test-plugin/build.gradle | 10 +++++++--- .../aot-smoke-test-plugin/settings.gradle | 3 +-- .../aot/gradle/AotSmokeTestPlugin.java | 4 ++-- settings.gradle | 19 +++++++++++++++++-- 6 files changed, 41 insertions(+), 13 deletions(-) diff --git a/aot-smoke-test-support/build.gradle b/aot-smoke-test-support/build.gradle index 35fa8f90..f7c95b65 100644 --- a/aot-smoke-test-support/build.gradle +++ b/aot-smoke-test-support/build.gradle @@ -6,6 +6,7 @@ plugins { repositories { maven { + name "Spring Commercial Snapshot" url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" credentials { username System.env['REPO_SPRING_IO_USERNAME'] @@ -18,6 +19,7 @@ repositories { } } maven { + name "Spring Commercial Release" url "https://repo.spring.io/artifactory/spring-commercial-release-remote" credentials { username System.env['REPO_SPRING_IO_USERNAME'] @@ -31,7 +33,7 @@ repositories { } maven { name "Maven Central Mirror" - url "https://repo.spring.io/repo1" + url "https://repo.spring.io/artifactory/repo1" credentials { username System.env['REPO_SPRING_IO_USERNAME'] password System.env['REPO_SPRING_IO_PASSWORD'] @@ -41,13 +43,15 @@ repositories { } } 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/cloud/cloud-discovery-eureka/build.gradle b/cloud/cloud-discovery-eureka/build.gradle index a9366651..ccae24b3 100644 --- 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 index 4dd3f504..26d562b0 100644 --- a/gradle/plugins/aot-smoke-test-plugin/build.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/build.gradle @@ -6,6 +6,7 @@ plugins { repositories { maven { + name "Spring Commercial Snapshot" url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" credentials { username System.env['REPO_SPRING_IO_USERNAME'] @@ -18,6 +19,7 @@ repositories { } } maven { + name "Spring Commercial Release" url "https://repo.spring.io/artifactory/spring-commercial-release-remote" credentials { username System.env['REPO_SPRING_IO_USERNAME'] @@ -31,7 +33,7 @@ repositories { } maven { name "Maven Central Mirror" - url "https://repo.spring.io/repo1" + url "https://repo.spring.io/artifactory/repo1" credentials { username System.env['REPO_SPRING_IO_USERNAME'] password System.env['REPO_SPRING_IO_PASSWORD'] @@ -41,13 +43,15 @@ repositories { } } 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 index 8915ba8c..9247a156 100644 --- a/gradle/plugins/aot-smoke-test-plugin/settings.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/settings.gradle @@ -14,7 +14,7 @@ pluginManagement { repositories { maven { name "Maven Central Mirror" - url "https://repo.spring.io/repo1" + url "https://repo.spring.io/artifactory/repo1" credentials { username System.env['REPO_SPRING_IO_USERNAME'] password System.env['REPO_SPRING_IO_PASSWORD'] @@ -23,7 +23,6 @@ pluginManagement { 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 f6b7ac7a..17679c4c 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 @@ -142,12 +142,12 @@ public class AotSmokeTestPlugin implements Plugin { }); 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()); }); configureAppTests(project, extension, appTest); diff --git a/settings.gradle b/settings.gradle index 479936c6..980d58c1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,7 @@ pluginManagement { includeBuild "gradle/plugins/aot-smoke-test-plugin" repositories { maven { + name "Spring Commercial Snapshot" url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" credentials { username System.env['REPO_SPRING_IO_USERNAME'] @@ -13,6 +14,7 @@ pluginManagement { } } maven { + name "Spring Commercial Release" url "https://repo.spring.io/artifactory/spring-commercial-release-remote" credentials { username System.env['REPO_SPRING_IO_USERNAME'] @@ -23,15 +25,28 @@ pluginManagement { includeGroupByRegex("org.springframework.*") } } + 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 { - 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() }