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

Merge branch '2.7.x' into 3.0.x

This commit is contained in:
Andy Wilkinson 2023-10-19 10:32:46 +01:00
parent e778355bd7 fe69930ac7
commit 18267be47d
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/config/release-scripts.yml
View File

@ -3,7 +3,7 @@ spring:
banner-mode: off banner-mode: off
sonatype: sonatype:
exclude: exclude:
- "build-info\.json" - "build-info.json"
- "org/springframework/boot/spring-boot-docs/.*" - "org/springframework/boot/spring-boot-docs/.*"
sdkman: sdkman:
artifact: "org.springframework.boot:spring-boot-cli:*:zip:bin" artifact: "org.springframework.boot:spring-boot-cli:*:zip:bin"

10
ci/pipeline.yml
View File

@ -28,7 +28,7 @@ anchors:
GITHUB_USERNAME: ((github-username)) GITHUB_USERNAME: ((github-username))
MILESTONE: ((milestone)) MILESTONE: ((milestone))
sontatype-task-params: &sonatype-task-params sontatype-task-params: &sonatype-task-params
SONATYPE_USER: ((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_ID: ((sonatype-staging-profile-id))
@ -463,7 +463,6 @@ jobs:
- name: promote-milestone - name: promote-milestone
serial: true serial: true
plan: plan:
- get: ci-image
- get: git-repo - get: git-repo
trigger: false trigger: false
- get: artifactory-repo - get: artifactory-repo
@ -473,7 +472,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.yml file: git-repo/ci/tasks/promote.yml
params: params:
RELEASE_TYPE: M RELEASE_TYPE: M
@ -492,7 +490,6 @@ jobs:
- name: promote-rc - name: promote-rc
serial: true serial: true
plan: plan:
- get: ci-image
- get: git-repo - get: git-repo
trigger: false trigger: false
- get: artifactory-repo - get: artifactory-repo
@ -502,7 +499,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.yml file: git-repo/ci/tasks/promote.yml
params: params:
RELEASE_TYPE: RC RELEASE_TYPE: RC
@ -521,7 +517,6 @@ jobs:
- name: promote-release - name: promote-release
serial: true serial: true
plan: plan:
- get: ci-image
- get: git-repo - get: git-repo
trigger: false trigger: false
- get: artifactory-repo - get: artifactory-repo
@ -532,7 +527,6 @@ jobs:
save_build_info: true save_build_info: true
threads: 8 threads: 8
- task: promote - task: promote
image: ci-image
file: git-repo/ci/tasks/promote.yml file: git-repo/ci/tasks/promote.yml
params: params:
RELEASE_TYPE: RELEASE RELEASE_TYPE: RELEASE
@ -580,7 +574,6 @@ jobs:
- name: publish-to-sdkman - name: publish-to-sdkman
serial: true serial: true
plan: plan:
- get: ci-image
- get: git-repo - get: git-repo
- get: artifactory-repo - get: artifactory-repo
passed: [create-github-release] passed: [create-github-release]
@ -588,7 +581,6 @@ jobs:
download_artifacts: false download_artifacts: false
save_build_info: true save_build_info: true
- task: publish-to-sdkman - task: publish-to-sdkman
image: ci-image
file: git-repo/ci/tasks/publish-to-sdkman.yml file: git-repo/ci/tasks/publish-to-sdkman.yml
params: params:
<<: *sdkman-task-params <<: *sdkman-task-params

2
ci/tasks/promote.yml
View File

@ -17,7 +17,7 @@ params:
ARTIFACTORY_URL: ARTIFACTORY_URL:
ARTIFACTORY_USERNAME: ARTIFACTORY_USERNAME:
ARTIFACTORY_PASSWORD: ARTIFACTORY_PASSWORD:
SONATYPE_USER: SONATYPE_USERNAME:
SONATYPE_PASSWORD: SONATYPE_PASSWORD:
SONATYPE_URL: SONATYPE_URL:
SONATYPE_STAGING_PROFILE_ID: SONATYPE_STAGING_PROFILE_ID: