Merge branch '2.1.x' into 2.2.x

Closes gh-23494

Author: philwebb

ci/pipeline.yml

@@ -549,17 +549,17 @@ jobs:
     params:
       RELEASE_TYPE: M
       <<: *artifactory-task-params
-  - task: generate-release-notes
-    file: git-repo/ci/tasks/generate-release-notes.yml
+  - task: generate-changelog
+    file: git-repo/ci/tasks/generate-changelog.yml
     params:
       RELEASE_TYPE: M
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-pre-release
     params:
-      name: generated-release-notes/tag
-      tag: generated-release-notes/tag
-      body: generated-release-notes/release-notes.md
+      name: generated-changelog/tag
+      tag: generated-changelog/tag
+      body: generated-changelog/changelog.md
 - name: promote-rc
   serial: true
   plan:
@@ -578,17 +578,17 @@ jobs:
     params:
       RELEASE_TYPE: RC
       <<: *artifactory-task-params
-  - task: generate-release-notes
-    file: git-repo/ci/tasks/generate-release-notes.yml
+  - task: generate-changelog
+    file: git-repo/ci/tasks/generate-changelog.yml
     params:
       RELEASE_TYPE: RC
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-pre-release
     params:
-      name: generated-release-notes/tag
-      tag: generated-release-notes/tag
-      body: generated-release-notes/release-notes.md
+      name: generated-changelog/tag
+      tag: generated-changelog/tag
+      body: generated-changelog/changelog.md
 - name: promote-release
   serial: true
   plan:
@@ -625,17 +625,17 @@ jobs:
     params:
       <<: *bintray-task-params
       <<: *sonatype-task-params
-  - task: generate-release-notes
-    file: git-repo/ci/tasks/generate-release-notes.yml
+  - task: generate-changelog
+    file: git-repo/ci/tasks/generate-changelog.yml
     params:
       RELEASE_TYPE: RELEASE
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
   - put: github-release
     params:
-      name: generated-release-notes/tag
-      tag: generated-release-notes/tag
-      body: generated-release-notes/release-notes.md
+      name: generated-changelog/tag
+      tag: generated-changelog/tag
+      body: generated-changelog/changelog.md
 groups:
 - name: "builds"
   jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]

ci/scripts/generate-changelog.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+version=$( cat version/version )
+
+milestone=${version}
+if [[ $RELEASE_TYPE = "RELEASE" ]]; then
+	milestone=${version%.RELEASE}
+fi
+
+java -jar /github-changelog-generator.jar \
+  --changelog.repository=spring-projects/spring-boot  \
+  ${milestone} generated-changelog/changelog.md
+
+echo ${version} > generated-changelog/version
+echo v${version} > generated-changelog/tag

ci/scripts/generate-release-notes.sh

@@ -3,18 +3,18 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: springio/github-release-notes-generator
-    tag: '0.0.2'
+    repository: springio/github-changelog-generator
+    tag: '0.0.3'
 inputs:
 - name: git-repo
 - name: version
 outputs:
-- name: generated-release-notes
+- name: generated-changelog
 params:
   GITHUB_ORGANIZATION:
   GITHUB_REPO:
   GITHUB_USERNAME:
   GITHUB_TOKEN:
   RELEASE_TYPE:
 run:
-  path: git-repo/ci/scripts/generate-release-notes.sh
+  path: git-repo/ci/scripts/generate-changelog.sh