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

Conditionally supply project to deployment url.

Browse Source 
See: #75
This commit is contained in:
Christoph Strobl
2024-02-16 14:55:22 +01:00
parent 963ac5ab29
commit 944a17ba7e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ import org.springframework.data.release.utils.Logger;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.xmlbeam.ProjectionFactory;
import org.xmlbeam.XBProjector;
import org.xmlbeam.dom.DOMAccess;
@@ -322,11 +323,11 @@ 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("gpg.executable").withValue(gpg.getExecutable()), //
arg("gpg.keyname").withValue(gpg.getKeyname()), //
arg("gpg.passphrase").withValue(gpg.getPassphrase())) //
.andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), settingsXml(properties.getSettingsXml()));
.andIf(!ObjectUtils.isEmpty(properties.getSettingsXml()), settingsXml(properties.getSettingsXml()))
.andIf(StringUtils.hasText(information.getProject()), () -> arg("artifactory.project").withValue(information.getProject()));
mvn.execute(module.getSupportedProject(), arguments);
}

4
src/main/java/org/springframework/data/release/deployment/DefaultDeploymentInformation.java
View File

@@ -131,7 +131,9 @@ public class DefaultDeploymentInformation implements DeploymentInformation {
Map<String, Object> parameters = new HashMap<>();
parameters.put("buildNumber", getBuildNumber());
parameters.put("buildName", getBuildName());
parameters.put("project", getProject());
String project = StringUtils.hasText(getProject()) ? getProject() : "";
parameters.put("project", project);
return parameters;
}