Spring/spring-data-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider settings.xml in distribution build.

Browse Source
This commit is contained in:
Mark Paluch
2024-08-15 09:35:20 +02:00
parent ff23abca79
commit fa4d484120
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/data/release/build/MavenBuildSystem.java
View File

@@ -327,7 +327,8 @@ class MavenBuildSystem implements BuildSystem {
arg("gpg.keyname").withValue(gpg.getKeyname()), //
arg("gpg.passphrase").withValue(gpg.getPassphrase())) //
.andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), settingsXml(properties.getSettingsXml()))
.andIf(StringUtils.hasText(information.getProject()), () -> arg("artifactory.project").withValue(information.getProject()));
.andIf(StringUtils.hasText(information.getProject()),
() -> arg("artifactory.project").withValue(information.getProject()));
mvn.execute(module.getSupportedProject(), arguments);
}
@@ -469,7 +470,7 @@ class MavenBuildSystem implements BuildSystem {
arg("artifactory.password").withValue(authentication.getPassword()))
.andIf(deploymentInformation != null, () -> {
return arg("artifactory.build-number").withValue(deploymentInformation.getBuildNumber());
}));
}).andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), () -> settingsXml(properties.getSettingsXml())));
mvn.execute(supportedProject, CommandLine.of(Goal.CLEAN, Goal.DEPLOY, //
SKIP_TESTS, profile("distribute-schema"), Argument.of("-B"),
@@ -479,7 +480,7 @@ class MavenBuildSystem implements BuildSystem {
arg("artifactory.password").withValue(authentication.getPassword()))
.andIf(deploymentInformation != null, () -> {
return arg("artifactory.build-number").withValue(deploymentInformation.getBuildNumber());
}));
}).andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), () -> settingsXml(properties.getSettingsXml())));
logger.log(project, "Successfully finished distribution build!");