diff --git a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java index 21e286c..e7019f7 100644 --- a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java +++ b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java @@ -309,6 +309,11 @@ class MavenBuildSystem implements BuildSystem { Assert.notNull(module, "Module iteration must not be null!"); Assert.notNull(information, "Deployment information must not be null!"); + if (module.getIteration().isPublic()) { + logger.log(module, "Not a public version, skipping Artifactory deployment."); + return; + } + logger.log(module, "Deploying artifacts to Spring Artifactory…"); CommandLine arguments = CommandLine.of(Goal.CLEAN, Goal.DEPLOY, // diff --git a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java index 14918f2..1a54892 100644 --- a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java +++ b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java @@ -91,9 +91,11 @@ class ReleaseCommands extends TimedCommand { public void buildRelease(@CliOption(key = "", mandatory = true) TrainIteration iteration, // @CliOption(key = "project", mandatory = false) String projectName) throws Exception { - if (projectName != null) { - + if (!iteration.getIteration().isPublic()) { deployment.verifyAuthentication(); + } + + if (projectName != null) { Project project = Projects.requiredByName(projectName); ModuleIteration module = iteration.getModule(project); @@ -103,11 +105,7 @@ class ReleaseCommands extends TimedCommand { } else { - deployment.verifyAuthentication(); - - List deploymentInformation = build.performRelease(iteration); - - deploymentInformation.forEach(deployment::promote); + build.performRelease(iteration).forEach(deployment::promote); } } diff --git a/release-tools/src/main/java/org/springframework/data/release/sagan/MaintainedVersion.java b/release-tools/src/main/java/org/springframework/data/release/sagan/MaintainedVersion.java index 1a44bda..4c2827d 100644 --- a/release-tools/src/main/java/org/springframework/data/release/sagan/MaintainedVersion.java +++ b/release-tools/src/main/java/org/springframework/data/release/sagan/MaintainedVersion.java @@ -72,7 +72,7 @@ class MaintainedVersion implements Comparable { * @return */ MaintainedVersion nextDevelopmentVersion() { - return MaintainedVersion.of(project, version.getNextDevelopmentVersion(), train); + return MaintainedVersion.of(project, version.getNextBugfixVersion(), train); } /*