From 0d40e73c6709892fcbb8d04c275f4ed68127d7b2 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 26 Jul 2017 07:59:49 +0200 Subject: [PATCH] #60 - Maven release builds now trigger new profile scheme. The maven release builds (Artifactory and Maven Central) now both trigger the "release" profile as well as their deployment target profile ("artifactory", "central"). --- .../data/release/build/MavenBuildSystem.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 42d3687..0d807bc 100644 --- a/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java +++ b/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java @@ -212,10 +212,9 @@ class MavenBuildSystem implements BuildSystem { if (BUILD.equals(project)) { - mvn.execute(project, - goals.and(arg("newVersion").withValue(information.getReleaseTrainVersion()))// - .and(arg("groupId").withValue("org.springframework.data"))// - .and(arg("artifactId").withValue("spring-data-releasetrain"))); + mvn.execute(project, goals.and(arg("newVersion").withValue(information.getReleaseTrainVersion()))// + .and(arg("groupId").withValue("org.springframework.data"))// + .and(arg("artifactId").withValue("spring-data-releasetrain"))); mvn.execute(project, CommandLine.of(Goal.INSTALL)); } @@ -289,7 +288,7 @@ class MavenBuildSystem implements BuildSystem { logger.log(module, "Deploying artifacts to Spring Artifactory…"); CommandLine arguments = CommandLine.of(Goal.CLEAN, Goal.DEPLOY, // - profile("ci,release"), // + profile("ci,release,artifactory"), // SKIP_TESTS, // arg("artifactory.server").withValue(properties.getServer().getUri()), arg("artifactory.staging-repository").withValue(properties.getStagingRepository()), @@ -322,9 +321,10 @@ class MavenBuildSystem implements BuildSystem { Gpg gpg = properties.getGpg(); CommandLine arguments = CommandLine.of(Goal.DEPLOY, // - profile("ci,central"), // + profile("ci,release,central"), // 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())); mvn.execute(module.getProject(), arguments);