Merge branch '2.2.x' into 2.3.x

Closes gh-23697
2020-10-15 09:30:03 +02:00
parent 0abe38d478 e86397bc08
commit 7253ce1c8e
2 changed files with 19 additions and 1 deletions
--- 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