From 8574cafa8b24d578a9069967247cffaf824a0add Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 13 Feb 2024 15:23:00 +0100 Subject: [PATCH] Add commercial repositories to smoke tests. --- smoke-tests/pom.xml | 19 +++++++++++++++ smoke-tests/settings.xml | 24 +++++++++++++++++++ .../data/release/build/MavenBuildSystem.java | 4 +++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 smoke-tests/settings.xml diff --git a/smoke-tests/pom.xml b/smoke-tests/pom.xml index 4092e1c..e70e70b 100644 --- a/smoke-tests/pom.xml +++ b/smoke-tests/pom.xml @@ -92,6 +92,25 @@ + + + commercial + + + + spring-commercial-release + + https://repo.spring.vmware.com/artifactory/spring-commercial/ + + + + spring-commercial-staging + + https://repo.spring.vmware.com/artifactory/spring-commercial-staging-local/ + + + + diff --git a/smoke-tests/settings.xml b/smoke-tests/settings.xml new file mode 100644 index 0000000..355a5af --- /dev/null +++ b/smoke-tests/settings.xml @@ -0,0 +1,24 @@ + + + + + spring-commercial-staging + ${env.COMMERCIAL_USR} + ${env.COMMERCIAL_PSW} + + + spring-commercial-release + ${env.COMMERCIAL_USR} + ${env.COMMERCIAL_PSW} + + + spring-libs-milestone + ${ARTIFACTORY_USR} + ${ARTIFACTORY_PSW} + + + + diff --git a/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java b/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java index d0ebeff..9b79346 100644 --- a/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java +++ b/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java @@ -365,7 +365,8 @@ class MavenBuildSystem implements BuildSystem { logger.log(iteration, "🚬 Running smoke test…"); boolean mavenCentral = iteration.isPublic(); - String profile = mavenCentral ? "maven-central" : "artifactory"; + boolean commercial = iteration.isCommercial(); + String profile = commercial ? "commercial" : (mavenCentral ? "maven-central" : "artifactory"); ModuleIteration module = iteration.getModule(BUILD); @@ -380,6 +381,7 @@ class MavenBuildSystem implements BuildSystem { CommandLine arguments = CommandLine.of(Goal.CLEAN, VERIFY, // profile(profile), // + arg("s").withValue("settings.xml"), // arg("spring-data-bom.version").withValue(iteration.getReleaseTrainNameAndVersion())) // .andIf(mavenCentral, arg("stagingRepository").withValue(stagingRepository.getId()));