Skip to content

Commit 18267be

Browse files
committed
Merge branch '2.7.x' into 3.0.x
2 parents e778355 + fe69930 commit 18267be

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

ci/config/release-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ spring:
33
banner-mode: off
44
sonatype:
55
exclude:
6-
- "build-info\.json"
6+
- "build-info.json"
77
- "org/springframework/boot/spring-boot-docs/.*"
88
sdkman:
99
artifact: "org.springframework.boot:spring-boot-cli:*:zip:bin"

ci/pipeline.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ anchors:
2828
GITHUB_USERNAME: ((github-username))
2929
MILESTONE: ((milestone))
3030
sontatype-task-params: &sonatype-task-params
31-
SONATYPE_USER: ((sonatype-username))
31+
SONATYPE_USERNAME: ((sonatype-username))
3232
SONATYPE_PASSWORD: ((sonatype-password))
3333
SONATYPE_URL: ((sonatype-url))
3434
SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
@@ -463,7 +463,6 @@ jobs:
463463
- name: promote-milestone
464464
serial: true
465465
plan:
466-
- get: ci-image
467466
- get: git-repo
468467
trigger: false
469468
- get: artifactory-repo
@@ -473,7 +472,6 @@ jobs:
473472
download_artifacts: false
474473
save_build_info: true
475474
- task: promote
476-
image: ci-image
477475
file: git-repo/ci/tasks/promote.yml
478476
params:
479477
RELEASE_TYPE: M
@@ -492,7 +490,6 @@ jobs:
492490
- name: promote-rc
493491
serial: true
494492
plan:
495-
- get: ci-image
496493
- get: git-repo
497494
trigger: false
498495
- get: artifactory-repo
@@ -502,7 +499,6 @@ jobs:
502499
download_artifacts: false
503500
save_build_info: true
504501
- task: promote
505-
image: ci-image
506502
file: git-repo/ci/tasks/promote.yml
507503
params:
508504
RELEASE_TYPE: RC
@@ -521,7 +517,6 @@ jobs:
521517
- name: promote-release
522518
serial: true
523519
plan:
524-
- get: ci-image
525520
- get: git-repo
526521
trigger: false
527522
- get: artifactory-repo
@@ -532,7 +527,6 @@ jobs:
532527
save_build_info: true
533528
threads: 8
534529
- task: promote
535-
image: ci-image
536530
file: git-repo/ci/tasks/promote.yml
537531
params:
538532
RELEASE_TYPE: RELEASE
@@ -580,15 +574,13 @@ jobs:
580574
- name: publish-to-sdkman
581575
serial: true
582576
plan:
583-
- get: ci-image
584577
- get: git-repo
585578
- get: artifactory-repo
586579
passed: [create-github-release]
587580
params:
588581
download_artifacts: false
589582
save_build_info: true
590583
- task: publish-to-sdkman
591-
image: ci-image
592584
file: git-repo/ci/tasks/publish-to-sdkman.yml
593585
params:
594586
<<: *sdkman-task-params

ci/tasks/promote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ params:
1717
ARTIFACTORY_URL:
1818
ARTIFACTORY_USERNAME:
1919
ARTIFACTORY_PASSWORD:
20-
SONATYPE_USER:
20+
SONATYPE_USERNAME:
2121
SONATYPE_PASSWORD:
2222
SONATYPE_URL:
2323
SONATYPE_STAGING_PROFILE_ID:

0 commit comments

Comments
 (0)