root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Brian Clozel 2022-05-03 15:11:23 +02:00
parent f692a15460 5b1719cd77
commit c68665980f
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/images/ci-image/Dockerfile
View File

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

4
ci/images/get-jdk-url.sh
View File

@ -3,10 +3,10 @@ set -e
case "$1" in case "$1" in
java17) java17)
echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz" echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz"
;; ;;
java18) java18)
echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18%2B36/OpenJDK18U-jdk_x64_linux_hotspot_18_36.tar.gz" echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_linux_hotspot_18.0.1_10.tar.gz"
;; ;;
*) *)
echo $"Unknown java version" echo $"Unknown java version"

2
ci/images/setup.sh
View File

@ -14,8 +14,6 @@ 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 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.2/concourse-release-scripts-0.3.2.jar
########################################################### ###########################################################
# JAVA # JAVA
########################################################### ###########################################################

1
ci/parameters.yml
View File

@ -1,5 +1,6 @@
github-repo: "https://github.com/spring-projects/spring-framework.git" github-repo: "https://github.com/spring-projects/spring-framework.git"
github-repo-name: "spring-projects/spring-framework" github-repo-name: "spring-projects/spring-framework"
sonatype-staging-profile: "org.springframework"
docker-hub-organization: "springci" docker-hub-organization: "springci"
artifactory-server: "https://repo.spring.io" artifactory-server: "https://repo.spring.io"
branch: "main" branch: "main"

7
ci/pipeline.yml
View File

@ -12,7 +12,7 @@ anchors:
SONATYPE_USERNAME: ((sonatype-username)) SONATYPE_USERNAME: ((sonatype-username))
SONATYPE_PASSWORD: ((sonatype-password)) SONATYPE_PASSWORD: ((sonatype-password))
SONATYPE_URL: ((sonatype-url)) SONATYPE_URL: ((sonatype-url))
SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id)) SONATYPE_STAGING_PROFILE: ((sonatype-staging-profile))
artifactory-task-params: &artifactory-task-params artifactory-task-params: &artifactory-task-params
ARTIFACTORY_SERVER: ((artifactory-server)) ARTIFACTORY_SERVER: ((artifactory-server))
ARTIFACTORY_USERNAME: ((artifactory-username)) ARTIFACTORY_USERNAME: ((artifactory-username))
@ -85,7 +85,7 @@ resources:
branch: ((branch)) branch: ((branch))
paths: ["ci/images/*"] paths: ["ci/images/*"]
- name: ci-image - name: ci-image
type: docker-image type: registry-image
icon: docker icon: docker
source: source:
<<: *docker-resource-source <<: *docker-resource-source
@ -309,7 +309,6 @@ jobs:
download_artifacts: false download_artifacts: false
save_build_info: true save_build_info: true
- task: promote - task: promote
image: ci-image
file: git-repo/ci/tasks/promote-version.yml file: git-repo/ci/tasks/promote-version.yml
params: params:
RELEASE_TYPE: M RELEASE_TYPE: M
@ -354,7 +353,6 @@ jobs:
download_artifacts: false download_artifacts: false
save_build_info: true save_build_info: true
- task: promote - task: promote
image: ci-image
file: git-repo/ci/tasks/promote-version.yml file: git-repo/ci/tasks/promote-version.yml
params: params:
RELEASE_TYPE: RC RELEASE_TYPE: RC
@ -399,7 +397,6 @@ jobs:
download_artifacts: true download_artifacts: true
save_build_info: true save_build_info: true
- task: promote - task: promote
image: ci-image
file: git-repo/ci/tasks/promote-version.yml file: git-repo/ci/tasks/promote-version.yml
params: params:
RELEASE_TYPE: RELEASE RELEASE_TYPE: RELEASE

4
ci/scripts/promote-version.sh
View File

@ -6,11 +6,11 @@ CONFIG_DIR=git-repo/ci/config
version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' ) version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json
java -jar /opt/concourse-release-scripts.jar \ java -jar /concourse-release-scripts.jar \
--spring.config.location=${CONFIG_DIR}/release-scripts.yml \ --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; } publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; }
java -jar /opt/concourse-release-scripts.jar \ java -jar /concourse-release-scripts.jar \
--spring.config.location=${CONFIG_DIR}/release-scripts.yml \ --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; } promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }

7
ci/tasks/promote-version.yml
View File

@ -1,5 +1,10 @@
--- ---
platform: linux platform: linux
image_resource:
type: registry-image
source:
repository: springio/concourse-release-scripts
tag: '0.3.4'
inputs: inputs:
- name: git-repo - name: git-repo
- name: artifactory-repo - name: artifactory-repo
@ -13,6 +18,6 @@ params:
SONATYPE_USER: SONATYPE_USER:
SONATYPE_PASSWORD: SONATYPE_PASSWORD:
SONATYPE_URL: SONATYPE_URL:
SONATYPE_STAGING_PROFILE_ID: SONATYPE_STAGING_PROFILE:
run: run:
path: git-repo/ci/scripts/promote-version.sh path: git-repo/ci/scripts/promote-version.sh