diff --git a/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementOperations.java b/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementOperations.java index 0c481bb..2406ac2 100644 --- a/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementOperations.java +++ b/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementOperations.java @@ -42,7 +42,7 @@ public class AnnouncementOperations { StringBuilder builder = new StringBuilder(); - iteration.getModulesExcept(BUILD).forEach(module -> { + iteration.getModulesExcept(BUILD, BOM).forEach(module -> { Project project = module.getProject(); 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 3f33de5..e8929f8 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 @@ -113,6 +113,10 @@ class MavenBuildSystem implements BuildSystem { return module; } + if (BOM.equals(project)) { + return module; + } + if (!isMavenProject(project)) { logger.log(project, "Skipping project as no pom.xml could be found in the working directory!"); return module; @@ -235,12 +239,14 @@ class MavenBuildSystem implements BuildSystem { .and(arg("generateBackupPoms").withValue("false"))); } - if (BUILD.equals(project) && !module.getTrain().usesCalver()) { + if (BUILD.equals(project)) { - mvn.execute(project, goals.and(arg("newVersion").withValue(information.getReleaseTrainNameVersion())) // - .and(arg("generateBackupPoms").withValue("false")) // - .and(arg("groupId").withValue("org.springframework.data")) // - .and(arg("artifactId").withValue("spring-data-releasetrain"))); + if (!module.getTrain().usesCalver()) { + mvn.execute(project, goals.and(arg("newVersion").withValue(information.getReleaseTrainNameVersion())) // + .and(arg("generateBackupPoms").withValue("false")) // + .and(arg("groupId").withValue("org.springframework.data")) // + .and(arg("artifactId").withValue("spring-data-releasetrain"))); + } mvn.execute(project, CommandLine.of(Goal.INSTALL)); } diff --git a/release-tools/src/main/java/org/springframework/data/release/issues/jira/Jira.java b/release-tools/src/main/java/org/springframework/data/release/issues/jira/Jira.java index 53b69e0..6243f9d 100644 --- a/release-tools/src/main/java/org/springframework/data/release/issues/jira/Jira.java +++ b/release-tools/src/main/java/org/springframework/data/release/issues/jira/Jira.java @@ -306,7 +306,7 @@ class Jira implements JiraConnector { Tickets tickets = getTicketsFor(moduleIteration); - if (tickets.hasReleaseTicket(moduleIteration) || moduleIteration.getProject() == Projects.GEODE) { + if (tickets.hasReleaseTicket(moduleIteration) || moduleIteration.getProject() == Projects.GEMFIRE) { return; }