Merge branch '0.10.x'

ci/images/ci-image-jdk11/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210723
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/ci-image-jdk16/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210723
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/ci-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210723
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/get-jdk-url.sh

@@ -3,13 +3,13 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz"
+		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
 	;;
 	java16)
-		 echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz"
+		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
 	;;
   *)
 		echo $"Unknown java version"

ci/parameters.yml

@@ -6,4 +6,7 @@ branch: "main"
 milestone: "0.11.x"
 build-name: "initializr"
 concourse-url: "https://ci.spring.io"
-task-timeout: 30m
+task-timeout: 30m
+registry-mirror-host: docker.repo.spring.io
+registry-mirror-username: ((artifactory-username))
+registry-mirror-password: ((artifactory-password))

ci/pipeline.yml

@@ -21,7 +21,7 @@ anchors:
   git-repo-resource-source: &git-repo-resource-source
     uri: ((github-repo))
     username: ((github-username))
-    password: ((github-password))
+    password: ((github-ci-release-token))
     branch: ((branch))
   registry-image-resource-source: &registry-image-resource-source
     username: ((docker-hub-username))
@@ -42,6 +42,10 @@ anchors:
     SONATYPE_PASSWORD: ((sonatype-password))
     SONATYPE_URL: ((sonatype-url))
     SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
+  registry-mirror-vars: &registry-mirror-vars
+    registry-mirror-host: ((registry-mirror-host))
+    registry-mirror-username: ((registry-mirror-username))
+    registry-mirror-password: ((registry-mirror-password))
 resource_types:
 - name: artifactory-resource
   type: registry-image
@@ -173,6 +177,7 @@ jobs:
         image: ci-image
       vars:
         ci-image-name: ci-image
+        <<: *registry-mirror-vars
     - task: build-ci-image-jdk11
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
@@ -180,6 +185,7 @@ jobs:
         image: ci-image-jdk11
       vars:
         ci-image-name: ci-image-jdk11
+        <<: *registry-mirror-vars
     - task: build-ci-image-jdk16
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
@@ -187,6 +193,7 @@ jobs:
         image: ci-image-jdk16
       vars:
         ci-image-name: ci-image-jdk16
+        <<: *registry-mirror-vars
   - in_parallel:
     - put: ci-image
       params:
@@ -386,6 +393,8 @@ jobs:
       RELEASE_TYPE: RELEASE
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
+    vars:
+      <<: *registry-mirror-vars
   - put: github-release
     params:
       name: generated-changelog/tag

ci/scripts/stage.sh

@@ -19,7 +19,7 @@ echo "Staging $stageVersion (next version will be $nextVersion)"
 
 set_revision_to_pom "$stageVersion"
 git config user.name "Spring Buildmaster" > /dev/null
-git config user.email "buildmaster@springframework.org" > /dev/null
+git config user.email "spring-buildmaster@users.noreply.github.com" > /dev/null
 git add pom.xml > /dev/null
 git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null

ci/tasks/build-ci-image.yml

@@ -3,7 +3,12 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: vito/oci-build-task
+    repository: concourse/oci-build-task
+    tag: 0.9.0
+    registry_mirror:
+      host: ((registry-mirror-host))
+      username: ((registry-mirror-username))
+      password: ((registry-mirror-password))
 inputs:
 - name: ci-images-git-repo
 outputs:

ci/tasks/generate-changelog.yml

@@ -5,6 +5,10 @@ image_resource:
   source:
     repository: springio/github-changelog-generator
     tag: '0.0.6'
+    registry_mirror:
+      host: ((registry-mirror-host))
+      username: ((registry-mirror-username))
+      password: ((registry-mirror-password))
 inputs:
   - name: git-repo
   - name: artifactory-repo