Merge branch '2.4.x' into 2.5.x

wilkinsona · wilkinsona · commit 3e99a97bd8bd · 2021-07-22T12:11:43.000+01:00
Closes gh-27457
diff --git a/ci/scripts/publish-gradle-plugin.sh b/ci/scripts/publish-gradle-plugin.sh
@@ -4,4 +4,4 @@ source $(dirname $0)/common.sh
 
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 
-git-repo/gradlew publishExisting -p git-repo/config/gradle-plugin-publishing -Pgradle.publish.key=${GRADLE_PUBLISH_KEY} -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET} -PbootVersion=${version} -PrepositoryRoot=$(pwd)/artifactory-repo
+git-repo/gradlew publishExisting -p git-repo/ci/config/gradle-plugin-publishing -Pgradle.publish.key=${GRADLE_PUBLISH_KEY} -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET} -PbootVersion=${version} -PrepositoryRoot=$(pwd)/artifactory-repo

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source $(dirname $0)/common.sh`
`4`	`4`
`5`	`5`	`version=$( cat artifactory-repo/build-info.json \| jq -r '.buildInfo.modules[0].id' \| sed 's/.:.:\(.*\)/\1/' )`
`6`	`6`
`7`		`-git-repo/gradlew publishExisting -p git-repo/config/gradle-plugin-publishing -Pgradle.publish.key=${GRADLE_PUBLISH_KEY} -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET} -PbootVersion=${version} -PrepositoryRoot=$(pwd)/artifactory-repo`
	`7`	`+git-repo/gradlew publishExisting -p git-repo/ci/config/gradle-plugin-publishing -Pgradle.publish.key=${GRADLE_PUBLISH_KEY} -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET} -PbootVersion=${version} -PrepositoryRoot=$(pwd)/artifactory-repo`