Migrate update site to repo.spring.io

Closes gh-263

Author: philwebb

README.adoc

@@ -193,7 +193,7 @@ You can also add a `.eclipse/eclipse.properties` file to customize the following
 To install the plugin use the `io.spring.javaformat.eclipse.site` zip file.
 You can download the latest version from
 https://repo.spring.io/release/io/spring/javaformat/io.spring.javaformat.eclipse.site/{release-version}[repo.spring.io]
-or use the https://dl.bintray.com/spring/javaformat-eclipse/[update site].
+or use the https://repo.spring.io/javaformat-eclipse-update-site/[update site].
 
 === IntelliJ IDEA
 The IntelliJ IDEA plugin provides custom formatter support for IntelliJ IDEA.

ci/pipeline.yml

@@ -200,9 +200,6 @@ jobs:
   - task: publish-eclipse-update-site
     image: ci-image
     file: git-repo/ci/tasks/publish-eclipse-update-site.yml
-    params:
-      BINTRAY_USERNAME: ((bintray-username))
-      BINTRAY_API_KEY: ((bintray-api-key))
 groups:
 - name: "builds"
   jobs: ["build"]

ci/scripts/publish-eclipse-update-site.sh

@@ -9,25 +9,23 @@ groupId=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].i
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 
 echo "Publishing ${buildName}/${buildNumber} to Eclipse Update Site"
-# We need to push twice for some reason otherwise we get out of date versions
-for i in {1..2}; do
-	curl \
-		-s \
-		--connect-timeout 240 \
-		--max-time 2700 \
-		-u ${BINTRAY_USERNAME}:${BINTRAY_API_KEY} \
-		-f \
-		-X PUT \
-		-T "artifactory-repo/io/spring/javaformat/io.spring.javaformat.eclipse.site/${version}/io.spring.javaformat.eclipse.site-${version}.zip" \
-		"https://api.bintray.com/content/spring/javaformat-eclipse/update-site/${version}/${version}/site.zip?explode=1&publish=1" > /dev/null || { echo "Failed to publish" >&2; exit 1; }
-	releasedVersions=$( curl -f -X GET https://api.bintray.com/packages/spring/javaformat-eclipse/update-site | jq -r '.versions[]' )
-	sleep 30
-done
-
-respositories=""
+curl \
+	-s \
+	--connect-timeout 240 \
+	--max-time 2700 \
+	-u ${ARTIFACTORY_USERNAME}:${ARTIFACTORY_PASSWORD} \
+	-f \
+	-H "X-Explode-Archive: true"
+	-X PUT \
+	-T "artifactory-repo/io/spring/javaformat/io.spring.javaformat.eclipse.site/${version}/io.spring.javaformat.eclipse.site-${version}.zip" \
+	"https://repo.spring.io/javaformat-eclipse-update-site/${version}" > /dev/null || { echo "Failed to publish" >&2; exit 1; }
+
+releasedVersions=$( curl -s -f -X GET https://repo.spring.io/api/storage/javaformat-eclipse-update-site | jq -r '.children[] | .uri' | cut -c 2- | grep '\d.*' | sort -V )
+
+repositories=""
 while read -r releasedVersion; do
 	echo "Adding repository for ${releasedVersion}"
-	respositories="${respositories}<repository><url>https://dl.bintray.com/spring/javaformat-eclipse/${releasedVersion}</url><layout>p2</layout></repository>"
+	repositories="${repositories}<repository><url>https://repo.spring.io/javaformat-eclipse-update-site/${releasedVersion}</url><layout>p2</layout></repository>"
 done <<< "${releasedVersions}"
 
 pushd git-repo > /dev/null
@@ -38,21 +36,21 @@ curl \
 		-s \
 		--connect-timeout 240 \
 		--max-time 2700 \
-		-u ${BINTRAY_USERNAME}:${BINTRAY_API_KEY} \
+		-u ${ARTIFACTORY_USERNAME}:${ARTIFACTORY_PASSWORD} \
 		-f \
 		-X PUT \
 		-T "target/repository/content.jar" \
-		"https://api.bintray.com/content/spring/javaformat-eclipse/content.jar" > /dev/null || { echo "Failed to publish" >&2; exit 1; }
+		"https://repo.spring.io/javaformat-eclipse-update-site" > /dev/null || { echo "Failed to publish" >&2; exit 1; }
 
 curl \
 		-s \
 		--connect-timeout 240 \
 		--max-time 2700 \
-		-u ${BINTRAY_USERNAME}:${BINTRAY_API_KEY} \
+		-u ${ARTIFACTORY_USERNAME}:${ARTIFACTORY_PASSWORD} \
 		-f \
 		-X PUT \
 		-T "target/repository/artifacts.jar" \
-		"https://api.bintray.com/content/spring/javaformat-eclipse/artifacts.jar" > /dev/null || { echo "Failed to publish" >&2; exit 1; }
+		"https://repo.spring.io/javaformat-eclipse-update-site" > /dev/null || { echo "Failed to publish" >&2; exit 1; }
 
 popd > /dev/null
 

ci/tasks/publish-eclipse-update-site.yml

@@ -4,7 +4,7 @@ inputs:
 - name: git-repo
 - name: artifactory-repo
 params:
-  BINTRAY_USERNAME:
-  BINTRAY_API_KEY:
+  ARTIFACTORY_USERNAME: ((artifactory-username))
+  ARTIFACTORY_PASSWORD: ((artifactory-password))
 run:
   path: git-repo/ci/scripts/publish-eclipse-update-site.sh