From a81e61d5a072b6a38533e3941fd034569830a025 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 23 Jul 2025 16:05:41 +0200 Subject: [PATCH] Deploy milestones and RCs to Central. Signed-off-by: Olga Maciaszek-Sharma --- ...SpringCloudCustomProjectDocumentationUpdaterTests.java | 2 ++ .../releaser/internal/project/ProjectCommandExecutor.java | 8 ++------ .../internal/project/ProjectCommandExecutorTests.java | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java index c1e104ce..6be75c07 100644 --- a/projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/docs/SpringCloudCustomProjectDocumentationUpdaterTests.java @@ -25,6 +25,7 @@ import org.assertj.core.api.BDDAssertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.mockito.BDDMockito; @@ -43,6 +44,7 @@ /** * @author Marcin Grzejszczak */ +@Disabled("Documentation release process modified") class SpringCloudCustomProjectDocumentationUpdaterTests { File project; diff --git a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java index 97984d78..a5e1f364 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -463,16 +463,12 @@ private String bashCommandWithSystemProps(String command) { private String appendMavenProfile(String command, ProjectVersion version, MavenProfile... profiles) { String trimmedCommand = command.trim(); - if (version.isMilestone() || version.isRc()) { - log.info("Adding the milestone profile to the Maven build"); - return withProfile(trimmedCommand, MavenProfile.MILESTONE.asMavenProfile(), profiles); - } - else if (version.isRelease() || version.isServiceRelease()) { + if (version.isMilestone() || version.isRc() || version.isRelease() || version.isServiceRelease()) { log.info("Adding the central profile to the Maven build"); return withProfile(trimmedCommand, MavenProfile.CENTRAL.asMavenProfile(), profiles); } else { - log.info("The version [" + version.toString() + "] is a snapshot one - will not add any profiles"); + log.info("The version [" + version + "] is a snapshot one - will not add any profiles"); } return trimmedCommand; } diff --git a/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java b/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java index 1745420b..60ed6d0e 100644 --- a/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java +++ b/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java @@ -264,8 +264,7 @@ public void should_successfully_execute_a_deploy_command_for_milestone_version_f builder.deploy(properties, original(), new ProjectVersion("foo", "1.0.0.M1")); - then(asString(tmpFile("/builder/resolved/resolved.log"))).contains("foo -Pmilestone") - .doesNotContain("-Pguides"); + then(asString(tmpFile("/builder/resolved/resolved.log"))).contains("foo -Pcentral").doesNotContain("-Pguides"); } @Test @@ -290,8 +289,7 @@ public void should_successfully_execute_a_deploy_command_for_rc_version_for_mave builder.deploy(properties, original(), new ProjectVersion("foo", "1.0.0.RC1")); - then(asString(tmpFile("/builder/resolved/resolved.log"))).contains("foo -Pmilestone") - .doesNotContain("-Pguides"); + then(asString(tmpFile("/builder/resolved/resolved.log"))).contains("foo -Pcentral").doesNotContain("-Pguides"); } @Test