From 6654c4a80700eaed1bf2dace95242377ac062ac6 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 16 Feb 2024 10:44:34 +0100 Subject: [PATCH] Update settings for repository verification. Use settings xml for artifactory deployment and switch verification resource url. See: #75 --- .../springframework/data/release/build/MavenBuildSystem.java | 3 ++- src/main/resources/application.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 756d27f..8ae828a 100644 --- a/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java +++ b/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java @@ -320,7 +320,8 @@ class MavenBuildSystem implements BuildSystem { arg("artifactory.password").withValue(authentication.getPassword()), arg("artifactory.build-name").withQuotedValue(information.getBuildName()), arg("artifactory.build-number").withValue(information.getBuildNumber()), - arg("artifactory.project").withValue(information.getProject())); + arg("artifactory.project").withValue(information.getProject())) + .andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), settingsXml(properties.getSettingsXml())); mvn.execute(module.getSupportedProject(), arguments); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 164fdc3..bea37fd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -30,7 +30,7 @@ deployment.opensource.distribution-repository=temp-private-local # Prod deployment.commercial.server.uri=https://repo.spring.vmware.com -deployment.commercial.server.verification-resource=test-staging-local +deployment.commercial.server.verification-resource=spring-commercial-staging-local deployment.commercial.staging-repository=spring-commercial-staging-local deployment.commercial.target-repository=spring-commercial-release-local deployment.commercial.project=spring