From bdb6b2a4bb40b5724d955f3ad8755b1f4e02a5db Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 14 Oct 2020 14:59:27 +0200
Subject: [PATCH] Add configuration for changelog generator

This commits adds a dedicated configuration to be used when invoking
the github changelog generator. This custom configuration makes sure
to sort dependency upgrades based on the issue title.

Closes gh-23484
---
 ci/config/changelog-generator.yml | 17 +++++++++++++++++
 ci/scripts/generate-changelog.sh  |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 ci/config/changelog-generator.yml

diff --git a/ci/config/changelog-generator.yml b/ci/config/changelog-generator.yml
new file mode 100644
index 00000000000..3933ed1e44c
--- /dev/null
+++ b/ci/config/changelog-generator.yml
@@ -0,0 +1,17 @@
+changelog:
+  repository: spring-projects/spring-boot
+  sections:
+    - title: ":star: New Features"
+      labels:
+        - "type: enhancement"
+    - title: ":beetle: Bug Fixes"
+      labels:
+        - "type: bug"
+        - "type: regression"
+    - title: ":notebook_with_decorative_cover: Documentation"
+      labels:
+        - "type: documentation"
+    - title: ":hammer: Dependency Upgrades"
+      sort: "title"
+      labels:
+        - "type: dependency-upgrade"
diff --git a/ci/scripts/generate-changelog.sh b/ci/scripts/generate-changelog.sh
index 2f3080245ab..6873a4c0c7a 100755
--- a/ci/scripts/generate-changelog.sh
+++ b/ci/scripts/generate-changelog.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 
+CONFIG_DIR=git-repo/ci/config
 version=$( cat version/version )
 
 milestone=${version}
@@ -9,7 +10,7 @@ if [[ $RELEASE_TYPE = "RELEASE" ]]; then
 fi
 
 java -jar /github-changelog-generator.jar \
-  --changelog.repository=spring-projects/spring-boot  \
+  --spring.config.location=${CONFIG_DIR}/changelog-generator.yml \
   ${milestone} generated-changelog/changelog.md
 
 echo ${version} > generated-changelog/version