diff --git a/README.adoc b/README.adoc index 3cf36b46..27c6111e 100644 --- a/README.adoc +++ b/README.adoc @@ -15,8 +15,8 @@ Please read and follow the link:CONTRIBUTING.adoc[contributing guide]. == Initial Setup -The smoke tests resolve dependencies from https://repo.spring.vmware.com which requires authentication. -Use the `REPO_SPRING_VMWARE_COM_USERNAME` and `REPO_SPRING_VMWARE_COM_PASSWORD` environment variables to provide the necessary credentials. +The smoke tests resolve commercial dependencies from https://repo.spring.io which requires authentication. +Use the `REPO_SPRING_IO_USERNAME` and `REPO_SPRING_IO_PASSWORD` environment variables to provide the necessary credentials. == How to diff --git a/aot-smoke-test-support/build.gradle b/aot-smoke-test-support/build.gradle index aebefed2..17af88a5 100644 --- a/aot-smoke-test-support/build.gradle +++ b/aot-smoke-test-support/build.gradle @@ -6,10 +6,10 @@ plugins { repositories { maven { - url "https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local" + url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" credentials { - username System.env['REPO_SPRING_VMWARE_COM_USERNAME'] - password System.env['REPO_SPRING_VMWARE_COM_PASSWORD'] + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] } mavenContent { snapshotsOnly() @@ -18,10 +18,10 @@ repositories { } } maven { - url "https://repo.spring.vmware.com/artifactory/spring-commercial-release-local" + url "https://repo.spring.io/artifactory/spring-commercial-release-remote" credentials { - username System.env['REPO_SPRING_VMWARE_COM_USERNAME'] - password System.env['REPO_SPRING_VMWARE_COM_PASSWORD'] + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] } mavenContent { releasesOnly() diff --git a/gradle/plugins/aot-smoke-test-plugin/build.gradle b/gradle/plugins/aot-smoke-test-plugin/build.gradle index 16675ffb..b2225e22 100644 --- a/gradle/plugins/aot-smoke-test-plugin/build.gradle +++ b/gradle/plugins/aot-smoke-test-plugin/build.gradle @@ -6,10 +6,10 @@ plugins { repositories { maven { - url "https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local" + url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" credentials { - username System.env['REPO_SPRING_VMWARE_COM_USERNAME'] - password System.env['REPO_SPRING_VMWARE_COM_PASSWORD'] + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] } mavenContent { snapshotsOnly() @@ -18,10 +18,10 @@ repositories { } } maven { - url "https://repo.spring.vmware.com/artifactory/spring-commercial-release-local" + url "https://repo.spring.io/artifactory/spring-commercial-release-remote" credentials { - username System.env['REPO_SPRING_VMWARE_COM_USERNAME'] - password System.env['REPO_SPRING_VMWARE_COM_PASSWORD'] + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] } mavenContent { releasesOnly() 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 d7965186..67f7b3b1 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 @@ -101,10 +101,10 @@ public class AotSmokeTestPlugin implements Plugin { } project.getRepositories().maven((repo) -> { repo.setName("Spring Commercial Snapshot"); - repo.setUrl("https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local"); + repo.setUrl("https://repo.spring.io/artifactory/spring-commercial-snapshot-remote"); repo.credentials((credentials) -> { - credentials.setUsername(System.getenv().get("REPO_SPRING_VMWARE_COM_USERNAME")); - credentials.setPassword(System.getenv().get("REPO_SPRING_VMWARE_COM_PASSWORD")); + credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME")); + credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD")); }); repo.mavenContent((mavenContent) -> { mavenContent.snapshotsOnly(); @@ -114,10 +114,10 @@ public class AotSmokeTestPlugin implements Plugin { }); project.getRepositories().maven((repo) -> { repo.setName("Spring Commercial Release"); - repo.setUrl("https://repo.spring.vmware.com/artifactory/spring-commercial-release-local"); + repo.setUrl("https://repo.spring.io/artifactory/spring-commercial-release-remote"); repo.credentials((credentials) -> { - credentials.setUsername(System.getenv().get("REPO_SPRING_VMWARE_COM_USERNAME")); - credentials.setPassword(System.getenv().get("REPO_SPRING_VMWARE_COM_PASSWORD")); + credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME")); + credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD")); }); repo.mavenContent((mavenContent) -> { mavenContent.releasesOnly(); diff --git a/settings.gradle b/settings.gradle index a982ea47..4a40d0b7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,10 +2,10 @@ pluginManagement { includeBuild "gradle/plugins/aot-smoke-test-plugin" repositories { maven { - url "https://repo.spring.vmware.com/artifactory/spring-commercial-snapshot-local" + url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote" credentials { - username System.env['REPO_SPRING_VMWARE_COM_USERNAME'] - password System.env['REPO_SPRING_VMWARE_COM_PASSWORD'] + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] } mavenContent { snapshotsOnly() @@ -13,10 +13,10 @@ pluginManagement { } } maven { - url "https://repo.spring.vmware.com/artifactory/spring-commercial-release-local" + url "https://repo.spring.io/artifactory/spring-commercial-release-remote" credentials { - username System.env['REPO_SPRING_VMWARE_COM_USERNAME'] - password System.env['REPO_SPRING_VMWARE_COM_PASSWORD'] + username System.env['REPO_SPRING_IO_USERNAME'] + password System.env['REPO_SPRING_IO_PASSWORD'] } mavenContent { releasesOnly()