Merge branch '2.4.x'

See gh-25344

Author: wilkinsona

ci/scripts/generate-changelog.sh

@@ -2,7 +2,7 @@
 set -e
 
 CONFIG_DIR=git-repo/ci/config
-version=$( cat version/version )
+version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 
 java -jar /github-changelog-generator.jar \
   --spring.config.location=${CONFIG_DIR}/changelog-generator.yml \

ci/tasks/generate-changelog.yml

@@ -7,7 +7,7 @@ image_resource:
     tag: '0.0.5'
 inputs:
 - name: git-repo
-- name: version
+- name: artifactory-repo
 outputs:
 - name: generated-changelog
 params: