From ef5b587f90cbaa4178f2db2387e7103ba2db00b8 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 16 Mar 2021 14:49:58 +0100
Subject: [PATCH] Fix release pipeline for Maven Central publication

This commit fixes the missing pieces in our Maven Central publication
pipeline. Our first attempt at releasing with it showed a few problems:

* The promote task did not have the artifacts downloaded with the
  artifactory repository.
* We applied the wrong Sonatype credentials to the task.
* The github changelog task would fail because of docker rate limiting
  since we were not using the right type of resource, which is
  configured with the proper caching mechanism.

See gh-1199
---
 ci/images/setup.sh              | 2 +-
 ci/pipeline.yml                 | 6 +++---
 ci/tasks/generate-changelog.yml | 2 +-
 ci/tasks/promote.yml            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 24cb4ba5..a49b23ed 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -14,7 +14,7 @@ rm -rf /var/lib/apt/lists/*
 
 curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
 
-curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.0/concourse-release-scripts-0.3.0.jar
+curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.1/concourse-release-scripts-0.3.1.jar
 
 ###########################################################
 # JAVA
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index fac1ccb1..7b2ab852 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -38,8 +38,8 @@ anchors:
     icon_emoji: ":concourse:"
     username: concourse-ci
   sontatype-task-params: &sonatype-task-params
-    SONATYPE_USER_TOKEN: ((sonatype-user-token))
-    SONATYPE_PASSWORD_TOKEN: ((sonatype-user-token-password))
+    SONATYPE_USERNAME: ((sonatype-username))
+    SONATYPE_PASSWORD: ((sonatype-password))
     SONATYPE_URL: ((sonatype-url))
     SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
 resource_types:
@@ -360,7 +360,7 @@ jobs:
     trigger: false
     passed: [stage-release]
     params:
-      download_artifacts: false
+      download_artifacts: true
       save_build_info: true
   - task: promote
     image: ci-image
diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml
index f4351023..ce0f4332 100644
--- a/ci/tasks/generate-changelog.yml
+++ b/ci/tasks/generate-changelog.yml
@@ -1,7 +1,7 @@
 ---
 platform: linux
 image_resource:
-  type: registry-image
+  type: docker-image
   source:
     repository: springio/github-changelog-generator
     tag: '0.0.6'
diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml
index acb8f2ef..d17d52c3 100644
--- a/ci/tasks/promote.yml
+++ b/ci/tasks/promote.yml
@@ -9,8 +9,8 @@ params:
   ARTIFACTORY_SERVER:
   ARTIFACTORY_USERNAME:
   ARTIFACTORY_PASSWORD:
-  SONATYPE_USER_TOKEN:
-  SONATYPE_PASSWORD_TOKEN:
+  SONATYPE_USER:
+  SONATYPE_PASSWORD:
   SONATYPE_URL:
   SONATYPE_STAGING_PROFILE_ID:
 run: