Merge branch '0.10.x'

See gh-1200

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

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_USERNAME: ((sonatype-username))
-    SONATYPE_PASSWORD_TOKEN: ((sonatype-user-token-password))
+    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

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'

ci/tasks/promote.yml

@@ -9,8 +9,8 @@ params:
   ARTIFACTORY_SERVER:
   ARTIFACTORY_USERNAME:
   ARTIFACTORY_PASSWORD:
-  SONATYPE_USER_TOKEN:
+  SONATYPE_USER:
-  SONATYPE_PASSWORD_TOKEN:
+  SONATYPE_PASSWORD:
   SONATYPE_URL:
   SONATYPE_STAGING_PROFILE_ID:
 run: