Merge branch '6.1.x'

.github/workflows/build-and-deploy-snapshot.yml

@@ -2,7 +2,7 @@ name: Build and deploy snapshot
 on:
  push:
  branches:
- - 6.2.x
+ - main
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
 jobs:

.github/workflows/ci.yml

@@ -1,8 +1,7 @@
 name: CI
 on:
- push:
- branches:
- - 6.2.x
+ schedule:
+ - cron: '30 9 * * *'
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
 jobs:

ci/parameters.yml

@@ -8,4 +8,3 @@ milestone: "6.2.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
-task-timeout: 1h00m

ci/pipeline.yml

@@ -23,14 +23,6 @@ anchors:
  docker-resource-source: &docker-resource-source
  username: ((docker-hub-username))
  password: ((docker-hub-password))
- slack-fail-params: &slack-fail-params
- text: >
- :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
- [$TEXT_FILE_CONTENT]
- text_file: git-repo/build/build-scan-uri.txt
- silent: true
- icon_emoji: ":concourse:"
- username: concourse-ci
  changelog-task-params: &changelog-task-params
  name: generated-changelog/tag
  tag: generated-changelog/tag
@@ -64,12 +56,6 @@ resource_types:
  <<: *docker-resource-source
  repository: dpb587/github-status-resource
  tag: master
-- name: slack-notification
- type: registry-image
- source:
- <<: *docker-resource-source
- repository: cfcommunity/slack-notification-resource
- tag: latest
 resources:
 - name: git-repo
  type: git
@@ -90,13 +76,6 @@ resources:
  <<: *docker-resource-source
  repository: ((docker-hub-organization))/spring-framework-ci
  tag: ((milestone))
-- name: every-morning
- type: time
- icon: alarm
- source:
- start: 8:00 AM
- stop: 9:00 AM
- location: Europe/Vienna
 - name: artifactory-repo
  type: artifactory-resource
  icon: package-variant
@@ -105,35 +84,6 @@ resources:
  username: ((artifactory-username))
  password: ((artifactory-password))
  build_name: ((build-name))
-- name: repo-status-build
- type: github-status-resource
- icon: eye-check-outline
- source:
- repository: ((github-repo-name))
- access_token: ((github-ci-status-token))
- branch: ((branch))
- context: build
-- name: repo-status-jdk21-build
- type: github-status-resource
- icon: eye-check-outline
- source:
- repository: ((github-repo-name))
- access_token: ((github-ci-status-token))
- branch: ((branch))
- context: jdk21-build
-- name: repo-status-jdk23-build
- type: github-status-resource
- icon: eye-check-outline
- source:
- repository: ((github-repo-name))
- access_token: ((github-ci-status-token))
- branch: ((branch))
- context: jdk23-build
-- name: slack-alert
- type: slack-notification
- icon: slack
- source:
- url: ((slack-webhook-url))
 - name: github-pre-release
  type: github-release
  icon: briefcase-download-outline
@@ -168,115 +118,6 @@ jobs:
  - put: ci-image
  params:
  image: ci-image/image.tar
-- name: build
- serial: true
- public: true
- plan:
- - get: ci-image
- - get: git-repo
- trigger: true
- - put: repo-status-build
- params: { state: "pending", commit: "git-repo" }
- - do:
- - task: build-project
- image: ci-image
- file: git-repo/ci/tasks/build-project.yml
- privileged: true
- timeout: ((task-timeout))
- params:
- <<: *build-project-task-params
- on_failure:
- do:
- - put: repo-status-build
- params: { state: "failure", commit: "git-repo" }
- - put: slack-alert
- params:
- <<: *slack-fail-params
- - put: repo-status-build
- params: { state: "success", commit: "git-repo" }
- - put: artifactory-repo
- params: &artifactory-params
- signing_key: ((signing-key))
- signing_passphrase: ((signing-passphrase))
- repo: libs-snapshot-local
- folder: distribution-repository
- build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
- build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
- disable_checksum_uploads: true
- threads: 8
- artifact_set:
- - include:
- - "/**/framework-api-*.zip"
- properties:
- "zip.name": "spring-framework"
- "zip.displayname": "Spring Framework"
- "zip.deployed": "false"
- - include:
- - "/**/framework-api-*-docs.zip"
- properties:
- "zip.type": "docs"
- - include:
- - "/**/framework-api-*-schema.zip"
- properties:
- "zip.type": "schema"
- get_params:
- threads: 8
-- name: jdk21-build
- serial: true
- public: true
- plan:
- - get: ci-image
- - get: git-repo
- - get: every-morning
- trigger: true
- - put: repo-status-jdk21-build
- params: { state: "pending", commit: "git-repo" }
- - do:
- - task: check-project
- image: ci-image
- file: git-repo/ci/tasks/check-project.yml
- privileged: true
- timeout: ((task-timeout))
- params:
- TEST_TOOLCHAIN: 21
- <<: *build-project-task-params
- on_failure:
- do:
- - put: repo-status-jdk21-build
- params: { state: "failure", commit: "git-repo" }
- - put: slack-alert
- params:
- <<: *slack-fail-params
- - put: repo-status-jdk21-build
- params: { state: "success", commit: "git-repo" }
-- name: jdk23-build
- serial: true
- public: true
- plan:
- - get: ci-image
- - get: git-repo
- - get: every-morning
- trigger: false
- - put: repo-status-jdk23-build
- params: { state: "pending", commit: "git-repo" }
- - do:
- - task: check-project
- image: ci-image
- file: git-repo/ci/tasks/check-project.yml
- privileged: true
- timeout: ((task-timeout))
- params:
- TEST_TOOLCHAIN: 23
- <<: *build-project-task-params
- on_failure:
- do:
- - put: repo-status-jdk23-build
- params: { state: "failure", commit: "git-repo" }
- - put: slack-alert
- params:
- <<: *slack-fail-params
- - put: repo-status-jdk23-build
- params: { state: "success", commit: "git-repo" }
 - name: stage-milestone
  serial: true
  plan:
@@ -290,9 +131,32 @@ jobs:
  RELEASE_TYPE: M
  <<: *gradle-enterprise-task-params
  - put: artifactory-repo
- params:
- <<: *artifactory-params
+ params: &artifactory-params
+ signing_key: ((signing-key))
+ signing_passphrase: ((signing-passphrase))
  repo: libs-staging-local
+ folder: distribution-repository
+ build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
+ build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
+ disable_checksum_uploads: true
+ threads: 8
+ artifact_set:
+ - include:
+ - "/**/framework-api-*.zip"
+ properties:
+ "zip.name": "spring-framework"
+ "zip.displayname": "Spring Framework"
+ "zip.deployed": "false"
+ - include:
+ - "/**/framework-api-*-docs.zip"
+ properties:
+ "zip.type": "docs"
+ - include:
+ - "/**/framework-api-*-schema.zip"
+ properties:
+ "zip.type": "schema"
+ get_params:
+ threads: 8
  - put: git-repo
  params:
  repository: stage-git-repo
@@ -337,7 +201,6 @@ jobs:
  - put: artifactory-repo
  params:
  <<: *artifactory-params
- repo: libs-staging-local
  - put: git-repo
  params:
  repository: stage-git-repo
@@ -382,7 +245,6 @@ jobs:
  - put: artifactory-repo
  params:
  <<: *artifactory-params
- repo: libs-staging-local
  - put: git-repo
  params:
  repository: stage-git-repo