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

#60 - Maven release builds now trigger new profile scheme.

Browse Source 
The maven release builds (Artifactory and Maven Central) now both trigger the "release" profile as well as their deployment target profile ("artifactory", "central").
This commit is contained in:
Oliver Gierke
2017-07-26 07:59:49 +02:00
parent 3fa3560ad1
commit 4f90f1ec12
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java
View File

@@ -212,10 +212,9 @@ class MavenBuildSystem implements BuildSystem {
if (BUILD.equals(project)) { if (BUILD.equals(project)) {
mvn.execute(project, mvn.execute(project, goals.and(arg("newVersion").withValue(information.getReleaseTrainVersion()))//
goals.and(arg("newVersion").withValue(information.getReleaseTrainVersion()))// .and(arg("groupId").withValue("org.springframework.data"))//
.and(arg("groupId").withValue("org.springframework.data"))// .and(arg("artifactId").withValue("spring-data-releasetrain")));
.and(arg("artifactId").withValue("spring-data-releasetrain")));
mvn.execute(project, CommandLine.of(Goal.INSTALL)); mvn.execute(project, CommandLine.of(Goal.INSTALL));
} }
@@ -289,7 +288,7 @@ class MavenBuildSystem implements BuildSystem {
logger.log(module, "Deploying artifacts to Spring Artifactory…"); logger.log(module, "Deploying artifacts to Spring Artifactory…");
CommandLine arguments = CommandLine.of(Goal.CLEAN, Goal.DEPLOY, // CommandLine arguments = CommandLine.of(Goal.CLEAN, Goal.DEPLOY, //
profile("ci,release"), // profile("ci,release,artifactory"), //
SKIP_TESTS, // SKIP_TESTS, //
arg("artifactory.server").withValue(properties.getServer().getUri()), arg("artifactory.server").withValue(properties.getServer().getUri()),
arg("artifactory.staging-repository").withValue(properties.getStagingRepository()), arg("artifactory.staging-repository").withValue(properties.getStagingRepository()),
@@ -322,9 +321,10 @@ class MavenBuildSystem implements BuildSystem {
Gpg gpg = properties.getGpg(); Gpg gpg = properties.getGpg();
CommandLine arguments = CommandLine.of(Goal.DEPLOY, // CommandLine arguments = CommandLine.of(Goal.DEPLOY, //
profile("ci,central"), // profile("ci,release,central"), //
SKIP_TESTS, // SKIP_TESTS, //
arg("gpg.executable").withValue(gpg.getExecutable()), arg("gpg.keyname").withValue(gpg.getKeyname()), arg("gpg.executable").withValue(gpg.getExecutable()), //
arg("gpg.keyname").withValue(gpg.getKeyname()), //
arg("gpg.password").withValue(gpg.getPassword())); arg("gpg.password").withValue(gpg.getPassword()));
mvn.execute(module.getProject(), arguments); mvn.execute(module.getProject(), arguments);