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

#144 - Polishing.

Browse Source 
Skip BOM project for announcement summary and distribution. Fix Geode/GemFire issue tracker duality.
This commit is contained in:
Mark Paluch
2020-06-25 13:58:07 +02:00
parent 115f6054fb
commit 79676aebbe
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementOperations.java
View File

@@ -42,7 +42,7 @@ public class AnnouncementOperations {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
iteration.getModulesExcept(BUILD).forEach(module -> { iteration.getModulesExcept(BUILD, BOM).forEach(module -> {
Project project = module.getProject(); Project project = module.getProject();

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

@@ -113,6 +113,10 @@ class MavenBuildSystem implements BuildSystem {
return module; return module;
} }
if (BOM.equals(project)) {
return module;
}
if (!isMavenProject(project)) { if (!isMavenProject(project)) {
logger.log(project, "Skipping project as no pom.xml could be found in the working directory!"); logger.log(project, "Skipping project as no pom.xml could be found in the working directory!");
return module; return module;
@@ -235,12 +239,14 @@ class MavenBuildSystem implements BuildSystem {
.and(arg("generateBackupPoms").withValue("false"))); .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())) // if (!module.getTrain().usesCalver()) {
.and(arg("generateBackupPoms").withValue("false")) // mvn.execute(project, goals.and(arg("newVersion").withValue(information.getReleaseTrainNameVersion())) //
.and(arg("groupId").withValue("org.springframework.data")) // .and(arg("generateBackupPoms").withValue("false")) //
.and(arg("artifactId").withValue("spring-data-releasetrain"))); .and(arg("groupId").withValue("org.springframework.data")) //
.and(arg("artifactId").withValue("spring-data-releasetrain")));
}
mvn.execute(project, CommandLine.of(Goal.INSTALL)); mvn.execute(project, CommandLine.of(Goal.INSTALL));
} }

2
release-tools/src/main/java/org/springframework/data/release/issues/jira/Jira.java
View File

@@ -306,7 +306,7 @@ class Jira implements JiraConnector {
Tickets tickets = getTicketsFor(moduleIteration); Tickets tickets = getTicketsFor(moduleIteration);
if (tickets.hasReleaseTicket(moduleIteration) || moduleIteration.getProject() == Projects.GEODE) { if (tickets.hasReleaseTicket(moduleIteration) || moduleIteration.getProject() == Projects.GEMFIRE) {
return; return;
} }