Skip to content

Commit fa4d484

Browse files
committed
Consider settings.xml in distribution build.
1 parent ff23abc commit fa4d484

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/main/java/org/springframework/data/release/build/MavenBuildSystem.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ private void deployToArtifactory(ModuleIteration module, DeploymentInformation i
327327
arg("gpg.keyname").withValue(gpg.getKeyname()), //
328328
arg("gpg.passphrase").withValue(gpg.getPassphrase())) //
329329
.andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), settingsXml(properties.getSettingsXml()))
330-
.andIf(StringUtils.hasText(information.getProject()), () -> arg("artifactory.project").withValue(information.getProject()));
330+
.andIf(StringUtils.hasText(information.getProject()),
331+
() -> arg("artifactory.project").withValue(information.getProject()));
331332

332333
mvn.execute(module.getSupportedProject(), arguments);
333334
}
@@ -469,7 +470,7 @@ SKIP_TESTS, profile("distribute"), Argument.of("-B"),
469470
arg("artifactory.password").withValue(authentication.getPassword()))
470471
.andIf(deploymentInformation != null, () -> {
471472
return arg("artifactory.build-number").withValue(deploymentInformation.getBuildNumber());
472-
}));
473+
}).andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), () -> settingsXml(properties.getSettingsXml())));
473474

474475
mvn.execute(supportedProject, CommandLine.of(Goal.CLEAN, Goal.DEPLOY, //
475476
SKIP_TESTS, profile("distribute-schema"), Argument.of("-B"),
@@ -479,7 +480,7 @@ SKIP_TESTS, profile("distribute-schema"), Argument.of("-B"),
479480
arg("artifactory.password").withValue(authentication.getPassword()))
480481
.andIf(deploymentInformation != null, () -> {
481482
return arg("artifactory.build-number").withValue(deploymentInformation.getBuildNumber());
482-
}));
483+
}).andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), () -> settingsXml(properties.getSettingsXml())));
483484

484485
logger.log(project, "Successfully finished distribution build!");
485486

0 commit comments

Comments
 (0)