Merge branch '2.2.x' into 2.3.x

Closes gh-23495

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

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