Skip to content

Commit b0d4b6d

Browse files
committed
Fix BOM release notes links.
Closes #95
1 parent c6f5564 commit b0d4b6d

File tree

1 file changed

+5
-8
lines changed
  • src/main/java/org/springframework/data/release/issues/github

1 file changed

+5
-8
lines changed

src/main/java/org/springframework/data/release/issues/github/GitHub.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,7 @@ public Ticket createTicket(ModuleIteration moduleIteration, String subject, Stri
272272
}
273273

274274
private Ticket doCreateTicket(ModuleIteration moduleIteration, String subject, String description,
275-
TicketType ticketType,
276-
boolean assignToCurrentUser) {
275+
TicketType ticketType, boolean assignToCurrentUser) {
277276

278277
String repositoryName = GitProject.of(moduleIteration).getRepositoryName();
279278
Milestone milestone = getMilestone(moduleIteration);
@@ -571,7 +570,6 @@ public void createOrUpdateRelease(ModuleIteration module, List<TicketReference>
571570
logger.log(module, "Preparing GitHub Release …");
572571

573572
String releaseMarkdown = createReleaseMarkdown(module, ticketIds);
574-
575573
createOrUpdateRelease(module, releaseMarkdown);
576574

577575
logger.log(module, "GitHub Release up to date");
@@ -593,7 +591,6 @@ public String createReleaseMarkdown(ModuleIteration module, List<TicketReference
593591

594592
String releaseMarkdown;
595593
if (module.getProject() == Projects.BOM || module.getProject() == Projects.BUILD) {
596-
// We don't ship Javadoc/reference doc for build and BOM
597594

598595
if (module.getProject() == Projects.BOM) {
599596
String participatingModules = createParticipatingModules(module.getTrainIteration());
@@ -615,9 +612,10 @@ private String createParticipatingModules(TrainIteration iteration) {
615612
.comparing(moduleIteration -> moduleIteration.getSupportedProject().getName());
616613
return iteration.stream().sorted(comparator).map(module -> {
617614

615+
GitProject project = GitProject.of(module);
618616
Tag tag = VersionTags.empty(module.getProject()).createTag(module);
619617
return String.format("* [Spring Data %s %s](%s%s/releases/tag/%s)%n", module.getSupportedProject().getName(),
620-
tag.getName(), GitServer.INSTANCE.getUri(), module.getSupportedProject().getFolderName(), tag.getName());
618+
tag.getName(), GitServer.INSTANCE.getUri(), project.getRepositoryName(), tag.getName());
621619
}).collect(Collectors.joining());
622620
}
623621

@@ -677,6 +675,7 @@ public GitHubWorkflow getWorkflow() {
677675
if (!entity.getStatusCode().is2xxSuccessful()) {
678676
throw new IllegalStateException(String.format("Cannot obtain Workflows. Status: %s", entity.getStatusCode()));
679677
}
678+
680679
GitHubWorkflows workflows = entity.getBody();
681680
for (GitHubWorkflow workflow : workflows.getWorkflows()) {
682681

@@ -688,7 +687,6 @@ public GitHubWorkflow getWorkflow() {
688687

689688
return workflow;
690689
}
691-
692690
}
693691

694692
throw new NoSuchElementException("Cannot resolve Antora workflow");
@@ -767,8 +765,7 @@ private void updateRelease(String repositoryName, GitHubRelease release) {
767765
parameters.put("repoName", repositoryName);
768766
parameters.put("id", release.getId());
769767

770-
operations.exchange(RELEASE_BY_ID_URI_TEMPLATE, HttpMethod.PATCH, new HttpEntity<>(release), GitHubRelease.class,
771-
parameters);
768+
operations.exchange(RELEASE_BY_ID_URI_TEMPLATE, HttpMethod.PATCH, new HttpEntity<>(release), Map.class, parameters);
772769
}
773770

774771
private Stream<GitHubReadIssue> getIssuesFor(ModuleIteration moduleIteration, boolean forCurrentUser,

0 commit comments

Comments
 (0)