fix(changelog): Honor external changelog settings. Fixes #965

jreleaser · Oct 27, 2022 · c2422ee · c2422ee
1 parent 74bda0f
commit c2422ee
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/...in/java/org/jreleaser/model/internal/validation/announce/DiscourseAnnouncerValidator.java b/...in/java/org/jreleaser/model/internal/validation/announce/DiscourseAnnouncerValidator.java
@@ -70,7 +70,6 @@ public static void validateDiscourse(JReleaserContext context, DiscourseAnnounce
                         discourse.getCategoryName(),
                         errors,
                         context.isDryrun()));
-
 
         if (isBlank(discourse.getTitle())) {
             discourse.setTitle(RB.$("default.discussion.title"));
@@ -80,7 +79,6 @@ public static void validateDiscourse(JReleaserContext context, DiscourseAnnounce
             discourse.setMessageTemplate(DEFAULT_DISCOURSE_TPL);
         }
 
-
         if (isBlank(discourse.getMessage()) && isBlank(discourse.getMessageTemplate())) {
             if (Files.exists(context.getBasedir().resolve(DEFAULT_DISCOURSE_TPL))) {
                 discourse.setMessageTemplate(DEFAULT_DISCOURSE_TPL);

diff --git a/.../src/main/java/org/jreleaser/model/internal/validation/release/BaseReleaserValidator.java b/.../src/main/java/org/jreleaser/model/internal/validation/release/BaseReleaserValidator.java
@@ -221,7 +221,6 @@ public static void validateGitService(JReleaserContext context, Mode mode, BaseR
 
             if (!generate) {
                 service.getChangelog().setEnabled(true);
-                service.getChangelog().setExternal(null);
                 service.getChangelog().setSort(org.jreleaser.model.Changelog.Sort.DESC);
             }
             if (service.isReleaseSupported()) {

diff --git a/sdks/jreleaser-github-java-sdk/src/main/java/org/jreleaser/sdk/github/GithubReleaser.java b/sdks/jreleaser-github-java-sdk/src/main/java/org/jreleaser/sdk/github/GithubReleaser.java
@@ -87,7 +87,6 @@ public org.jreleaser.model.api.release.GithubReleaser getReleaser() {
 
     @Override
     public String generateReleaseNotes() throws IOException {
-
         if (github.getReleaseNotes().isEnabled()) {
             String content = generateReleaseNotesByAPI();