Release v6.0.17

2026-06-08 17:33:33 +00:00 · 2024-02-15 12:23:22 +00:00
236 changed files with 2350 additions and 4960 deletions
@@ -1,33 +0,0 @@
-name: Send notification
-description: Sends a Google Chat message as a notification of the job's outcome
-inputs:
-  webhook-url:
-    description: 'Google Chat Webhook URL'
-    required: true
-  status:
-    description: 'Status of the job'
-    required: true
-  build-scan-url:
-    description: 'URL of the build scan to include in the notification'
-  run-name:
-    description: 'Name of the run to include in the notification'
-    default: ${{ format('{0} {1}', github.ref_name, github.job) }}
-runs:
-  using: composite
-  steps:
-    - shell: bash
-      run: |
-        echo "BUILD_SCAN=${{ inputs.build-scan-url == '' && ' [build scan unavailable]' || format(' [<{0}|Build Scan>]', inputs.build-scan-url) }}" >> "$GITHUB_ENV"
-        echo "RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> "$GITHUB_ENV"
-    - shell: bash
-      if: ${{ inputs.status == 'success' }}
-      run: |
-        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was successful ${{ env.BUILD_SCAN }}"}' || true
-    - shell: bash
-      if: ${{ inputs.status == 'failure' }}
-      run: |
-        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<users/all> *<${{ env.RUN_URL }}|${{ inputs.run-name }}> failed* ${{ env.BUILD_SCAN }}"}' || true
-    - shell: bash
-      if: ${{ inputs.status == 'cancelled' }}
-      run: |
-        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was cancelled"}' || true
@@ -18,13 +18,11 @@ jobs:
      pull-requests: write
    runs-on: ubuntu-latest
    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up Java
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
        with:
-          distribution: 'liberica'
-          java-version: 17
+          distribution: 'temurin'
+          java-version: '17'
      - name: Download BackportBot
        run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
      - name: Backport
@@ -1,63 +0,0 @@
-name: Build and deploy snapshot
-on:
-  push:
-    branches:
-      - 6.0.x
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-jobs:
-  build-and-deploy-snapshot:
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
-    name: Build and deploy snapshot
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'liberica'
-          java-version: 17
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
-        with:
-          cache-read-only: false
-      - name: Configure Gradle properties
-        shell: bash
-        run: |
-          mkdir -p $HOME/.gradle
-          echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
-          echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
-      - name: Build and publish
-        id: build
-        env:
-          CI: 'true'
-          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository
-      - name: Deploy
-        uses: spring-io/artifactory-deploy-action@v0.0.1
-        with:
-          uri: 'https://repo.spring.io'
-          username: ${{ secrets.ARTIFACTORY_USERNAME }}
-          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: ${{ format('spring-framework-{0}', github.ref_name)}}
-          repository: 'libs-snapshot-local'
-          folder: 'deployment-repository'
-          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          artifact-properties: |
-            /**/framework-docs-*.zip::zip.name=spring-framework,zip.deployed=false
-            /**/framework-docs-*-docs.zip::zip.type=docs
-            /**/framework-docs-*-dist.zip::zip.type=dist
-            /**/framework-docs-*-schema.zip::zip.type=schema
-      - name: Send notification
-        uses: ./.github/actions/send-notification
-        if: always()
-        with:
-          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
-          status: ${{ job.status }}
-          build-scan-url: ${{ steps.build.outputs.build-scan-url }}
-          run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
@@ -1,78 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - 6.0.x
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-jobs:
-  ci:
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
-    strategy:
-      matrix:
-        os:
-          - id: ubuntu-latest
-            name: Linux
-        java:
-          - version: 17
-            toolchain: false
-          - version: 21
-            toolchain: true
-        exclude:
-          - os:
-              name: Linux
-            java:
-              version: 17
-    name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
-    runs-on: ${{ matrix.os.id }}
-    steps:
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'liberica'
-          java-version: |
-            ${{ matrix.java.version }}
-            ${{ matrix.java.toolchain && '17' || '' }}
-      - name: Prepare Windows runner
-        if: ${{ runner.os == 'Windows' }}
-        run: |
-          git config --global core.autocrlf true
-          git config --global core.longPaths true
-          Stop-Service -name Docker
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
-        with:
-          cache-read-only: false
-      - name: Configure Gradle properties
-        shell: bash
-        run: |
-          mkdir -p $HOME/.gradle
-          echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
-          echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
-      - name: Configure toolchain properties
-        if: ${{ matrix.java.toolchain }}
-        shell: bash
-        run: |
-          echo toolchainVersion=${{ matrix.java.version }} >> $HOME/.gradle/gradle.properties
-          echo systemProp.org.gradle.java.installations.auto-detect=false >> $HOME/.gradle/gradle.properties
-          echo systemProp.org.gradle.java.installations.auto-download=false >> $HOME/.gradle/gradle.properties
-          echo systemProp.org.gradle.java.installations.paths=${{ format('$JAVA_HOME_{0}_X64', matrix.java.version) }} >> $HOME/.gradle/gradle.properties
-      - name: Build
-        id: build
-        env:
-          CI: 'true'
-          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: ./gradlew check antora
-      - name: Send notification
-        uses: ./.github/actions/send-notification
-        if: always()
-        with:
-          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
-          status: ${{ job.status }}
-          build-scan-url: ${{ steps.build.outputs.build-scan-url }}
-          run-name: ${{ format('{0} | {1} | Java {2}', github.ref_name, matrix.os.name, matrix.java.version) }}
@@ -1,14 +1,12 @@
 name: Deploy Docs
 on:
  push:
-    branches:
-      - 'main'
-      - '*.x'
-      - '!gh-pages'
-    tags:
-      - 'v*'
+    branches-ignore: [ gh-pages ]
+    tags: '**'
  repository_dispatch:
    types: request-build-reference # legacy
+  schedule:
+  - cron: '0 10 * * *' # Once per day at 10am UTC
  workflow_dispatch:
 permissions:
  actions: write
@@ -17,8 +15,8 @@ jobs:
    runs-on: ubuntu-latest
    if: github.repository_owner == 'spring-projects'
    steps:
-    - name: Check out code
-      uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v3
      with:
        ref: docs-build
        fetch-depth: 1
@@ -9,5 +9,5 @@ jobs:
    name: "Validation"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
@@ -51,5 +51,3 @@ atlassian-ide-plugin.xml
 .vscode/

 cached-antora-playbook.yml
-
-node_modules
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.11-librca
+java=17.0.8.1-librca
@@ -1,4 +1,4 @@
-# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://github.com/spring-projects/spring-framework/actions/workflows/build-and-deploy-snapshot.yml/badge.svg?branch=6.0.x)](https://github.com/spring-projects/spring-framework/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3A6.0.x) [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
+# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-6.0.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.0.x?groups=Build") [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)

 This is the home of the Spring Framework: the foundation for all [Spring projects](https://spring.io/projects). Collectively the Spring Framework and the family of Spring projects are often referred to simply as "Spring". 

@@ -3,12 +3,12 @@ plugins {
 	id 'io.freefair.aspectj' version '8.0.1' apply false
 	// kotlinVersion is managed in gradle.properties
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
-	id 'org.jetbrains.dokka' version '1.8.20'
+	id 'org.jetbrains.dokka' version '1.8.10'
 	id 'org.unbroken-dome.xjc' version '2.0.0' apply false
-	id 'com.github.ben-manes.versions' version '0.51.0'
+	id 'com.github.ben-manes.versions' version '0.49.0'
 	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 	id 'de.undercouch.download' version '5.4.0'
-	id 'me.champeau.jmh' version '0.7.2' apply false
+	id 'me.champeau.jmh' version '0.7.1' apply false
 }

 ext {
@@ -106,12 +106,15 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.42")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.41")
 	}

 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
 			"https://jakarta.ee/specifications/platform/9/apidocs/",
+			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ and weblogic.* packages
+			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/", // com.ibm.*
+			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", // org.jboss.resource.*
 			"https://docs.jboss.org/hibernate/orm/5.6/javadocs/",
 			"https://eclipse.dev/aspectj/doc/released/aspectj5rt-api",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
@@ -151,7 +154,7 @@ configure(rootProject) {
 		def rootPath = file(rootDir).toPath()
 		def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/buildSrc"
 		projectDirs.forEach { dir ->
-			[ 'bin', 'build', 'out', '.settings', 'node_modules' ]
+			[ 'bin', 'build', 'out', '.settings' ]
 				.collect { rootPath.relativize(new File(dir, it).toPath()) }
 				.forEach { source.exclude "$it/**" }
 			[ '.classpath', '.project' ]
@@ -1,7 +1,5 @@
 == Spring Framework Concourse pipeline

-NOTE: CI is being migrated to GitHub Actions.
-
 The Spring Framework uses https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
 The Spring team has a dedicated Concourse instance available at https://ci.spring.io with a build pipeline
 for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.0.x[Spring Framework 6.0.x].
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20240125
+FROM ubuntu:jammy-20240111

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -8,3 +8,4 @@ milestone: "6.0.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
+task-timeout: 1h00m
@@ -5,7 +5,9 @@ anchors:
    password: ((github-ci-release-token))
    branch: ((branch))
  gradle-enterprise-task-params: &gradle-enterprise-task-params
-    DEVELOCITY_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+    GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+    GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
+    GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
  sonatype-task-params: &sonatype-task-params
    SONATYPE_USERNAME: ((sonatype-username))
    SONATYPE_PASSWORD: ((sonatype-password))
@@ -21,6 +23,14 @@ 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
@@ -35,7 +45,7 @@ resource_types:
  source:
    <<: *docker-resource-source
    repository: concourse/registry-image-resource
-    tag: 1.8.0
+    tag: 1.5.0
 - name: artifactory-resource
  type: registry-image
  source:
@@ -47,13 +57,19 @@ resource_types:
  source:
    <<: *docker-resource-source
    repository: concourse/github-release-resource
-    tag: 1.8.0
+    tag: 1.5.5
 - name: github-status-resource
  type: registry-image
  source:
    <<: *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
@@ -82,6 +98,19 @@ 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: slack-alert
+  type: slack-notification
+  icon: slack
+  source:
+    url: ((slack-webhook-url))
 - name: github-pre-release
  type: github-release
  icon: briefcase-download-outline
@@ -116,23 +145,37 @@ jobs:
    - put: ci-image
      params:
        image: ci-image/image.tar
- name: stage-milestone
+- name: build
  serial: true
+  public: true
  plan:
  - get: ci-image
  - get: git-repo
-    trigger: false
-  - task: stage
-    image: ci-image
-    file: git-repo/ci/tasks/stage-version.yml
-    params:
-      RELEASE_TYPE: M
-      <<: *gradle-enterprise-task-params
+    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-staging-local
+      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}"
@@ -157,9 +200,27 @@ jobs:
        - "/**/framework-docs-*-schema.zip"
        properties:
          "zip.type": "schema"
-  - put: git-repo
-    params:
-      repository: stage-git-repo
+    get_params:
+      threads: 8
+- name: stage-milestone
+  serial: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+      trigger: false
+    - task: stage
+      image: ci-image
+      file: git-repo/ci/tasks/stage-version.yml
+      params:
+        RELEASE_TYPE: M
+        <<: *gradle-enterprise-task-params
+    - put: artifactory-repo
+      params:
+        <<: *artifactory-params
+        repo: libs-staging-local
+    - put: git-repo
+      params:
+        repository: stage-git-repo
 - name: promote-milestone
  serial: true
  plan:
@@ -201,6 +262,7 @@ jobs:
    - put: artifactory-repo
      params:
        <<: *artifactory-params
+        repo: libs-staging-local
    - put: git-repo
      params:
        repository: stage-git-repo
@@ -245,6 +307,7 @@ jobs:
    - put: artifactory-repo
      params:
        <<: *artifactory-params
+        repo: libs-staging-local
    - put: git-repo
      params:
        repository: stage-git-repo
@@ -289,6 +352,8 @@ jobs:
        <<: *changelog-task-params

 groups:
+- name: "builds"
+  jobs: ["build"]
 - name: "releases"
  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/common.sh
+
+pushd git-repo > /dev/null
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 check
+popd > /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/common.sh
+repository=$(pwd)/distribution-repository
+
+pushd git-repo > /dev/null
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
+popd > /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/common.sh
+
+pushd git-repo > /dev/null
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17 \
+  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora
+popd > /dev/null
@@ -0,0 +1,19 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+caches:
+- path: gradle
+params:
+  BRANCH:
+  CI: true
+  GRADLE_ENTERPRISE_ACCESS_KEY:
+  GRADLE_ENTERPRISE_CACHE_USERNAME:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD:
+  GRADLE_ENTERPRISE_URL: https://ge.spring.io
+run:
+  path: bash
+  args:
+    - -ec
+    - |
+      ${PWD}/git-repo/ci/scripts/build-pr.sh
@@ -0,0 +1,22 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+outputs:
+- name: distribution-repository
+- name: git-repo
+caches:
+- path: gradle
+params:
+  BRANCH:
+  CI: true
+  GRADLE_ENTERPRISE_ACCESS_KEY:
+  GRADLE_ENTERPRISE_CACHE_USERNAME:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD:
+  GRADLE_ENTERPRISE_URL: https://ge.spring.io
+run:
+  path: bash
+  args:
+    - -ec
+    - |
+      ${PWD}/git-repo/ci/scripts/build-project.sh
@@ -0,0 +1,24 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+outputs:
+- name: distribution-repository
+- name: git-repo
+caches:
+- path: gradle
+params:
+  BRANCH:
+  CI: true
+  MAIN_TOOLCHAIN:
+  TEST_TOOLCHAIN:
+  GRADLE_ENTERPRISE_ACCESS_KEY:
+  GRADLE_ENTERPRISE_CACHE_USERNAME:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD:
+  GRADLE_ENTERPRISE_URL: https://ge.spring.io
+run:
+  path: bash
+  args:
+    - -ec
+    - |
+      ${PWD}/git-repo/ci/scripts/check-project.sh
@@ -4,7 +4,7 @@ image_resource:
  type: registry-image
  source:
    repository: springio/concourse-release-scripts
-    tag: '0.4.0'
+    tag: '0.4.0-SNAPSHOT'
    username: ((docker-hub-username))
    password: ((docker-hub-password))
 inputs:
@@ -1,39 +0,0 @@
-antora:
-  extensions:
-  - require: '@springio/antora-extensions'
-    root_component_name: 'framework'
-site:
-  title: Spring Framework
-  url: https://docs.spring.io/spring-framework/reference
-  robots: allow
-git:
-  ensure_git_suffix: false
-content:
-  sources:
-  - url: https://github.com/spring-projects/spring-framework
-    # Refname matching:
-    # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
-    branches: ['main', '{6..9}.+({0..9}).x']
-    tags: ['v{6..9}.+({0..9}).+({0..9})?(-{RC,M}*)', '!(v6.0.{0..8})', '!(v6.0.0-{RC,M}{0..9})']
-    start_path: framework-docs
-asciidoc:
-  extensions:
-    - '@asciidoctor/tabs'
-    - '@springio/asciidoctor-extensions'
-    - '@springio/asciidoctor-extensions/include-code-extension'
-  attributes:
-    page-stackoverflow-url: https://stackoverflow.com/questions/tagged/spring
-    page-pagination: ''
-    hide-uri-scheme: '@'
-    tabs-sync-option: '@'
-    include-java: 'example$docs-src/main/java/org/springframework/docs'
-urls:
-  latest_version_segment_strategy: redirect:to
-  latest_version_segment: ''
-  redirect_facility: httpd
-runtime:
-  log:
-    failure_level: warn
-ui:
-  bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip
@@ -10,10 +10,27 @@ apply from: "${rootDir}/gradle/publications.gradle"


 antora {
-	options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true]
+	version = '3.2.0-alpha.2'
+	playbook = 'cached-antora-playbook.yml'
+	playbookProvider {
+		repository = 'spring-projects/spring-framework'
+		branch = 'docs-build'
+		path = 'lib/antora/templates/per-branch-antora-playbook.yml'
+		checkLocalBranch = true
+	}
+	options = ['--clean', '--stacktrace']
 	environment = [
-			'BUILD_REFNAME': 'HEAD',
-			'BUILD_VERSION': project.version,
+			'ALGOLIA_API_KEY': '82c7ead946afbac3cf98c32446154691',
+			'ALGOLIA_APP_ID': '244V8V9FGG',
+			'ALGOLIA_INDEX_NAME': 'framework-docs'
+	]
+	dependencies = [
+			'@antora/atlas-extension': '1.0.0-alpha.1',
+			'@antora/collector-extension': '1.0.0-alpha.3',
+			'@asciidoctor/tabs': '1.0.0-beta.3',
+			'@opendevise/antora-release-line-extension': '1.0.0-alpha.2',
+			'@springio/antora-extensions': '1.3.0',
+			'@springio/asciidoctor-extensions': '1.0.0-alpha.9'
 	]
 }

@@ -39,8 +39,8 @@
 ** xref:core/resources.adoc[]
 ** xref:core/validation.adoc[]
 *** xref:core/validation/validator.adoc[]
-*** xref:core/validation/beans-beans.adoc[]
 *** xref:core/validation/conversion.adoc[]
+*** xref:core/validation/beans-beans.adoc[]
 *** xref:core/validation/convert.adoc[]
 *** xref:core/validation/format.adoc[]
 *** xref:core/validation/format-configuring-formatting-globaldatetimeformat.adoc[]
@@ -431,4 +431,4 @@
 ** xref:languages/groovy.adoc[]
 ** xref:languages/dynamic.adoc[]
 * xref:appendix.adoc[]
-* https://github.com/spring-projects/spring-framework/wiki[Wiki]
+* https://github.com/spring-projects/spring-framework/wiki[Wiki]
@@ -153,16 +153,15 @@ Letting qualifier values select against target bean names, within the type-match
 candidates, does not require a `@Qualifier` annotation at the injection point.
 If there is no other resolution indicator (such as a qualifier or a primary marker),
 for a non-unique dependency situation, Spring matches the injection point name
-(that is, the field name or parameter name) against the target bean names and chooses
-the same-named candidate, if any (either by bean name or by associated alias).
-
-This requires the `-parameters` Java compiler flag to be present. As a fallback,
-version 6.0 still supports parameter names from debug symbols via `-debug` as well.
+(that is, the field name or parameter name) against the target bean names and chooses the
+same-named candidate, if any.
 ====

-As an alternative for injection by name, consider the JSR-250 `@Resource` annotation
-which is semantically defined to identify a specific target component by its unique name,
-with the declared type being irrelevant for the matching process. `@Autowired` has rather
+That said, if you intend to express annotation-driven injection by name, do not
+primarily use `@Autowired`, even if it is capable of selecting by bean name among
+type-matching candidates. Instead, use the JSR-250 `@Resource` annotation, which is
+semantically defined to identify a specific target component by its unique name, with
+the declared type being irrelevant for the matching process. `@Autowired` has rather
 different semantics: After selecting candidate beans by type, the specified `String`
 qualifier value is considered within those type-selected candidates only (for example,
 matching an `account` qualifier against beans marked with the same qualifier label).
@@ -416,8 +416,8 @@ Kotlin::
 ======

 This approach shows that the factory bean itself can be managed and configured through
-dependency injection (DI).
-See xref:core/beans/dependencies/factory-properties-detailed.adoc[Dependencies and Configuration in Detail].
+dependency injection (DI). See xref:core/beans/dependencies/factory-properties-detailed.adoc[Dependencies and Configuration in Detail]
+.

 NOTE: In Spring documentation, "factory bean" refers to a bean that is configured in the
 Spring container and that creates objects through an
@@ -444,3 +444,5 @@ cases into account and returns the type of object that a `BeanFactory.getBean` c
 going to return for the same bean name.


+
+
@@ -268,8 +268,8 @@ The actual JPA provider bootstrapping is handed off to the specified executor an
 running in parallel, to the application bootstrap thread. The exposed `EntityManagerFactory`
 proxy can be injected into other application components and is even able to respond to
 `EntityManagerFactoryInfo` configuration inspection. However, once the actual JPA provider
-is being accessed by other components (for example, calling `createEntityManager`), those
-calls block until the background bootstrapping has completed. In particular, when you use
+is being accessed by other components (for example, calling `createEntityManager`), those calls
+block until the background bootstrapping has completed. In particular, when you use
 Spring Data JPA, make sure to set up deferred bootstrapping for its repositories as well.


@@ -284,9 +284,9 @@ to a newly created `EntityManager` per operation, in effect making its usage thr

 It is possible to write code against the plain JPA without any Spring dependencies, by
 using an injected `EntityManagerFactory` or `EntityManager`. Spring can understand the
-`@PersistenceUnit` and `@PersistenceContext` annotations both at the field and the method
-level if a `PersistenceAnnotationBeanPostProcessor` is enabled. The following example
-shows a plain JPA DAO implementation that uses the `@PersistenceUnit` annotation:
+`@PersistenceUnit` and `@PersistenceContext` annotations both at the field and the method level
+if a `PersistenceAnnotationBeanPostProcessor` is enabled. The following example shows a plain
+JPA DAO implementation that uses the `@PersistenceUnit` annotation:

 [tabs]
 ======
@@ -23,7 +23,7 @@ As of Spring Framework 5.2, the default configuration also provides support for
 Vavr's `Try` method to trigger transaction rollbacks when it returns a 'Failure'.
 This allows you to handle functional-style errors using Try and have the transaction
 automatically rolled back in case of a failure. For more information on Vavr's Try,
-refer to the https://docs.vavr.io/#_try[official Vavr documentation].
+refer to the [official Vavr documentation](https://www.vavr.io/vavr-docs/#_try).

 Here's an example of how to use Vavr's Try with a transactional method:
 [tabs]
@@ -29,6 +29,8 @@ Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abedrabbo, Andy Clem
 Syer, Oliver Gierke, Rossen Stoyanchev, Phillip Webb, Rob Winch, Brian Clozel, Stephane
 Nicoll, Sebastien Deleuze, Jay Bryant, Mark Paluch

+Copyright © 2002 - 2023 VMware, Inc. All Rights Reserved.
+
 Copies of this document may be made for your own use and for distribution to others,
 provided that you do not charge any fee for such copies and further provided that each
-copy contains the Copyright Notice, whether distributed in print or electronically.
+copy contains this Copyright Notice, whether distributed in print or electronically.
@@ -1,7 +1,7 @@
 [[spring-mvc-test-vs-end-to-end-integration-tests]]
 = MockMvc vs End-to-End Tests

-MockMvc is built on Servlet API mock implementations from the
+MockMVc is built on Servlet API mock implementations from the
 `spring-test` module and does not rely on a running container. Therefore, there are
 some differences when compared to full end-to-end integration tests with an actual
 client and a live server running.
@@ -1,15 +1,38 @@
 [[spring-mvc-test-vs-streaming-response]]
 = Streaming Responses

-You can use `WebTestClient` to test xref:testing/webtestclient.adoc#webtestclient-stream[streaming responses]
-such as Server-Sent Events. However, `MockMvcWebTestClient` doesn't support infinite
-streams because there is no way to cancel the server stream from the client side.
-To test infinite streams, you'll need to
-xref:testing/webtestclient.adoc#webtestclient-server-config[bind to] a running server,
-or when using Spring Boot,
-{docs-spring-boot}/spring-boot-features.html#boot-features-testing-spring-boot-applications-testing-with-running-server[test with a running server].
+The best way to test streaming responses such as Server-Sent Events is through the
+<<WebTestClient>> which can be used as a test client to connect to a `MockMvc` instance
+to perform tests on Spring MVC controllers without a running server. For example:
+
+[tabs]
+======
+Java::
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	WebTestClient client = MockMvcWebTestClient.bindToController(new SseController()).build();
+
+	FluxExchangeResult<Person> exchangeResult = client.get()
+			.uri("/persons")
+			.exchange()
+			.expectStatus().isOk()
+			.expectHeader().contentType("text/event-stream")
+			.returnResult(Person.class);
+
+	// Use StepVerifier from Project Reactor to test the streaming response
+
+	StepVerifier.create(exchangeResult.getResponseBody())
+			.expectNext(new Person("N0"), new Person("N1"), new Person("N2"))
+			.expectNextCount(4)
+			.consumeNextWith(person -> assertThat(person.getName()).endsWith("7"))
+			.thenCancel()
+			.verify();
+----
+======
+
+`WebTestClient` can also connect to a live server and perform full end-to-end integration
+tests. This is also supported in Spring Boot where you can
+{docs-spring-boot}/html/spring-boot-features.html#boot-features-testing-spring-boot-applications-testing-with-running-server[test a running server].

-`MockMvcWebTestClient` does support asynchronous responses, and even streaming responses.
-The limitation is that it can't influence the server to stop, and therefore the server
-must finish writing the response on its own.

@@ -52,10 +52,14 @@ The following example shows how to achieve the same configuration in XML:
 	</mvc:interceptors>
 ----

-WARNING: Interceptors are not ideally suited as a security layer due to the potential for
-a mismatch with annotated controller path matching. Generally, we recommend using Spring
-Security, or alternatively a similar approach integrated with the Servlet filter chain,
-and applied as early as possible.
+NOTE: Interceptors are not ideally suited as a security layer due to the potential
+for a mismatch with annotated controller path matching, which can also match trailing
+slashes and path extensions transparently, along with other path matching options. Many
+of these options have been deprecated but the potential for a mismatch remains.
+Generally, we recommend using Spring Security which includes a dedicated
+https://docs.spring.io/spring-security/reference/servlet/integrations/mvc.html#mvc-requestmatcher[MvcRequestMatcher]
+to align with Spring MVC path matching and also has a security firewall that blocks many
+unwanted characters in URL paths.

 NOTE: The XML config declares interceptors as `MappedInterceptor` beans, and those are in
 turn detected by any `HandlerMapping` bean, including those from other frameworks.
@@ -1,29 +1,34 @@
 [[mvc-handlermapping-interceptor]]
 = Interception

-All `HandlerMapping` implementations support handler interception which is useful when
-you want to apply functionality across requests. A `HandlerInterceptor` can implement the
-following:
+All `HandlerMapping` implementations support handler interceptors that are useful when
+you want to apply specific functionality to certain requests -- for example, checking for
+a principal. Interceptors must implement `HandlerInterceptor` from the
+`org.springframework.web.servlet` package with three methods that should provide enough
+flexibility to do all kinds of pre-processing and post-processing:

-* `preHandle(..)` -- callback before the actual handler is run that returns a boolean.
-If the method returns `true`, execution continues; if it returns `false`, the rest of the
-execution chain is bypassed and the handler is not called.
-* `postHandle(..)` -- callback after the handler is run.
-* `afterCompletion(..)` -- callback after the complete request has finished.
+* `preHandle(..)`: Before the actual handler is run
+* `postHandle(..)`: After the handler is run
+* `afterCompletion(..)`: After the complete request has finished

-NOTE: For `@ResponseBody` and `ResponseEntity` controller methods, the response is written
-and committed within the `HandlerAdapter`, before `postHandle` is called. That means it is
-too late to change the response, such as to add an extra header. You can implement
-`ResponseBodyAdvice` and declare it as an
-xref:web/webmvc/mvc-controller/ann-advice.adoc[Controller Advice] bean or configure it
-directly on `RequestMappingHandlerAdapter`.
+The `preHandle(..)` method returns a boolean value. You can use this method to break or
+continue the processing of the execution chain. When this method returns `true`, the
+handler execution chain continues. When it returns false, the `DispatcherServlet`
+assumes the interceptor itself has taken care of requests (and, for example, rendered an
+appropriate view) and does not continue executing the other interceptors and the actual
+handler in the execution chain.

 See xref:web/webmvc/mvc-config/interceptors.adoc[Interceptors] in the section on MVC configuration for examples of how to
 configure interceptors. You can also register them directly by using setters on individual
 `HandlerMapping` implementations.

-WARNING: Interceptors are not ideally suited as a security layer due to the potential for
-a mismatch with annotated controller path matching. Generally, we recommend using Spring
-Security, or alternatively a similar approach integrated with the Servlet filter chain,
-and applied as early as possible.
+`postHandle` method is less useful with `@ResponseBody` and `ResponseEntity` methods for
+which the response is written and committed within the `HandlerAdapter` and before
+`postHandle`. That means it is too late to make any changes to the response, such as adding
+an extra header. For such scenarios, you can implement `ResponseBodyAdvice` and either
+declare it as an xref:web/webmvc/mvc-controller/ann-advice.adoc[Controller Advice] bean or configure it directly on
+`RequestMappingHandlerAdapter`.
+
+
+

@@ -1,10 +0,0 @@
-{
-  "dependencies": {
-    "antora": "3.2.0-alpha.4",
-    "@antora/atlas-extension": "1.0.0-alpha.2",
-    "@antora/collector-extension": "1.0.0-alpha.3",
-    "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/antora-extensions": "1.11.1",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.10"
-  }
-}
@@ -9,23 +9,23 @@ javaPlatform {
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.14.3"))
 	api(platform("io.micrometer:micrometer-bom:1.10.13"))
-	api(platform("io.netty:netty-bom:4.1.111.Final"))
+	api(platform("io.netty:netty-bom:4.1.107.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
-	api(platform("io.projectreactor:reactor-bom:2022.0.20"))
+	api(platform("io.projectreactor:reactor-bom:2022.0.16"))
 	api(platform("io.rsocket:rsocket-bom:1.1.3"))
-	api(platform("org.apache.groovy:groovy-bom:4.0.21"))
+	api(platform("org.apache.groovy:groovy-bom:4.0.18"))
 	api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
 	api(platform("org.eclipse.jetty:jetty-bom:11.0.20"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.4.0"))
 	api(platform("org.junit:junit-bom:5.9.3"))
-	api(platform("org.mockito:mockito-bom:5.12.0"))
+	api(platform("org.mockito:mockito-bom:5.10.0"))

 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")
 		api("com.fasterxml.woodstox:woodstox-core:6.5.1")
 		api("com.github.ben-manes.caffeine:caffeine:3.1.8")
-		api("com.github.librepdf:openpdf:1.3.43")
+		api("com.github.librepdf:openpdf:1.3.40")
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
 		api("com.google.code.gson:gson:2.10.1")
@@ -54,9 +54,9 @@ dependencies {
 		api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
 		api("io.reactivex.rxjava3:rxjava:3.1.8")
 		api("io.smallrye.reactive:mutiny:1.10.0")
-		api("io.undertow:undertow-core:2.3.13.Final")
-		api("io.undertow:undertow-servlet:2.3.13.Final")
-		api("io.undertow:undertow-websockets-jsr:2.3.13.Final")
+		api("io.undertow:undertow-core:2.3.11.Final")
+		api("io.undertow:undertow-servlet:2.3.11.Final")
+		api("io.undertow:undertow-websockets-jsr:2.3.11.Final")
 		api("io.vavr:vavr:0.10.4")
 		api("jakarta.activation:jakarta.activation-api:2.0.1")
 		api("jakarta.annotation:jakarta.annotation-api:2.0.0")
@@ -103,11 +103,11 @@ dependencies {
 		api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.15")
 		api("org.apache.tomcat:tomcat-util:10.1.15")
 		api("org.apache.tomcat:tomcat-websocket:10.1.15")
-		api("org.aspectj:aspectjrt:1.9.22.1")
-		api("org.aspectj:aspectjtools:1.9.22.1")
-		api("org.aspectj:aspectjweaver:1.9.22.1")
+		api("org.aspectj:aspectjrt:1.9.20.1")
+		api("org.aspectj:aspectjtools:1.9.20.1")
+		api("org.aspectj:aspectjweaver:1.9.20.1")
 		api("org.assertj:assertj-core:3.24.2")
-		api("org.awaitility:awaitility:4.2.1")
+		api("org.awaitility:awaitility:4.2.0")
 		api("org.bouncycastle:bcpkix-jdk18on:1.72")
 		api("org.codehaus.jettison:jettison:1.5.4")
 		api("org.dom4j:dom4j:2.1.4")
@@ -126,7 +126,7 @@ dependencies {
 		api("org.hibernate:hibernate-validator:7.0.5.Final")
 		api("org.hsqldb:hsqldb:2.7.2")
 		api("org.javamoney:moneta:1.4.2")
-		api("org.jruby:jruby:9.4.7.0")
+		api("org.jruby:jruby:9.4.5.0")
 		api("org.junit.support:testng-engine:1.0.4")
 		api("org.mozilla:rhino:1.7.14")
 		api("org.ogce:xpp3:1.1.6")
@@ -135,7 +135,7 @@ dependencies {
 		api("org.seleniumhq.selenium:htmlunit-driver:2.70.0")
 		api("org.seleniumhq.selenium:selenium-java:3.141.59")
 		api("org.skyscreamer:jsonassert:1.5.1")
-		api("org.slf4j:slf4j-api:2.0.13")
+		api("org.slf4j:slf4j-api:2.0.12")
 		api("org.testng:testng:7.8.0")
 		api("org.webjars:underscorejs:1.8.3")
 		api("org.webjars:webjars-locator-core:0.55")
@@ -1,4 +1,4 @@
-version=6.0.22
+version=6.0.17

 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m
@@ -6,7 +6,6 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 			classpath.from(sourceSets["main"].runtimeClasspath)
 			externalDocumentationLink {
 				url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
-				packageListUrl.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/element-list"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
@@ -22,7 +21,6 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/doc/jakarta.servlet/jakarta.servlet-api/latest/"))
-				packageListUrl.set(new URL("https://javadoc.io/doc/jakarta.servlet/jakarta.servlet-api/latest/element-list"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -63,7 +63,7 @@ class EnableCachingIntegrationTests {
 		// attempt was made to look up the AJ aspect. It's due to classpath issues
 		// in integration-tests that it's not found.
 		assertThatException().isThrownBy(ctx::refresh)
-				.withMessageContaining("AspectJCachingConfiguration");
+			.withMessageContaining("AspectJCachingConfiguration");
 	}


@@ -542,7 +542,8 @@ public class EnvironmentSystemIntegrationTests {
 		{
 			ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext();
 			ctx.getEnvironment().setRequiredProperties("foo", "bar");
-			assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(ctx::refresh);
+			assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(
+					ctx::refresh);
 		}

 		{
@@ -98,8 +98,9 @@ class EnableTransactionManagementIntegrationTests {
 		// this test is a bit fragile, but gets the job done, proving that an
 		// attempt was made to look up the AJ aspect. It's due to classpath issues
 		// in integration-tests that it's not found.
-		assertThatException().isThrownBy(ctx::refresh)
-				.withMessageContaining("AspectJJtaTransactionManagementConfiguration");
+		assertThatException()
+			.isThrownBy(ctx::refresh)
+			.withMessageContaining("AspectJJtaTransactionManagementConfiguration");
 	}

 	@Test
@@ -7,8 +7,8 @@ pluginManagement {
 }

 plugins {
-	id "com.gradle.develocity" version "3.17.2"
-	id "io.spring.ge.conventions" version "0.0.17"
+	id "com.gradle.enterprise" version "3.12.6"
+	id "io.spring.ge.conventions" version "0.0.13"
 }

 include "spring-aop"
@@ -45,7 +45,7 @@ rootProject.children.each {project ->
 }

 settings.gradle.projectsLoaded {
-	develocity {
+	gradleEnterprise {
 		buildScan {
 			File buildDir = settings.gradle.rootProject
 					.getLayout().getBuildDirectory().getAsFile().get()
@@ -18,7 +18,6 @@ package org.springframework.aop.aspectj;

 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
@@ -42,7 +41,6 @@ import org.aspectj.weaver.tools.PointcutParameter;
 import org.aspectj.weaver.tools.PointcutParser;
 import org.aspectj.weaver.tools.PointcutPrimitive;
 import org.aspectj.weaver.tools.ShadowMatch;
-import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException;

 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.IntroductionAwareMethodMatcher;
@@ -86,8 +84,6 @@ import org.springframework.util.StringUtils;
 public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		implements ClassFilter, IntroductionAwareMethodMatcher, BeanFactoryAware {

-	private static final String AJC_MAGIC = "ajc$";
-
 	private static final Set<PointcutPrimitive> SUPPORTED_PRIMITIVES = Set.of(
 			PointcutPrimitive.EXECUTION,
 			PointcutPrimitive.ARGS,
@@ -105,8 +101,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	@Nullable
 	private Class<?> pointcutDeclarationScope;

-	private boolean aspectCompiledByAjc;
-
 	private String[] pointcutParameterNames = new String[0];

 	private Class<?>[] pointcutParameterTypes = new Class<?>[0];
@@ -120,8 +114,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	@Nullable
 	private transient PointcutExpression pointcutExpression;

-	private transient boolean pointcutParsingFailed = false;
-
 	private transient Map<Method, ShadowMatch> shadowMatchCache = new ConcurrentHashMap<>(32);


@@ -138,7 +130,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	 * @param paramTypes the parameter types for the pointcut
 	 */
 	public AspectJExpressionPointcut(Class<?> declarationScope, String[] paramNames, Class<?>[] paramTypes) {
-		setPointcutDeclarationScope(declarationScope);
+		this.pointcutDeclarationScope = declarationScope;
 		if (paramNames.length != paramTypes.length) {
 			throw new IllegalStateException(
 					"Number of pointcut parameter names must match number of pointcut parameter types");
@@ -153,7 +145,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 	 */
 	public void setPointcutDeclarationScope(Class<?> pointcutDeclarationScope) {
 		this.pointcutDeclarationScope = pointcutDeclarationScope;
-		this.aspectCompiledByAjc = compiledByAjc(pointcutDeclarationScope);
 	}

 	/**
@@ -178,30 +169,25 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public ClassFilter getClassFilter() {
-		checkExpression();
+		obtainPointcutExpression();
 		return this;
 	}

 	@Override
 	public MethodMatcher getMethodMatcher() {
-		checkExpression();
+		obtainPointcutExpression();
 		return this;
 	}


 	/**
-	 * Check whether this pointcut is ready to match.
+	 * Check whether this pointcut is ready to match,
+	 * lazily building the underlying AspectJ pointcut expression.
 	 */
-	private void checkExpression() {
+	private PointcutExpression obtainPointcutExpression() {
 		if (getExpression() == null) {
 			throw new IllegalStateException("Must set property 'expression' before attempting to match");
 		}
-	}
-
-	/**
-	 * Lazily build the underlying AspectJ pointcut expression.
-	 */
-	private PointcutExpression obtainPointcutExpression() {
 		if (this.pointcutExpression == null) {
 			this.pointcutClassLoader = determinePointcutClassLoader();
 			this.pointcutExpression = buildPointcutExpression(this.pointcutClassLoader);
@@ -278,18 +264,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public boolean matches(Class<?> targetClass) {
-		if (this.pointcutParsingFailed) {
-			// Pointcut parsing failed before below -> avoid trying again.
-			return false;
-		}
-		if (this.aspectCompiledByAjc && compiledByAjc(targetClass)) {
-			// ajc-compiled aspect class for ajc-compiled target class -> already weaved.
-			return false;
-		}
-
+		PointcutExpression pointcutExpression = obtainPointcutExpression();
 		try {
 			try {
-				return obtainPointcutExpression().couldMatchJoinPointsInType(targetClass);
+				return pointcutExpression.couldMatchJoinPointsInType(targetClass);
 			}
 			catch (ReflectionWorldException ex) {
 				logger.debug("PointcutExpression matching rejected target class - trying fallback expression", ex);
@@ -300,12 +278,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 				}
 			}
 		}
-		catch (IllegalArgumentException | IllegalStateException | UnsupportedPointcutPrimitiveException ex) {
-			this.pointcutParsingFailed = true;
-			if (logger.isDebugEnabled()) {
-				logger.debug("Pointcut parser rejected expression [" + getExpression() + "]: " + ex);
-			}
-		}
 		catch (Throwable ex) {
 			logger.debug("PointcutExpression matching rejected target class", ex);
 		}
@@ -314,6 +286,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions) {
+		obtainPointcutExpression();
 		ShadowMatch shadowMatch = getTargetShadowMatch(method, targetClass);

 		// Special handling for this, target, @this, @target, @annotation
@@ -351,6 +324,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public boolean matches(Method method, Class<?> targetClass, Object... args) {
+		obtainPointcutExpression();
 		ShadowMatch shadowMatch = getTargetShadowMatch(method, targetClass);

 		// Bind Spring AOP proxy to AspectJ "this" and Spring AOP target to AspectJ target,
@@ -539,15 +513,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		return shadowMatch;
 	}

-	private static boolean compiledByAjc(Class<?> clazz) {
-		for (Field field : clazz.getDeclaredFields()) {
-			if (field.getName().startsWith(AJC_MAGIC)) {
-				return true;
-			}
-		}
-		return false;
-	}
-

 	@Override
 	public boolean equals(@Nullable Object other) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.aop.aspectj.annotation;

 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -55,6 +56,8 @@ import org.springframework.lang.Nullable;
 */
 public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFactory {

+	private static final String AJC_MAGIC = "ajc$";
+
 	private static final Class<?>[] ASPECTJ_ANNOTATION_CLASSES = new Class<?>[] {
 			Pointcut.class, Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class};

@@ -65,11 +68,37 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	protected final ParameterNameDiscoverer parameterNameDiscoverer = new AspectJAnnotationParameterNameDiscoverer();


+	/**
+	 * We consider something to be an AspectJ aspect suitable for use by the Spring AOP system
+	 * if it has the @Aspect annotation, and was not compiled by ajc. The reason for this latter test
+	 * is that aspects written in the code-style (AspectJ language) also have the annotation present
+	 * when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP.
+	 */
 	@Override
 	public boolean isAspect(Class<?> clazz) {
+		return (hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
+	}
+
+	private boolean hasAspectAnnotation(Class<?> clazz) {
 		return (AnnotationUtils.findAnnotation(clazz, Aspect.class) != null);
 	}

+	/**
+	 * We need to detect this as "code-style" AspectJ aspects should not be
+	 * interpreted by Spring AOP.
+	 */
+	private boolean compiledByAjc(Class<?> clazz) {
+		// The AJTypeSystem goes to great lengths to provide a uniform appearance between code-style and
+		// annotation-style aspects. Therefore there is no 'clean' way to tell them apart. Here we rely on
+		// an implementation detail of the AspectJ compiler.
+		for (Field field : clazz.getDeclaredFields()) {
+			if (field.getName().startsWith(AJC_MAGIC)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		AjType<?> ajType = AjTypeSystem.getAjType(aspectClass);
@@ -86,7 +115,6 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 		}
 	}

-
 	/**
 	 * Find and return the first AspectJ annotation on the given method
 	 * (there <i>should</i> only be one anyway...).
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -124,16 +124,10 @@ public class AspectMetadata implements Serializable {
 	 * Extract contents from String of form {@code pertarget(contents)}.
 	 */
 	private String findPerClause(Class<?> aspectClass) {
-		Aspect ann = aspectClass.getAnnotation(Aspect.class);
-		if (ann == null) {
-			return "";
-		}
-		String value = ann.value();
-		int beginIndex = value.indexOf('(');
-		if (beginIndex < 0) {
-			return "";
-		}
-		return value.substring(beginIndex + 1, value.length() - 1);
+		String str = aspectClass.getAnnotation(Aspect.class).value();
+		int beginIndex = str.indexOf('(') + 1;
+		int endIndex = str.length() - 1;
+		return str.substring(beginIndex, endIndex);
 	}


@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,12 +22,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.reflect.PerClauseKind;

 import org.springframework.aop.Advisor;
-import org.springframework.aop.framework.AopConfigException;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.lang.Nullable;
@@ -43,8 +40,6 @@ import org.springframework.util.Assert;
 */
 public class BeanFactoryAspectJAdvisorsBuilder {

-	private static final Log logger = LogFactory.getLog(BeanFactoryAspectJAdvisorsBuilder.class);
-
 	private final ListableBeanFactory beanFactory;

 	private final AspectJAdvisorFactory advisorFactory;
@@ -107,37 +102,30 @@ public class BeanFactoryAspectJAdvisorsBuilder {
 							continue;
 						}
 						if (this.advisorFactory.isAspect(beanType)) {
-							try {
-								AspectMetadata amd = new AspectMetadata(beanType, beanName);
-								if (amd.getAjType().getPerClause().getKind() == PerClauseKind.SINGLETON) {
-									MetadataAwareAspectInstanceFactory factory =
-											new BeanFactoryAspectInstanceFactory(this.beanFactory, beanName);
-									List<Advisor> classAdvisors = this.advisorFactory.getAdvisors(factory);
-									if (this.beanFactory.isSingleton(beanName)) {
-										this.advisorsCache.put(beanName, classAdvisors);
-									}
-									else {
-										this.aspectFactoryCache.put(beanName, factory);
-									}
-									advisors.addAll(classAdvisors);
+							aspectNames.add(beanName);
+							AspectMetadata amd = new AspectMetadata(beanType, beanName);
+							if (amd.getAjType().getPerClause().getKind() == PerClauseKind.SINGLETON) {
+								MetadataAwareAspectInstanceFactory factory =
+										new BeanFactoryAspectInstanceFactory(this.beanFactory, beanName);
+								List<Advisor> classAdvisors = this.advisorFactory.getAdvisors(factory);
+								if (this.beanFactory.isSingleton(beanName)) {
+									this.advisorsCache.put(beanName, classAdvisors);
 								}
 								else {
-									// Per target or per this.
-									if (this.beanFactory.isSingleton(beanName)) {
-										throw new IllegalArgumentException("Bean with name '" + beanName +
-												"' is a singleton, but aspect instantiation model is not singleton");
-									}
-									MetadataAwareAspectInstanceFactory factory =
-											new PrototypeAspectInstanceFactory(this.beanFactory, beanName);
 									this.aspectFactoryCache.put(beanName, factory);
-									advisors.addAll(this.advisorFactory.getAdvisors(factory));
 								}
-								aspectNames.add(beanName);
+								advisors.addAll(classAdvisors);
 							}
-							catch (IllegalArgumentException | IllegalStateException | AopConfigException ex) {
-								if (logger.isDebugEnabled()) {
-									logger.debug("Ignoring incompatible aspect [" + beanType.getName() + "]: " + ex);
+							else {
+								// Per target or per this.
+								if (this.beanFactory.isSingleton(beanName)) {
+									throw new IllegalArgumentException("Bean with name '" + beanName +
+											"' is a singleton, but aspect instantiation model is not singleton");
 								}
+								MetadataAwareAspectInstanceFactory factory =
+										new PrototypeAspectInstanceFactory(this.beanFactory, beanName);
+								this.aspectFactoryCache.put(beanName, factory);
+								advisors.addAll(this.advisorFactory.getAdvisors(factory));
 							}
 						}
 					}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConvertingComparator;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils.MethodFilter;
 import org.springframework.util.StringUtils;
@@ -134,19 +133,17 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto

 		List<Advisor> advisors = new ArrayList<>();
 		for (Method method : getAdvisorMethods(aspectClass)) {
-			if (method.equals(ClassUtils.getMostSpecificMethod(method, aspectClass))) {
-				// Prior to Spring Framework 5.2.7, advisors.size() was supplied as the declarationOrderInAspect
-				// to getAdvisor(...) to represent the "current position" in the declared methods list.
-				// However, since Java 7 the "current position" is not valid since the JDK no longer
-				// returns declared methods in the order in which they are declared in the source code.
-				// Thus, we now hard code the declarationOrderInAspect to 0 for all advice methods
-				// discovered via reflection in order to support reliable advice ordering across JVM launches.
-				// Specifically, a value of 0 aligns with the default value used in
-				// AspectJPrecedenceComparator.getAspectDeclarationOrder(Advisor).
-				Advisor advisor = getAdvisor(method, lazySingletonAspectInstanceFactory, 0, aspectName);
-				if (advisor != null) {
-					advisors.add(advisor);
-				}
+			// Prior to Spring Framework 5.2.7, advisors.size() was supplied as the declarationOrderInAspect
+			// to getAdvisor(...) to represent the "current position" in the declared methods list.
+			// However, since Java 7 the "current position" is not valid since the JDK no longer
+			// returns declared methods in the order in which they are declared in the source code.
+			// Thus, we now hard code the declarationOrderInAspect to 0 for all advice methods
+			// discovered via reflection in order to support reliable advice ordering across JVM launches.
+			// Specifically, a value of 0 aligns with the default value used in
+			// AspectJPrecedenceComparator.getAspectDeclarationOrder(Advisor).
+			Advisor advisor = getAdvisor(method, lazySingletonAspectInstanceFactory, 0, aspectName);
+			if (advisor != null) {
+				advisors.add(advisor);
 			}
 		}

@@ -213,16 +210,8 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 			return null;
 		}

-		try {
-			return new InstantiationModelAwarePointcutAdvisorImpl(expressionPointcut, candidateAdviceMethod,
-					this, aspectInstanceFactory, declarationOrderInAspect, aspectName);
-		}
-		catch (IllegalArgumentException | IllegalStateException ex) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Ignoring incompatible advice method: " + candidateAdviceMethod, ex);
-			}
-			return null;
-		}
+		return new InstantiationModelAwarePointcutAdvisorImpl(expressionPointcut, candidateAdviceMethod,
+				this, aspectInstanceFactory, declarationOrderInAspect, aspectName);
 	}

 	@Nullable
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -368,7 +368,8 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	private void validateIntroductionAdvisor(IntroductionAdvisor advisor) {
 		advisor.validateInterfaces();
 		// If the advisor passed validation, we can make the change.
-		for (Class<?> ifc : advisor.getInterfaces()) {
+		Class<?>[] ifcs = advisor.getInterfaces();
+		for (Class<?> ifc : ifcs) {
 			addInterface(ifc);
 		}
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -186,10 +186,10 @@ public abstract class AopUtils {
 	 * this method resolves bridge methods in order to retrieve attributes from
 	 * the <i>original</i> method definition.
 	 * @param method the method to be invoked, which may come from an interface
-	 * @param targetClass the target class for the current invocation
-	 * (can be {@code null} or may not even implement the method)
+	 * @param targetClass the target class for the current invocation.
+	 * May be {@code null} or may not even implement the method.
 	 * @return the specific target method, or the original method if the
-	 * {@code targetClass} does not implement it
+	 * {@code targetClass} doesn't implement it or is {@code null}
 	 * @see org.springframework.util.ClassUtils#getMostSpecificMethod
 	 */
 	public static Method getMostSpecificMethod(Method method, @Nullable Class<?> targetClass) {
@@ -23,6 +23,8 @@ import java.util.Map;

 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.aspectj.weaver.tools.PointcutPrimitive;
+import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import test.annotation.EmptySpringAnnotation;
@@ -39,13 +41,14 @@ import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.beans.testfixture.beans.subpkg.DeepBean;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;

 /**
 * @author Rob Harrop
 * @author Rod Johnson
 * @author Chris Beams
- * @author Juergen Hoeller
 */
 public class AspectJExpressionPointcutTests {

@@ -171,25 +174,25 @@ public class AspectJExpressionPointcutTests {
 	@Test
 	public void testFriendlyErrorOnNoLocationClassMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> pc.getClassFilter().matches(ITestBean.class))
-				.withMessageContaining("expression");
+		assertThatIllegalStateException().isThrownBy(() ->
+				pc.matches(ITestBean.class))
+			.withMessageContaining("expression");
 	}

 	@Test
 	public void testFriendlyErrorOnNoLocation2ArgMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> pc.getMethodMatcher().matches(getAge, ITestBean.class))
-				.withMessageContaining("expression");
+		assertThatIllegalStateException().isThrownBy(() ->
+				pc.matches(getAge, ITestBean.class))
+			.withMessageContaining("expression");
 	}

 	@Test
 	public void testFriendlyErrorOnNoLocation3ArgMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> pc.getMethodMatcher().matches(getAge, ITestBean.class, (Object[]) null))
-				.withMessageContaining("expression");
+		assertThatIllegalStateException().isThrownBy(() ->
+				pc.matches(getAge, ITestBean.class, (Object[]) null))
+			.withMessageContaining("expression");
 	}


@@ -206,10 +209,8 @@ public class AspectJExpressionPointcutTests {
 		// not currently testable in a reliable fashion
 		//assertDoesNotMatchStringClass(classFilter);

-		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 12D))
-				.as("Should match with setSomeNumber with Double input").isTrue();
-		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 11))
-				.as("Should not match setSomeNumber with Integer input").isFalse();
+		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 12D)).as("Should match with setSomeNumber with Double input").isTrue();
+		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 11)).as("Should not match setSomeNumber with Integer input").isFalse();
 		assertThat(methodMatcher.matches(getAge, TestBean.class)).as("Should not match getAge").isFalse();
 		assertThat(methodMatcher.isRuntime()).as("Should be a runtime match").isTrue();
 	}
@@ -244,7 +245,7 @@ public class AspectJExpressionPointcutTests {
 	@Test
 	public void testInvalidExpression() {
 		String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number) && args(Double)";
-		assertThat(getPointcut(expression).getClassFilter().matches(Object.class)).isFalse();
+		assertThatIllegalArgumentException().isThrownBy(getPointcut(expression)::getClassFilter);  // call to getClassFilter forces resolution
 	}

 	private TestBean getAdvisedProxy(String pointcutExpression, CallCountingInterceptor interceptor) {
@@ -274,7 +275,9 @@ public class AspectJExpressionPointcutTests {
 	@Test
 	public void testWithUnsupportedPointcutPrimitive() {
 		String expression = "call(int org.springframework.beans.testfixture.beans.TestBean.getAge())";
-		assertThat(getPointcut(expression).getClassFilter().matches(Object.class)).isFalse();
+		assertThatExceptionOfType(UnsupportedPointcutPrimitiveException.class)
+				.isThrownBy(() -> getPointcut(expression).getClassFilter()) // call to getClassFilter forces resolution...
+				.satisfies(ex -> assertThat(ex.getUnsupportedPrimitive()).isEqualTo(PointcutPrimitive.CALL));
 	}

 	@Test
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@ import org.aspectj.lang.annotation.DeclareParents;
 import org.aspectj.lang.annotation.DeclarePrecedence;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import org.springframework.aop.Advisor;
@@ -83,15 +84,15 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	void rejectsPerCflowAspect() {
 		assertThatExceptionOfType(AopConfigException.class)
-				.isThrownBy(() -> getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerCflowAspect(), "someBean")))
-				.withMessageContaining("PERCFLOW");
+			.isThrownBy(() -> getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerCflowAspect(), "someBean")))
+			.withMessageContaining("PERCFLOW");
 	}

 	@Test
 	void rejectsPerCflowBelowAspect() {
 		assertThatExceptionOfType(AopConfigException.class)
-				.isThrownBy(() -> getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerCflowBelowAspect(), "someBean")))
-				.withMessageContaining("PERCFLOWBELOW");
+			.isThrownBy(() -> getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerCflowBelowAspect(), "someBean")))
+			.withMessageContaining("PERCFLOWBELOW");
 	}

 	@Test
@@ -362,7 +363,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		assertThat(lockable.locked()).as("Already locked").isTrue();
 		lockable.lock();
 		assertThat(lockable.locked()).as("Real target ignores locking").isTrue();
-		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(lockable::unlock);
+		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> lockable.unlock());
 	}

 	@Test
@@ -388,7 +389,9 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		assertThat(lockable.locked()).isTrue();
 	}

+	// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
 	@Test
+	@Disabled
 	void introductionWithArgumentBinding() {
 		TestBean target = new TestBean();

@@ -645,7 +648,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	static class NamedPointcutAspectWithFQN {

 		@SuppressWarnings("unused")
-		private final ITestBean fieldThatShouldBeIgnoredBySpringAtAspectJProcessing = new TestBean();
+		private ITestBean fieldThatShouldBeIgnoredBySpringAtAspectJProcessing = new TestBean();

 		@Around("org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.CommonPointcuts.getAge()()")
 		int changeReturnValue(ProceedingJoinPoint pjp) {
@@ -762,7 +765,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {


 	@Aspect
-	static class DoublingAspect {
+	class DoublingAspect {

 		@Around("execution(* getAge())")
 		public Object doubleAge(ProceedingJoinPoint pjp) throws Throwable {
@@ -770,14 +773,8 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		}
 	}

-
 	@Aspect
-	static class IncrementingAspect extends DoublingAspect {
-
-		@Override
-		public Object doubleAge(ProceedingJoinPoint pjp) throws Throwable {
-			return ((int) pjp.proceed()) * 2;
-		}
+	class IncrementingAspect extends DoublingAspect {

 		@Around("execution(* getAge())")
 		public int incrementAge(ProceedingJoinPoint pjp) throws Throwable {
@@ -786,6 +783,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	}


+
 	@Aspect
 	private static class InvocationTrackingAspect {

@@ -1085,7 +1083,7 @@ class PerThisAspect {

 	// Just to check that this doesn't cause problems with introduction processing
 	@SuppressWarnings("unused")
-	private final ITestBean fieldThatShouldBeIgnoredBySpringAtAspectJProcessing = new TestBean();
+	private ITestBean fieldThatShouldBeIgnoredBySpringAtAspectJProcessing = new TestBean();

 	@Around("execution(int *.getAge())")
 	int returnCountAsAge() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,35 +17,29 @@
 package org.springframework.aop.support;

 import java.lang.reflect.Method;
-import java.util.List;

 import org.junit.jupiter.api.Test;

 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
-import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.target.EmptyTargetSource;
 import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ReflectionUtils;

 import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Rod Johnson
 * @author Chris Beams
- * @author Sebastien Deleuze
- * @author Juergen Hoeller
 */
-class AopUtilsTests {
+public class AopUtilsTests {

 	@Test
-	void testPointcutCanNeverApply() {
+	public void testPointcutCanNeverApply() {
 		class TestPointcut extends StaticMethodMatcherPointcut {
 			@Override
 			public boolean matches(Method method, @Nullable Class<?> clazzy) {
@@ -58,13 +52,13 @@ class AopUtilsTests {
 	}

 	@Test
-	void testPointcutAlwaysApplies() {
+	public void testPointcutAlwaysApplies() {
 		assertThat(AopUtils.canApply(new DefaultPointcutAdvisor(new NopInterceptor()), Object.class)).isTrue();
 		assertThat(AopUtils.canApply(new DefaultPointcutAdvisor(new NopInterceptor()), TestBean.class)).isTrue();
 	}

 	@Test
-	void testPointcutAppliesToOneMethodOnObject() {
+	public void testPointcutAppliesToOneMethodOnObject() {
 		class TestPointcut extends StaticMethodMatcherPointcut {
 			@Override
 			public boolean matches(Method method, @Nullable Class<?> clazz) {
@@ -84,7 +78,7 @@ class AopUtilsTests {
 	 * that's subverted the singleton construction limitation.
 	 */
 	@Test
-	void testCanonicalFrameworkClassesStillCanonicalOnDeserialization() throws Exception {
+	public void testCanonicalFrameworkClassesStillCanonicalOnDeserialization() throws Exception {
 		assertThat(SerializationTestUtils.serializeAndDeserialize(MethodMatcher.TRUE)).isSameAs(MethodMatcher.TRUE);
 		assertThat(SerializationTestUtils.serializeAndDeserialize(ClassFilter.TRUE)).isSameAs(ClassFilter.TRUE);
 		assertThat(SerializationTestUtils.serializeAndDeserialize(Pointcut.TRUE)).isSameAs(Pointcut.TRUE);
@@ -94,45 +88,4 @@ class AopUtilsTests {
 		assertThat(SerializationTestUtils.serializeAndDeserialize(ExposeInvocationInterceptor.INSTANCE)).isSameAs(ExposeInvocationInterceptor.INSTANCE);
 	}

-	@Test
-	void testInvokeJoinpointUsingReflection() throws Throwable {
-		String name = "foo";
-		TestBean testBean = new TestBean(name);
-		Method method = ReflectionUtils.findMethod(TestBean.class, "getName");
-		Object result = AopUtils.invokeJoinpointUsingReflection(testBean, method, new Object[0]);
-		assertThat(result).isEqualTo(name);
-	}
-
-	@Test  // gh-32365
-	void mostSpecificMethodBetweenJdkProxyAndTarget() throws Exception {
-		Class<?> proxyClass = new ProxyFactory(new WithInterface()).getProxyClass(getClass().getClassLoader());
-		Method specificMethod = AopUtils.getMostSpecificMethod(proxyClass.getMethod("handle", List.class), WithInterface.class);
-		assertThat(ResolvableType.forMethodParameter(specificMethod, 0).getGeneric().toClass()).isEqualTo(String.class);
-	}
-
-	@Test  // gh-32365
-	void mostSpecificMethodBetweenCglibProxyAndTarget() throws Exception {
-		Class<?> proxyClass = new ProxyFactory(new WithoutInterface()).getProxyClass(getClass().getClassLoader());
-		Method specificMethod = AopUtils.getMostSpecificMethod(proxyClass.getMethod("handle", List.class), WithoutInterface.class);
-		assertThat(ResolvableType.forMethodParameter(specificMethod, 0).getGeneric().toClass()).isEqualTo(String.class);
-	}
-
-
-	interface ProxyInterface {
-
-		void handle(List<String> list);
-	}
-
-	static class WithInterface implements ProxyInterface {
-
-		public void handle(List<String> list) {
-		}
-	}
-
-	static class WithoutInterface {
-
-		public void handle(List<String> list) {
-		}
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,13 +22,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;

 /**
 * @author Adrian Colyer
- * @author Juergen Hoeller
 */
 public class AutoProxyWithCodeStyleAspectsTests {

 	@Test
 	@SuppressWarnings("resource")
-	public void noAutoProxyingOfAjcCompiledAspects() {
+	public void noAutoproxyingOfAjcCompiledAspects() {
 		new ClassPathXmlApplicationContext("org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml");
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@ import org.junit.jupiter.api.Test;

 import org.springframework.context.support.ClassPathXmlApplicationContext;

-/**
- * @author Ramnivas Laddad
- * @author Juergen Hoeller
- */
 public class SpringConfiguredWithAutoProxyingTests {

 	@Test
@@ -2,29 +2,16 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:aop="http://www.springframework.org/schema/aop"
-	    xmlns:cache="http://www.springframework.org/schema/cache"
-		xmlns:context="http://www.springframework.org/schema/context"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-				http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache-3.1.xsd
-	   			http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
+				http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">

 	<aop:aspectj-autoproxy/>

-	<context:spring-configured/>
-
-	<cache:annotation-driven mode="aspectj"/>
-
-	<bean id="cacheManager" class="org.springframework.cache.support.NoOpCacheManager"/>
-
-	<bean id="myAspect" class="org.springframework.aop.aspectj.autoproxy.CodeStyleAspect" factory-method="aspectOf">
+	<bean id="myAspect" class="org.springframework.aop.aspectj.autoproxy.CodeStyleAspect"
+			factory-method="aspectOf">
 		<property name="foo" value="bar"/>
 	</bean>

-	<bean id="otherBean" class="org.springframework.beans.factory.aspectj.ShouldBeConfiguredBySpring"/>
-
-	<bean id="yetAnotherBean" class="org.springframework.beans.factory.aspectj.ShouldBeConfiguredBySpring"/>
-
-	<bean id="configuredBean" class="org.springframework.beans.factory.aspectj.ShouldBeConfiguredBySpring" lazy-init="true"/>
+	<bean id="otherBean" class="java.lang.Object"/>

 </beans>
@@ -24,7 +24,8 @@
 		</property>
 	</bean>

-	<bean id="defaultCache" class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
+	<bean id="defaultCache"
+		  class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
 		<property name="name" value="default"/>
 	</bean>

@@ -7,10 +7,12 @@
 				http://www.springframework.org/schema/task
 				https://www.springframework.org/schema/task/spring-task.xsd">

-	<task:annotation-driven mode="aspectj" executor="testExecutor" exception-handler="testExceptionHandler"/>
+	<task:annotation-driven mode="aspectj" executor="testExecutor"
+							exception-handler="testExceptionHandler"/>

 	<task:executor id="testExecutor"/>

-	<bean id="testExceptionHandler" class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
+	<bean id="testExceptionHandler"
+		  class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>

 </beans>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -818,11 +818,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	/**
 	 * This implementation attempts to query the FactoryBean's generic parameter metadata
 	 * if present to determine the object type. If not present, i.e. the FactoryBean is
-	 * declared as a raw type, it checks the FactoryBean's {@code getObjectType} method
+	 * declared as a raw type, checks the FactoryBean's {@code getObjectType} method
 	 * on a plain instance of the FactoryBean, without bean properties applied yet.
-	 * If this doesn't return a type yet and {@code allowInit} is {@code true}, full
-	 * creation of the FactoryBean is attempted as fallback (through delegation to the
-	 * superclass implementation).
+	 * If this doesn't return a type yet, and {@code allowInit} is {@code true} a
+	 * full creation of the FactoryBean is used as fallback (through delegation to the
+	 * superclass's implementation).
 	 * <p>The shortcut check for a FactoryBean is only applied in case of a singleton
 	 * FactoryBean. If the FactoryBean instance itself is not kept as singleton,
 	 * it will be fully created to check the type of its exposed object.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -161,9 +161,6 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/** Map from scope identifier String to corresponding Scope. */
 	private final Map<String, Scope> scopes = new LinkedHashMap<>(8);

-	/** Application startup metrics. **/
-	private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT;
-
 	/** Map from bean name to merged RootBeanDefinition. */
 	private final Map<String, RootBeanDefinition> mergedBeanDefinitions = new ConcurrentHashMap<>(256);

@@ -174,6 +171,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	private final ThreadLocal<Object> prototypesCurrentlyInCreation =
 			new NamedThreadLocal<>("Prototype beans currently in creation");

+	/** Application startup metrics. **/
+	private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT;

 	/**
 	 * Create a new AbstractBeanFactory.
@@ -1053,7 +1052,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp

 	@Override
 	public void setApplicationStartup(ApplicationStartup applicationStartup) {
-		Assert.notNull(applicationStartup, "ApplicationStartup must not be null");
+		Assert.notNull(applicationStartup, "applicationStartup must not be null");
 		this.applicationStartup = applicationStartup;
 	}

@@ -1649,7 +1648,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * already. The implementation is allowed to instantiate the target factory bean if
 	 * {@code allowInit} is {@code true} and the type cannot be determined another way;
 	 * otherwise it is restricted to introspecting signatures and related metadata.
-	 * <p>If no {@link FactoryBean#OBJECT_TYPE_ATTRIBUTE} is set on the bean definition
+	 * <p>If no {@link FactoryBean#OBJECT_TYPE_ATTRIBUTE} if set on the bean definition
 	 * and {@code allowInit} is {@code true}, the default implementation will create
 	 * the FactoryBean via {@code getBean} to call its {@code getObjectType} method.
 	 * Subclasses are encouraged to optimize this, typically by inspecting the generic
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -609,10 +609,13 @@ class ConstructorResolver {
 				String argDesc = StringUtils.collectionToCommaDelimitedString(argTypes);
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
 						"No matching factory method found on class [" + factoryClass.getName() + "]: " +
-						(mbd.getFactoryBeanName() != null ? "factory bean '" + mbd.getFactoryBeanName() + "'; " : "") +
+						(mbd.getFactoryBeanName() != null ?
+								"factory bean '" + mbd.getFactoryBeanName() + "'; " : "") +
 						"factory method '" + mbd.getFactoryMethodName() + "(" + argDesc + ")'. " +
-						"Check that a method with the specified name " + (minNrOfArgs > 0 ? "and arguments " : "") +
-						"exists and that it is " + (isStatic ? "static" : "non-static") + ".");
+						"Check that a method with the specified name " +
+						(minNrOfArgs > 0 ? "and arguments " : "") +
+						"exists and that it is " +
+						(isStatic ? "static" : "non-static") + ".");
 			}
 			else if (void.class == factoryMethodToUse.getReturnType()) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -567,16 +567,16 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	 */
 	protected void destroyBean(String beanName, @Nullable DisposableBean bean) {
 		// Trigger destruction of dependent beans first...
-		Set<String> dependentBeanNames;
+		Set<String> dependencies;
 		synchronized (this.dependentBeanMap) {
 			// Within full synchronization in order to guarantee a disconnected Set
-			dependentBeanNames = this.dependentBeanMap.remove(beanName);
+			dependencies = this.dependentBeanMap.remove(beanName);
 		}
-		if (dependentBeanNames != null) {
+		if (dependencies != null) {
 			if (logger.isTraceEnabled()) {
-				logger.trace("Retrieved dependent beans for bean '" + beanName + "': " + dependentBeanNames);
+				logger.trace("Retrieved dependent beans for bean '" + beanName + "': " + dependencies);
 			}
-			for (String dependentBeanName : dependentBeanNames) {
+			for (String dependentBeanName : dependencies) {
 				destroySingleton(dependentBeanName);
 			}
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -108,8 +108,7 @@ public class GenericTypeAwareAutowireCandidateResolver extends SimpleAutowireCan
 				Class<?> resolvedClass = targetType.resolve();
 				if (resolvedClass != null && FactoryBean.class.isAssignableFrom(resolvedClass)) {
 					Class<?> typeToBeMatched = dependencyType.resolve();
-					if (typeToBeMatched != null && !FactoryBean.class.isAssignableFrom(typeToBeMatched) &&
-							!typeToBeMatched.isAssignableFrom(resolvedClass)) {
+					if (typeToBeMatched != null && !FactoryBean.class.isAssignableFrom(typeToBeMatched)) {
 						targetType = targetType.getGeneric();
 						if (descriptor.fallbackMatchAllowed()) {
 							// Matching the Class-based type determination for FactoryBean
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -41,8 +41,6 @@ import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.beans.testfixture.beans.DerivedTestBean;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.cglib.proxy.Enhancer;
-import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceEditor;
 import org.springframework.lang.Nullable;
@@ -53,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 import static org.assertj.core.api.SoftAssertions.assertSoftly;

 /**
- * Tests for {@link BeanUtils}.
+ * Unit tests for {@link BeanUtils}.
 *
 * @author Juergen Hoeller
 * @author Rob Harrop
@@ -323,13 +321,12 @@ class BeanUtilsTests {
 		Order original = new Order("test", List.of("foo", "bar"));

 		// Create a Proxy that loses the generic type information for the getLineItems() method.
-		OrderSummary proxy = (OrderSummary) Proxy.newProxyInstance(getClass().getClassLoader(),
-				new Class<?>[] {OrderSummary.class}, new OrderInvocationHandler(original));
+		OrderSummary proxy = proxyOrder(original);
 		assertThat(OrderSummary.class.getDeclaredMethod("getLineItems").toGenericString())
-				.contains("java.util.List<java.lang.String>");
+			.contains("java.util.List<java.lang.String>");
 		assertThat(proxy.getClass().getDeclaredMethod("getLineItems").toGenericString())
-				.contains("java.util.List")
-				.doesNotContain("<java.lang.String>");
+			.contains("java.util.List")
+			.doesNotContain("<java.lang.String>");

 		// Ensure that our custom Proxy works as expected.
 		assertThat(proxy.getId()).isEqualTo("test");
@@ -342,23 +339,6 @@ class BeanUtilsTests {
 		assertThat(target.getLineItems()).containsExactly("foo", "bar");
 	}

-	@Test  // gh-32888
-	public void copyPropertiesWithGenericCglibClass() {
-		Enhancer enhancer = new Enhancer();
-		enhancer.setSuperclass(User.class);
-		enhancer.setCallback((MethodInterceptor) (obj, method, args, proxy) -> proxy.invokeSuper(obj, args));
-		User user = (User) enhancer.create();
-		user.setId(1);
-		user.setName("proxy");
-		user.setAddress("addr");
-
-		User target = new User();
-		BeanUtils.copyProperties(user, target);
-		assertThat(target.getId()).isEqualTo(user.getId());
-		assertThat(target.getName()).isEqualTo(user.getName());
-		assertThat(target.getAddress()).isEqualTo(user.getAddress());
-	}
-
 	@Test
 	void copyPropertiesWithEditable() throws Exception {
 		TestBean tb = new TestBean();
@@ -538,7 +518,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class IntegerHolder {

@@ -553,7 +532,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class WildcardListHolder1 {

@@ -568,7 +546,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class WildcardListHolder2 {

@@ -583,7 +560,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class NumberUpperBoundedWildcardListHolder {

@@ -598,7 +574,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class NumberListHolder {

@@ -613,7 +588,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class IntegerListHolder1 {

@@ -628,7 +602,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class IntegerListHolder2 {

@@ -643,7 +616,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class LongListHolder {

@@ -824,7 +796,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	private static class BeanWithNullableTypes {

 		private Integer counter;
@@ -855,7 +826,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	private static class BeanWithPrimitiveTypes {

 		private boolean flag;
@@ -868,6 +838,7 @@ class BeanUtilsTests {
 		private char character;
 		private String text;

+
 		@SuppressWarnings("unused")
 		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
 				float floatCount, double doubleCount, char character, String text) {
@@ -918,8 +889,8 @@ class BeanUtilsTests {
 		public String getText() {
 			return text;
 		}
-	}

+	}

 	private static class PrivateBeanWithPrivateConstructor {

@@ -927,14 +898,13 @@ class BeanUtilsTests {
 		}
 	}

-
 	@SuppressWarnings("unused")
 	private static class Order {

 		private String id;
-
 		private List<String> lineItems;

+
 		Order() {
 		}

@@ -965,7 +935,6 @@ class BeanUtilsTests {
 		}
 	}

-
 	private interface OrderSummary {

 		String getId();
@@ -974,10 +943,17 @@ class BeanUtilsTests {
 	}


+	private OrderSummary proxyOrder(Order order) {
+		return (OrderSummary) Proxy.newProxyInstance(getClass().getClassLoader(),
+			new Class<?>[] { OrderSummary.class }, new OrderInvocationHandler(order));
+	}
+
+
 	private static class OrderInvocationHandler implements InvocationHandler {

 		private final Order order;

+
 		OrderInvocationHandler(Order order) {
 			this.order = order;
 		}
@@ -995,46 +971,4 @@ class BeanUtilsTests {
 		}
 	}

-
-	private static class GenericBaseModel<T> {
-
-		private T id;
-
-		private String name;
-
-		public T getId() {
-			return id;
-		}
-
-		public void setId(T id) {
-			this.id = id;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-	}
-
-
-	private static class User extends GenericBaseModel<Integer> {
-
-		private String address;
-
-		public User() {
-			super();
-		}
-
-		public String getAddress() {
-			return address;
-		}
-
-		public void setAddress(String address) {
-			this.address = address;
-		}
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,10 +29,12 @@ import org.springframework.core.MethodClassKey;
 import org.springframework.lang.Nullable;

 /**
- * Abstract implementation of {@link JCacheOperationSource} that caches operations
+ * Abstract implementation of {@link JCacheOperationSource} that caches attributes
 * for methods and implements a fallback policy: 1. specific target method;
 * 2. declaring method.
 *
+ * <p>This implementation caches attributes by method after they are first used.
+ *
 * @author Stephane Nicoll
 * @author Juergen Hoeller
 * @since 4.1
@@ -41,25 +43,24 @@ import org.springframework.lang.Nullable;
 public abstract class AbstractFallbackJCacheOperationSource implements JCacheOperationSource {

 	/**
-	 * Canonical value held in cache to indicate no cache operation was
-	 * found for this method, and we don't need to look again.
+	 * Canonical value held in cache to indicate no caching attribute was
+	 * found for this method and we don't need to look again.
 	 */
-	private static final Object NULL_CACHING_MARKER = new Object();
+	private static final Object NULL_CACHING_ATTRIBUTE = new Object();


 	protected final Log logger = LogFactory.getLog(getClass());

-	private final Map<MethodClassKey, Object> operationCache = new ConcurrentHashMap<>(1024);
+	private final Map<MethodClassKey, Object> cache = new ConcurrentHashMap<>(1024);


 	@Override
-	@Nullable
 	public JCacheOperation<?> getCacheOperation(Method method, @Nullable Class<?> targetClass) {
 		MethodClassKey cacheKey = new MethodClassKey(method, targetClass);
-		Object cached = this.operationCache.get(cacheKey);
+		Object cached = this.cache.get(cacheKey);

 		if (cached != null) {
-			return (cached != NULL_CACHING_MARKER ? (JCacheOperation<?>) cached : null);
+			return (cached != NULL_CACHING_ATTRIBUTE ? (JCacheOperation<?>) cached : null);
 		}
 		else {
 			JCacheOperation<?> operation = computeCacheOperation(method, targetClass);
@@ -67,10 +68,10 @@ public abstract class AbstractFallbackJCacheOperationSource implements JCacheOpe
 				if (logger.isDebugEnabled()) {
 					logger.debug("Adding cacheable method '" + method.getName() + "' with operation: " + operation);
 				}
-				this.operationCache.put(cacheKey, operation);
+				this.cache.put(cacheKey, operation);
 			}
 			else {
-				this.operationCache.put(cacheKey, NULL_CACHING_MARKER);
+				this.cache.put(cacheKey, NULL_CACHING_ATTRIBUTE);
 			}
 			return operation;
 		}
@@ -83,7 +84,7 @@ public abstract class AbstractFallbackJCacheOperationSource implements JCacheOpe
 			return null;
 		}

-		// The method may be on an interface, but we need metadata from the target class.
+		// The method may be on an interface, but we need attributes from the target class.
 		// If the target class is null, the method will be unchanged.
 		Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass);

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -212,8 +212,10 @@ public abstract class AnnotationJCacheOperationSource extends AbstractFallbackJC
 		for (Class<?> parameterType : parameterTypes) {
 			parameters.add(parameterType.getName());
 		}
-		return method.getDeclaringClass().getName() + '.' + method.getName() +
-				'(' + StringUtils.collectionToCommaDelimitedString(parameters) + ')';
+
+		return method.getDeclaringClass().getName()
+				+ '.' + method.getName()
+				+ '(' + StringUtils.collectionToCommaDelimitedString(parameters) + ')';
 	}

 	private int countNonNull(Object... instances) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ public class BeanFactoryJCacheOperationSourceAdvisor extends AbstractBeanFactory
 	 * Set the cache operation attribute source which is used to find cache
 	 * attributes. This should usually be identical to the source reference
 	 * set on the cache interceptor itself.
-	 * @see JCacheInterceptor#setCacheOperationSource
 	 */
 	public void setCacheOperationSource(JCacheOperationSource cacheOperationSource) {
 		this.pointcut.setCacheOperationSource(cacheOperationSource);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public interface JCacheOperationSource {
 	 * Return the cache operations for this method, or {@code null}
 	 * if the method contains no <em>JSR-107</em> related metadata.
 	 * @param method the method to introspect
-	 * @param targetClass the target class (can be {@code null}, in which case
+	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the declaring class of the method must be used)
 	 * @return the cache operation for this method, or {@code null} if none found
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;

 /**
- * A {@code Pointcut} that matches if the underlying {@link JCacheOperationSource}
+ * A Pointcut that matches if the underlying {@link JCacheOperationSource}
 * has an operation for a given method.
 *
 * @author Stephane Nicoll
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,12 +22,11 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeHint.Builder;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.aot.hint.annotation.ReflectiveRuntimeHintsRegistrar;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;

 /**
 * {@link RuntimeHintsRegistrar} implementation that makes sure {@link SchedulerFactoryBean}
- * reflection hints are registered.
+ * reflection entries are registered.
 *
 * @author Sebastien Deleuze
 * @author Stephane Nicoll
@@ -37,11 +36,11 @@ class SchedulerFactoryBeanRuntimeHints implements RuntimeHintsRegistrar {

 	private static final String SCHEDULER_FACTORY_CLASS_NAME = "org.quartz.impl.StdSchedulerFactory";

-	private static final ReflectiveRuntimeHintsRegistrar registrar = new ReflectiveRuntimeHintsRegistrar();
+	private final ReflectiveRuntimeHintsRegistrar reflectiveRegistrar = new ReflectiveRuntimeHintsRegistrar();


 	@Override
-	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 		if (!ClassUtils.isPresent(SCHEDULER_FACTORY_CLASS_NAME, classLoader)) {
 			return;
 		}
@@ -49,7 +48,7 @@ class SchedulerFactoryBeanRuntimeHints implements RuntimeHintsRegistrar {
 				.registerType(TypeReference.of(SCHEDULER_FACTORY_CLASS_NAME), this::typeHint)
 				.registerTypes(TypeReference.listOf(ResourceLoaderClassLoadHelper.class,
 						LocalTaskExecutorThreadPool.class, LocalDataSourceJobStore.class), this::typeHint);
-		registrar.registerRuntimeHints(hints, LocalTaskExecutorThreadPool.class);
+		this.reflectiveRegistrar.registerRuntimeHints(hints, LocalTaskExecutorThreadPool.class);
 	}

 	private void typeHint(Builder typeHint) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,16 +32,20 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;

 /**
- * Abstract implementation of {@link CacheOperationSource} that caches operations
+ * Abstract implementation of {@link CacheOperation} that caches attributes
 * for methods and implements a fallback policy: 1. specific target method;
 * 2. target class; 3. declaring method; 4. declaring class/interface.
 *
- * <p>Defaults to using the target class's declared cache operations if none are
- * associated with the target method. Any cache operations associated with
- * the target method completely override any class-level declarations.
+ * <p>Defaults to using the target class's caching attribute if none is
+ * associated with the target method. Any caching attribute associated with
+ * the target method completely overrides a class caching attribute.
 * If none found on the target class, the interface that the invoked method
 * has been called through (in case of a JDK proxy) will be checked.
 *
+ * <p>This implementation caches attributes by method after they are first
+ * used. If it is ever desirable to allow dynamic changing of cacheable
+ * attributes (which is very unlikely), caching could be made configurable.
+ *
 * @author Costin Leau
 * @author Juergen Hoeller
 * @since 3.1
@@ -49,10 +53,10 @@ import org.springframework.util.ClassUtils;
 public abstract class AbstractFallbackCacheOperationSource implements CacheOperationSource {

 	/**
-	 * Canonical value held in cache to indicate no cache operation was
-	 * found for this method, and we don't need to look again.
+	 * Canonical value held in cache to indicate no caching attribute was
+	 * found for this method and we don't need to look again.
 	 */
-	private static final Collection<CacheOperation> NULL_CACHING_MARKER = Collections.emptyList();
+	private static final Collection<CacheOperation> NULL_CACHING_ATTRIBUTE = Collections.emptyList();


 	/**
@@ -67,14 +71,14 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 	 * <p>As this base class is not marked Serializable, the cache will be recreated
 	 * after serialization - provided that the concrete subclass is Serializable.
 	 */
-	private final Map<Object, Collection<CacheOperation>> operationCache = new ConcurrentHashMap<>(1024);
+	private final Map<Object, Collection<CacheOperation>> attributeCache = new ConcurrentHashMap<>(1024);


 	/**
-	 * Determine the cache operations for this method invocation.
-	 * <p>Defaults to class-declared metadata if no method-level metadata is found.
+	 * Determine the caching attribute for this method invocation.
+	 * <p>Defaults to the class's caching attribute if no method attribute is found.
 	 * @param method the method for the current invocation (never {@code null})
-	 * @param targetClass the target class for this invocation (can be {@code null})
+	 * @param targetClass the target class for this invocation (may be {@code null})
 	 * @return {@link CacheOperation} for this method, or {@code null} if the method
 	 * is not cacheable
 	 */
@@ -86,21 +90,21 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 		}

 		Object cacheKey = getCacheKey(method, targetClass);
-		Collection<CacheOperation> cached = this.operationCache.get(cacheKey);
+		Collection<CacheOperation> cached = this.attributeCache.get(cacheKey);

 		if (cached != null) {
-			return (cached != NULL_CACHING_MARKER ? cached : null);
+			return (cached != NULL_CACHING_ATTRIBUTE ? cached : null);
 		}
 		else {
 			Collection<CacheOperation> cacheOps = computeCacheOperations(method, targetClass);
 			if (cacheOps != null) {
 				if (logger.isTraceEnabled()) {
-					logger.trace("Adding cacheable method '" + method.getName() + "' with operations: " + cacheOps);
+					logger.trace("Adding cacheable method '" + method.getName() + "' with attribute: " + cacheOps);
 				}
-				this.operationCache.put(cacheKey, cacheOps);
+				this.attributeCache.put(cacheKey, cacheOps);
 			}
 			else {
-				this.operationCache.put(cacheKey, NULL_CACHING_MARKER);
+				this.attributeCache.put(cacheKey, NULL_CACHING_ATTRIBUTE);
 			}
 			return cacheOps;
 		}
@@ -125,7 +129,7 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 			return null;
 		}

-		// The method may be on an interface, but we need metadata from the target class.
+		// The method may be on an interface, but we need attributes from the target class.
 		// If the target class is null, the method will be unchanged.
 		Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass);

@@ -159,19 +163,19 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera


 	/**
-	 * Subclasses need to implement this to return the cache operations for the
+	 * Subclasses need to implement this to return the caching attribute for the
 	 * given class, if any.
-	 * @param clazz the class to retrieve the cache operations for
-	 * @return all cache operations associated with this class, or {@code null} if none
+	 * @param clazz the class to retrieve the attribute for
+	 * @return all caching attribute associated with this class, or {@code null} if none
 	 */
 	@Nullable
 	protected abstract Collection<CacheOperation> findCacheOperations(Class<?> clazz);

 	/**
-	 * Subclasses need to implement this to return the cache operations for the
+	 * Subclasses need to implement this to return the caching attribute for the
 	 * given method, if any.
-	 * @param method the method to retrieve the cache operations for
-	 * @return all cache operations associated with this method, or {@code null} if none
+	 * @param method the method to retrieve the attribute for
+	 * @return all caching attribute associated with this method, or {@code null} if none
 	 */
 	@Nullable
 	protected abstract Collection<CacheOperation> findCacheOperations(Method method);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public interface CacheOperationSource {
 	 * Return the collection of cache operations for this method,
 	 * or {@code null} if the method contains no <em>cacheable</em> annotations.
 	 * @param method the method to introspect
-	 * @param targetClass the target class (can be {@code null}, in which case
+	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the declaring class of the method must be used)
 	 * @return all cache operations for this method, or {@code null} if none found
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.springframework.util.ObjectUtils;

 /**
 * A {@code Pointcut} that matches if the underlying {@link CacheOperationSource}
- * has an operation for a given method.
+ * has an attribute for a given method.
 *
 * @author Costin Leau
 * @author Juergen Hoeller
@@ -36,7 +36,7 @@ import org.springframework.util.ObjectUtils;
 * @since 3.1
 */
@SuppressWarnings("serial")
-final class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {
+class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {

 	@Nullable
 	private CacheOperationSource cacheOperationSource;
@@ -78,7 +78,7 @@ final class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut imp
 	 * {@link ClassFilter} that delegates to {@link CacheOperationSource#isCandidateClass}
 	 * for filtering classes whose methods are not worth searching to begin with.
 	 */
-	private final class CacheOperationSourceClassFilter implements ClassFilter {
+	private class CacheOperationSourceClassFilter implements ClassFilter {

 		@Override
 		public boolean matches(Class<?> clazz) {
@@ -88,7 +88,6 @@ final class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut imp
 			return (cacheOperationSource == null || cacheOperationSource.isCandidateClass(clazz));
 		}

-		@Nullable
 		private CacheOperationSource getCacheOperationSource() {
 			return cacheOperationSource;
 		}
@@ -96,7 +95,7 @@ final class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut imp
 		@Override
 		public boolean equals(@Nullable Object other) {
 			return (this == other || (other instanceof CacheOperationSourceClassFilter that &&
-					ObjectUtils.nullSafeEquals(getCacheOperationSource(), that.getCacheOperationSource())));
+					ObjectUtils.nullSafeEquals(cacheOperationSource, that.getCacheOperationSource())));
 		}

 		@Override
@@ -106,8 +105,9 @@ final class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut imp

 		@Override
 		public String toString() {
-			return CacheOperationSourceClassFilter.class.getName() + ": " + getCacheOperationSource();
+			return CacheOperationSourceClassFilter.class.getName() + ": " + cacheOperationSource;
 		}
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@ final class ConfigurationClass {
 	 * Create a new {@link ConfigurationClass} with the given name.
 	 * @param metadataReader reader used to parse the underlying {@link Class}
 	 * @param beanName must not be {@code null}
+	 * @see ConfigurationClass#ConfigurationClass(Class, ConfigurationClass)
 	 */
 	ConfigurationClass(MetadataReader metadataReader, String beanName) {
 		Assert.notNull(beanName, "Bean name must not be null");
@@ -86,10 +87,10 @@ final class ConfigurationClass {
 	 * using the {@link Import} annotation or automatically processed as a nested
 	 * configuration class (if importedBy is not {@code null}).
 	 * @param metadataReader reader used to parse the underlying {@link Class}
-	 * @param importedBy the configuration class importing this one
+	 * @param importedBy the configuration class importing this one or {@code null}
 	 * @since 3.1.1
 	 */
-	ConfigurationClass(MetadataReader metadataReader, ConfigurationClass importedBy) {
+	ConfigurationClass(MetadataReader metadataReader, @Nullable ConfigurationClass importedBy) {
 		this.metadata = metadataReader.getAnnotationMetadata();
 		this.resource = metadataReader.getResource();
 		this.importedBy.add(importedBy);
@@ -99,6 +100,7 @@ final class ConfigurationClass {
 	 * Create a new {@link ConfigurationClass} with the given name.
 	 * @param clazz the underlying {@link Class} to represent
 	 * @param beanName name of the {@code @Configuration} class bean
+	 * @see ConfigurationClass#ConfigurationClass(Class, ConfigurationClass)
 	 */
 	ConfigurationClass(Class<?> clazz, String beanName) {
 		Assert.notNull(beanName, "Bean name must not be null");
@@ -112,10 +114,10 @@ final class ConfigurationClass {
 	 * using the {@link Import} annotation or automatically processed as a nested
 	 * configuration class (if imported is {@code true}).
 	 * @param clazz the underlying {@link Class} to represent
-	 * @param importedBy the configuration class importing this one
+	 * @param importedBy the configuration class importing this one (or {@code null})
 	 * @since 3.1.1
 	 */
-	ConfigurationClass(Class<?> clazz, ConfigurationClass importedBy) {
+	ConfigurationClass(Class<?> clazz, @Nullable ConfigurationClass importedBy) {
 		this.metadata = AnnotationMetadata.introspect(clazz);
 		this.resource = new DescriptiveResource(clazz.getName());
 		this.importedBy.add(importedBy);
@@ -125,6 +127,7 @@ final class ConfigurationClass {
 	 * Create a new {@link ConfigurationClass} with the given name.
 	 * @param metadata the metadata for the underlying class to represent
 	 * @param beanName name of the {@code @Configuration} class bean
+	 * @see ConfigurationClass#ConfigurationClass(Class, ConfigurationClass)
 	 */
 	ConfigurationClass(AnnotationMetadata metadata, String beanName) {
 		Assert.notNull(beanName, "Bean name must not be null");
@@ -146,12 +149,12 @@ final class ConfigurationClass {
 		return ClassUtils.getShortName(getMetadata().getClassName());
 	}

-	void setBeanName(@Nullable String beanName) {
+	void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}

 	@Nullable
-	String getBeanName() {
+	public String getBeanName() {
 		return this.beanName;
 	}

@@ -161,7 +164,7 @@ final class ConfigurationClass {
 	 * @since 3.1.1
 	 * @see #getImportedBy()
 	 */
-	boolean isImported() {
+	public boolean isImported() {
 		return !this.importedBy.isEmpty();
 	}

@@ -195,10 +198,6 @@ final class ConfigurationClass {
 		this.importedResources.put(importedResource, readerClass);
 	}

-	Map<String, Class<? extends BeanDefinitionReader>> getImportedResources() {
-		return this.importedResources;
-	}
-
 	void addImportBeanDefinitionRegistrar(ImportBeanDefinitionRegistrar registrar, AnnotationMetadata importingClassMetadata) {
 		this.importBeanDefinitionRegistrars.put(registrar, importingClassMetadata);
 	}
@@ -207,6 +206,10 @@ final class ConfigurationClass {
 		return this.importBeanDefinitionRegistrars;
 	}

+	Map<String, Class<? extends BeanDefinitionReader>> getImportedResources() {
+		return this.importedResources;
+	}
+
 	void validate(ProblemReporter problemReporter) {
 		Map<String, Object> attributes = this.metadata.getAnnotationAttributes(Configuration.class.getName());

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -225,6 +225,7 @@ class ConfigurationClassEnhancer {
 			};
 			return new TransformingClassGenerator(cg, transformer);
 		}
+
 	}


@@ -333,7 +334,6 @@ class ConfigurationClassEnhancer {
 			return resolveBeanReference(beanMethod, beanMethodArgs, beanFactory, beanName);
 		}

-		@Nullable
 		private Object resolveBeanReference(Method beanMethod, Object[] beanMethodArgs,
 				ConfigurableBeanFactory beanFactory, String beanName) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -386,11 +386,11 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		});

 		// Detect any custom bean name generation strategy supplied through the enclosing application context
-		SingletonBeanRegistry singletonRegistry = null;
-		if (registry instanceof SingletonBeanRegistry sbr) {
-			singletonRegistry = sbr;
+		SingletonBeanRegistry sbr = null;
+		if (registry instanceof SingletonBeanRegistry _sbr) {
+			sbr = _sbr;
 			if (!this.localBeanNameGeneratorSet) {
-				BeanNameGenerator generator = (BeanNameGenerator) singletonRegistry.getSingleton(
+				BeanNameGenerator generator = (BeanNameGenerator) sbr.getSingleton(
 						AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR);
 				if (generator != null) {
 					this.componentScanBeanNameGenerator = generator;
@@ -451,8 +451,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		while (!candidates.isEmpty());

 		// Register the ImportRegistry as a bean in order to support ImportAware @Configuration classes
-		if (singletonRegistry != null && !singletonRegistry.containsSingleton(IMPORT_REGISTRY_BEAN_NAME)) {
-			singletonRegistry.registerSingleton(IMPORT_REGISTRY_BEAN_NAME, parser.getImportRegistry());
+		if (sbr != null && !sbr.containsSingleton(IMPORT_REGISTRY_BEAN_NAME)) {
+			sbr.registerSingleton(IMPORT_REGISTRY_BEAN_NAME, parser.getImportRegistry());
 		}

 		// Store the PropertySourceDescriptors to contribute them Ahead-of-time if necessary
@@ -550,7 +550,6 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		}

 		@Override
-		@Nullable
 		public PropertyValues postProcessProperties(@Nullable PropertyValues pvs, Object bean, String beanName) {
 			// Inject the BeanFactory before AutowiredAnnotationBeanPostProcessor's
 			// postProcessProperties method attempts to autowire other configuration beans.
@@ -646,8 +645,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 			}
 			return mappings;
 		}
-	}

+	}

 	private static class PropertySourcesAotContribution implements BeanFactoryInitializationAotContribution {

@@ -744,14 +743,15 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 				return nonNull.get();
 			}
 		}
-	}

+	}

 	private static class ConfigurationClassProxyBeanRegistrationCodeFragments extends BeanRegistrationCodeFragmentsDecorator {

 		private final Class<?> proxyClass;

-		public ConfigurationClassProxyBeanRegistrationCodeFragments(BeanRegistrationCodeFragments codeFragments, Class<?> proxyClass) {
+		public ConfigurationClassProxyBeanRegistrationCodeFragments(BeanRegistrationCodeFragments codeFragments,
+				Class<?> proxyClass) {
 			super(codeFragments);
 			this.proxyClass = proxyClass;
 		}
@@ -759,7 +759,6 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		@Override
 		public CodeBlock generateSetBeanDefinitionPropertiesCode(GenerationContext generationContext,
 				BeanRegistrationCode beanRegistrationCode, RootBeanDefinition beanDefinition, Predicate<String> attributeFilter) {
-
 			CodeBlock.Builder code = CodeBlock.builder();
 			code.add(super.generateSetBeanDefinitionPropertiesCode(generationContext,
 					beanRegistrationCode, beanDefinition, attributeFilter));
@@ -772,7 +771,6 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		public CodeBlock generateInstanceSupplierCode(GenerationContext generationContext,
 				BeanRegistrationCode beanRegistrationCode, Executable constructorOrFactoryMethod,
 				boolean allowDirectSupplierShortcut) {
-
 			Executable executableToUse = proxyExecutable(generationContext.getRuntimeHints(), constructorOrFactoryMethod);
 			return super.generateInstanceSupplierCode(generationContext, beanRegistrationCode,
 					executableToUse, allowDirectSupplierShortcut);
@@ -790,6 +788,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 			}
 			return userExecutable;
 		}
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,8 +39,7 @@ import org.springframework.beans.factory.support.RegisteredBean;
 */
 class ReflectiveProcessorBeanFactoryInitializationAotProcessor implements BeanFactoryInitializationAotProcessor {

-	private static final ReflectiveRuntimeHintsRegistrar registrar = new ReflectiveRuntimeHintsRegistrar();
-
+	private static final ReflectiveRuntimeHintsRegistrar REGISTRAR = new ReflectiveRuntimeHintsRegistrar();

 	@Override
 	public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
@@ -50,9 +49,7 @@ class ReflectiveProcessorBeanFactoryInitializationAotProcessor implements BeanFa
 		return new ReflectiveProcessorBeanFactoryInitializationAotContribution(beanTypes);
 	}

-
-	private static class ReflectiveProcessorBeanFactoryInitializationAotContribution
-			implements BeanFactoryInitializationAotContribution {
+	private static class ReflectiveProcessorBeanFactoryInitializationAotContribution implements BeanFactoryInitializationAotContribution {

 		private final Class<?>[] types;

@@ -63,8 +60,9 @@ class ReflectiveProcessorBeanFactoryInitializationAotProcessor implements BeanFa
 		@Override
 		public void applyTo(GenerationContext generationContext, BeanFactoryInitializationCode beanFactoryInitializationCode) {
 			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
-			registrar.registerRuntimeHints(runtimeHints, this.types);
+			REGISTRAR.registerRuntimeHints(runtimeHints, this.types);
 		}
+
 	}

 }
@@ -135,6 +135,17 @@ import org.springframework.util.ReflectionUtils;
 public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		implements ConfigurableApplicationContext {

+	/**
+	 * The name of the {@link LifecycleProcessor} bean in the context.
+	 * If none is supplied, a {@link DefaultLifecycleProcessor} is used.
+	 * @since 3.0
+	 * @see org.springframework.context.LifecycleProcessor
+	 * @see org.springframework.context.support.DefaultLifecycleProcessor
+	 * @see #start()
+	 * @see #stop()
+	 */
+	public static final String LIFECYCLE_PROCESSOR_BEAN_NAME = "lifecycleProcessor";
+
 	/**
 	 * The name of the {@link MessageSource} bean in the context.
 	 * If none is supplied, message resolution is delegated to the parent.
@@ -155,17 +166,6 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 */
 	public static final String APPLICATION_EVENT_MULTICASTER_BEAN_NAME = "applicationEventMulticaster";

-	/**
-	 * The name of the {@link LifecycleProcessor} bean in the context.
-	 * If none is supplied, a {@link DefaultLifecycleProcessor} is used.
-	 * @since 3.0
-	 * @see org.springframework.context.LifecycleProcessor
-	 * @see org.springframework.context.support.DefaultLifecycleProcessor
-	 * @see #start()
-	 * @see #stop()
-	 */
-	public static final String LIFECYCLE_PROCESSOR_BEAN_NAME = "lifecycleProcessor";
-

 	static {
 		// Eagerly load the ContextClosedEvent class to avoid weird classloader issues
@@ -796,9 +796,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}

 	/**
-	 * Initialize the {@link MessageSource}.
-	 * <p>Uses parent's {@code MessageSource} if none defined in this context.
-	 * @see #MESSAGE_SOURCE_BEAN_NAME
+	 * Initialize the MessageSource.
+	 * Use parent's if none defined in this context.
 	 */
 	protected void initMessageSource() {
 		ConfigurableListableBeanFactory beanFactory = getBeanFactory();
@@ -828,9 +827,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}

 	/**
-	 * Initialize the {@link ApplicationEventMulticaster}.
-	 * <p>Uses {@link SimpleApplicationEventMulticaster} if none defined in the context.
-	 * @see #APPLICATION_EVENT_MULTICASTER_BEAN_NAME
+	 * Initialize the ApplicationEventMulticaster.
+	 * Uses SimpleApplicationEventMulticaster if none defined in the context.
 	 * @see org.springframework.context.event.SimpleApplicationEventMulticaster
 	 */
 	protected void initApplicationEventMulticaster() {
@@ -853,16 +851,15 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}

 	/**
-	 * Initialize the {@link LifecycleProcessor}.
-	 * <p>Uses {@link DefaultLifecycleProcessor} if none defined in the context.
-	 * @since 3.0
-	 * @see #LIFECYCLE_PROCESSOR_BEAN_NAME
+	 * Initialize the LifecycleProcessor.
+	 * Uses DefaultLifecycleProcessor if none defined in the context.
 	 * @see org.springframework.context.support.DefaultLifecycleProcessor
 	 */
 	protected void initLifecycleProcessor() {
 		ConfigurableListableBeanFactory beanFactory = getBeanFactory();
 		if (beanFactory.containsLocalBean(LIFECYCLE_PROCESSOR_BEAN_NAME)) {
-			this.lifecycleProcessor = beanFactory.getBean(LIFECYCLE_PROCESSOR_BEAN_NAME, LifecycleProcessor.class);
+			this.lifecycleProcessor =
+					beanFactory.getBean(LIFECYCLE_PROCESSOR_BEAN_NAME, LifecycleProcessor.class);
 			if (logger.isTraceEnabled()) {
 				logger.trace("Using LifecycleProcessor [" + this.lifecycleProcessor + "]");
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -126,7 +126,6 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
 		try {
 			DefaultListableBeanFactory beanFactory = createBeanFactory();
 			beanFactory.setSerializationId(getId());
-			beanFactory.setApplicationStartup(getApplicationStartup());
 			customizeBeanFactory(beanFactory);
 			loadBeanDefinitions(beanFactory);
 			this.beanFactory = beanFactory;
@@ -149,13 +149,13 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor

 		lifecycleBeans.forEach((beanName, bean) -> {
 			if (!autoStartupOnly || (bean instanceof SmartLifecycle smartLifecycle && smartLifecycle.isAutoStartup())) {
-				int startupPhase = getPhase(bean);
-				phases.computeIfAbsent(startupPhase,
-						phase -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, autoStartupOnly)
+				int phase = getPhase(bean);
+				phases.computeIfAbsent(
+						phase,
+						p -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, autoStartupOnly)
 				).add(beanName, bean);
 			}
 		});
-
 		if (!phases.isEmpty()) {
 			phases.values().forEach(LifecycleGroup::start);
 		}
@@ -195,7 +195,6 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 	private void stopBeans() {
 		Map<String, Lifecycle> lifecycleBeans = getLifecycleBeans();
 		Map<Integer, LifecycleGroup> phases = new HashMap<>();
-
 		lifecycleBeans.forEach((beanName, bean) -> {
 			int shutdownPhase = getPhase(bean);
 			LifecycleGroup group = phases.get(shutdownPhase);
@@ -205,7 +204,6 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 			}
 			group.add(beanName, bean);
 		});
-
 		if (!phases.isEmpty()) {
 			List<Integer> keys = new ArrayList<>(phases.keySet());
 			keys.sort(Collections.reverseOrder());
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.context.support;

 import java.io.IOException;
 import java.lang.reflect.Constructor;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
@@ -424,37 +423,16 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 				PostProcessorRegistrationDelegate.loadBeanPostProcessors(
 						this.beanFactory, SmartInstantiationAwareBeanPostProcessor.class);

-		List<String> lazyBeans = new ArrayList<>();
-
-		// First round: non-lazy singleton beans in definition order,
-		// matching preInstantiateSingletons.
 		for (String beanName : this.beanFactory.getBeanDefinitionNames()) {
-			BeanDefinition bd = getBeanDefinition(beanName);
-			if (bd.isSingleton() && !bd.isLazyInit()) {
-				preDetermineBeanType(beanName, bpps, runtimeHints);
-			}
-			else {
-				lazyBeans.add(beanName);
-			}
-		}
-
-		// Second round: lazy singleton beans and scoped beans.
-		for (String beanName : lazyBeans) {
-			preDetermineBeanType(beanName, bpps, runtimeHints);
-		}
-	}
-
-	private void preDetermineBeanType(String beanName, List<SmartInstantiationAwareBeanPostProcessor> bpps,
-			RuntimeHints runtimeHints) {
-
-		Class<?> beanType = this.beanFactory.getType(beanName);
-		if (beanType != null) {
-			ClassHintUtils.registerProxyIfNecessary(beanType, runtimeHints);
-			for (SmartInstantiationAwareBeanPostProcessor bpp : bpps) {
-				Class<?> newBeanType = bpp.determineBeanType(beanType, beanName);
-				if (newBeanType != beanType) {
-					ClassHintUtils.registerProxyIfNecessary(newBeanType, runtimeHints);
-					beanType = newBeanType;
+			Class<?> beanType = this.beanFactory.getType(beanName);
+			if (beanType != null) {
+				ClassHintUtils.registerProxyIfNecessary(beanType, runtimeHints);
+				for (SmartInstantiationAwareBeanPostProcessor bpp : bpps) {
+					Class<?> newBeanType = bpp.determineBeanType(beanType, beanName);
+					if (newBeanType != beanType) {
+						ClassHintUtils.registerProxyIfNecessary(newBeanType, runtimeHints);
+						beanType = newBeanType;
+					}
 				}
 			}
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,10 +22,8 @@ import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.EnumMap;
-import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.TimeZone;

 import org.springframework.format.Formatter;
@@ -37,14 +35,9 @@ import org.springframework.util.StringUtils;

 /**
 * A formatter for {@link java.util.Date} types.
- *
 * <p>Supports the configuration of an explicit date time pattern, timezone,
 * locale, and fallback date time patterns for lenient parsing.
 *
- * <p>Common ISO patterns for UTC instants are applied at millisecond precision.
- * Note that {@link org.springframework.format.datetime.standard.InstantFormatter}
- * is recommended for flexible UTC parsing into a {@link java.time.Instant} instead.
- *
 * @author Keith Donald
 * @author Juergen Hoeller
 * @author Phillip Webb
@@ -56,23 +49,15 @@ public class DateFormatter implements Formatter<Date> {

 	private static final TimeZone UTC = TimeZone.getTimeZone("UTC");

+	// We use an EnumMap instead of Map.of(...) since the former provides better performance.
 	private static final Map<ISO, String> ISO_PATTERNS;

-	private static final Map<ISO, String> ISO_FALLBACK_PATTERNS;
-
 	static {
-		// We use an EnumMap instead of Map.of(...) since the former provides better performance.
 		Map<ISO, String> formats = new EnumMap<>(ISO.class);
 		formats.put(ISO.DATE, "yyyy-MM-dd");
 		formats.put(ISO.TIME, "HH:mm:ss.SSSXXX");
 		formats.put(ISO.DATE_TIME, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
 		ISO_PATTERNS = Collections.unmodifiableMap(formats);
-
-		// Fallback format for the time part without milliseconds.
-		Map<ISO, String> fallbackFormats = new EnumMap<>(ISO.class);
-		fallbackFormats.put(ISO.TIME, "HH:mm:ssXXX");
-		fallbackFormats.put(ISO.DATE_TIME, "yyyy-MM-dd'T'HH:mm:ssXXX");
-		ISO_FALLBACK_PATTERNS = Collections.unmodifiableMap(fallbackFormats);
 	}


@@ -217,16 +202,8 @@ public class DateFormatter implements Formatter<Date> {
 			return getDateFormat(locale).parse(text);
 		}
 		catch (ParseException ex) {
-			Set<String> fallbackPatterns = new LinkedHashSet<>();
-			String isoPattern = ISO_FALLBACK_PATTERNS.get(this.iso);
-			if (isoPattern != null) {
-				fallbackPatterns.add(isoPattern);
-			}
 			if (!ObjectUtils.isEmpty(this.fallbackPatterns)) {
-				Collections.addAll(fallbackPatterns, this.fallbackPatterns);
-			}
-			if (!fallbackPatterns.isEmpty()) {
-				for (String pattern : fallbackPatterns) {
+				for (String pattern : this.fallbackPatterns) {
 					try {
 						DateFormat dateFormat = configureDateFormat(new SimpleDateFormat(pattern, locale));
 						// Align timezone for parsing format with printing format if ISO is set.
@@ -244,8 +221,8 @@ public class DateFormatter implements Formatter<Date> {
 			}
 			if (this.source != null) {
 				ParseException parseException = new ParseException(
-						String.format("Unable to parse date time value \"%s\" using configuration from %s", text, this.source),
-						ex.getErrorOffset());
+					String.format("Unable to parse date time value \"%s\" using configuration from %s", text, this.source),
+					ex.getErrorOffset());
 				parseException.initCause(ex);
 				throw parseException;
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -41,12 +41,12 @@ public class InstantFormatter implements Formatter<Instant> {

 	@Override
 	public Instant parse(String text, Locale locale) throws ParseException {
-		if (!text.isEmpty() && Character.isAlphabetic(text.charAt(0))) {
+		if (text.length() > 0 && Character.isAlphabetic(text.charAt(0))) {
 			// assuming RFC-1123 value a la "Tue, 3 Jun 2008 11:05:30 GMT"
 			return Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(text));
 		}
 		else {
-			// assuming UTC instant a la "2007-12-03T10:15:30.000Z"
+			// assuming UTC instant a la "2007-12-03T10:15:30.00Z"
 			return Instant.parse(text);
 		}
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -98,8 +98,8 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractBeanFactoryAwareAd
 	 * applying the corresponding default if a supplier is not resolvable.
 	 * @since 5.1
 	 */
-	public void configure(@Nullable Supplier<Executor> executor,
-			@Nullable Supplier<AsyncUncaughtExceptionHandler> exceptionHandler) {
+	public void configure(
+			@Nullable Supplier<Executor> executor, @Nullable Supplier<AsyncUncaughtExceptionHandler> exceptionHandler) {

 		this.executor = executor;
 		this.exceptionHandler = exceptionHandler;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -134,6 +134,11 @@ public class ConcurrentTaskExecutor implements AsyncListenableTaskExecutor, Sche
 	 * execution callback (which may be a wrapper around the user-supplied task).
 	 * <p>The primary use case is to set some execution context around the task's
 	 * invocation, or to provide some monitoring/statistics for task execution.
+	 * <p><b>NOTE:</b> Exception handling in {@code TaskDecorator} implementations
+	 * is limited to plain {@code Runnable} execution via {@code execute} calls.
+	 * In case of {@code #submit} calls, the exposed {@code Runnable} will be a
+	 * {@code FutureTask} which does not propagate any exceptions; you might
+	 * have to cast it and call {@code Future#get} to evaluate exceptions.
 	 * @since 4.3
 	 */
 	public final void setTaskDecorator(TaskDecorator taskDecorator) {
@@ -174,10 +179,11 @@ public class ConcurrentTaskExecutor implements AsyncListenableTaskExecutor, Sche
 	}


-	private TaskExecutorAdapter getAdaptedExecutor(Executor originalExecutor) {
-		TaskExecutorAdapter adapter =
-				(managedExecutorServiceClass != null && managedExecutorServiceClass.isInstance(originalExecutor) ?
-						new ManagedTaskExecutorAdapter(originalExecutor) : new TaskExecutorAdapter(originalExecutor));
+	private TaskExecutorAdapter getAdaptedExecutor(Executor concurrentExecutor) {
+		if (managedExecutorServiceClass != null && managedExecutorServiceClass.isInstance(concurrentExecutor)) {
+			return new ManagedTaskExecutorAdapter(concurrentExecutor);
+		}
+		TaskExecutorAdapter adapter = new TaskExecutorAdapter(concurrentExecutor);
 		if (this.taskDecorator != null) {
 			adapter.setTaskDecorator(this.taskDecorator);
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -183,7 +183,6 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 	 * @see Clock#systemDefaultZone()
 	 */
 	public void setClock(Clock clock) {
-		Assert.notNull(clock, "Clock must not be null");
 		this.clock = clock;
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,9 +46,8 @@ import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureTask;

 /**
- * A standard implementation of Spring's {@link TaskScheduler} interface, wrapping
- * a native {@link java.util.concurrent.ScheduledThreadPoolExecutor} and providing
- * all applicable configuration options for it.
+ * Implementation of Spring's {@link TaskScheduler} interface, wrapping
+ * a native {@link java.util.concurrent.ScheduledThreadPoolExecutor}.
 *
 * @author Juergen Hoeller
 * @author Mark Fisher
@@ -159,7 +158,6 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 	 * @see Clock#systemDefaultZone()
 	 */
 	public void setClock(Clock clock) {
-		Assert.notNull(clock, "Clock must not be null");
 		this.clock = clock;
 	}

@@ -28,14 +28,17 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 *
 * @author Adrian Colyer
 * @author Chris Beams
- * @author Juergen Hoeller
 */
 class OverloadedAdviceTests {

 	@Test
 	@SuppressWarnings("resource")
-	void testConfigParsingWithMismatchedAdviceMethod() {
-		new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
+	void testExceptionOnConfigParsingWithMismatchedAdviceMethod() {
+		assertThatExceptionOfType(BeanCreationException.class)
+			.isThrownBy(() -> new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()))
+			.havingRootCause()
+				.isInstanceOf(IllegalArgumentException.class)
+				.as("invalidAbsoluteTypeName should be detected by AJ").withMessageContaining("invalidAbsoluteTypeName");
 	}

 	@Test
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -307,8 +307,8 @@ class AnnotationConfigApplicationContextTests {
 		assertThat(ObjectUtils.containsElement(context.getBeanNamesForType(BeanC.class), "c")).isTrue();

 		assertThat(context.getBeansOfType(BeanA.class)).isEmpty();
-		assertThat(context.getBeansOfType(BeanB.class).values()).singleElement().isSameAs(context.getBean(BeanB.class));
-		assertThat(context.getBeansOfType(BeanC.class).values()).singleElement().isSameAs(context.getBean(BeanC.class));
+		assertThat(context.getBeansOfType(BeanB.class).values().iterator().next()).isSameAs(context.getBean(BeanB.class));
+		assertThat(context.getBeansOfType(BeanC.class).values().iterator().next()).isSameAs(context.getBean(BeanC.class));

 		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
 				.isThrownBy(() -> context.getBeanFactory().resolveNamedBean(BeanA.class));
@@ -409,17 +409,15 @@ class AnnotationConfigApplicationContextTests {
 		bd2.setTargetType(ResolvableType.forClassWithGenerics(FactoryBean.class, ResolvableType.forClassWithGenerics(GenericHolder.class, Integer.class)));
 		bd2.setLazyInit(true);
 		context.registerBeanDefinition("fb2", bd2);
-		RootBeanDefinition bd3 = new RootBeanDefinition(FactoryBeanInjectionPoints.class);
-		bd3.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
-		context.registerBeanDefinition("ip", bd3);
+		context.registerBeanDefinition("ip", new RootBeanDefinition(FactoryBeanInjectionPoints.class));
 		context.refresh();

-		assertThat(context.getBean("ip", FactoryBeanInjectionPoints.class).factoryBean).isSameAs(context.getBean("&fb1"));
-		assertThat(context.getBean("ip", FactoryBeanInjectionPoints.class).factoryResult).isSameAs(context.getBean("fb1"));
 		assertThat(context.getType("&fb1")).isEqualTo(GenericHolderFactoryBean.class);
 		assertThat(context.getType("fb1")).isEqualTo(GenericHolder.class);
 		assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(2);
 		assertThat(context.getBeanNamesForType(GenericHolderFactoryBean.class)).hasSize(1);
+		assertThat(context.getBean("ip", FactoryBeanInjectionPoints.class).factoryBean).isSameAs(context.getBean("&fb1"));
+		assertThat(context.getBean("ip", FactoryBeanInjectionPoints.class).factoryResult).isSameAs(context.getBean("fb1"));
 	}

 	@Test
@@ -427,7 +425,7 @@ class AnnotationConfigApplicationContextTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		RootBeanDefinition bd1 = new RootBeanDefinition();
 		bd1.setBeanClass(GenericHolderFactoryBean.class);
-		bd1.setTargetType(ResolvableType.forClassWithGenerics(FactoryBean.class, ResolvableType.forClassWithGenerics(GenericHolder.class, String.class)));
+		bd1.setTargetType(ResolvableType.forClassWithGenerics(FactoryBean.class, ResolvableType.forClassWithGenerics(GenericHolder.class, Object.class)));
 		bd1.setLazyInit(true);
 		context.registerBeanDefinition("fb1", bd1);
 		RootBeanDefinition bd2 = new RootBeanDefinition();
@@ -435,17 +433,13 @@ class AnnotationConfigApplicationContextTests {
 		bd2.setTargetType(ResolvableType.forClassWithGenerics(FactoryBean.class, ResolvableType.forClassWithGenerics(GenericHolder.class, Integer.class)));
 		bd2.setLazyInit(true);
 		context.registerBeanDefinition("fb2", bd2);
-		RootBeanDefinition bd3 = new RootBeanDefinition(FactoryBeanInjectionPoints.class);
-		bd3.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
-		context.registerBeanDefinition("ip", bd3);
+		context.registerBeanDefinition("ip", new RootBeanDefinition(FactoryResultInjectionPoint.class));
 		context.refresh();

-		assertThat(context.getBean("ip", FactoryResultInjectionPoint.class).factoryResult).isSameAs(context.getBean("fb1"));
-		assertThat(context.getBean("ip", FactoryResultInjectionPoint.class).factoryResult).isSameAs(context.getBean("fb1"));
 		assertThat(context.getType("&fb1")).isEqualTo(GenericHolderFactoryBean.class);
 		assertThat(context.getType("fb1")).isEqualTo(GenericHolder.class);
 		assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(2);
-		assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(2);
+		assertThat(context.getBean("ip", FactoryResultInjectionPoint.class).factoryResult).isSameAs(context.getBean("fb1"));
 	}

 	@Test
@@ -459,17 +453,14 @@ class AnnotationConfigApplicationContextTests {
 		bd2.setBeanClass(UntypedFactoryBean.class);
 		bd2.setTargetType(ResolvableType.forClassWithGenerics(GenericHolder.class, Integer.class));
 		context.registerBeanDefinition("fb2", bd2);
-		RootBeanDefinition bd3 = new RootBeanDefinition(FactoryResultInjectionPoint.class);
-		bd3.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
-		context.registerBeanDefinition("ip", bd3);
+		context.registerBeanDefinition("ip", new RootBeanDefinition(FactoryResultInjectionPoint.class));
 		context.refresh();

-		assertThat(context.getBean("ip", FactoryResultInjectionPoint.class).factoryResult).isSameAs(context.getBean("fb1"));
-		assertThat(context.getBean("ip", FactoryResultInjectionPoint.class).factoryResult).isSameAs(context.getBean("fb1"));
 		assertThat(context.getType("&fb1")).isEqualTo(GenericHolderFactoryBean.class);
 		assertThat(context.getType("fb1")).isEqualTo(GenericHolder.class);
 		assertThat(context.getBeanNamesForType(FactoryBean.class)).hasSize(2);
 		assertThat(context.getBeanNamesForType(GenericHolderFactoryBean.class)).hasSize(1);
+		assertThat(context.getBean("ip", FactoryResultInjectionPoint.class).factoryResult).isSameAs(context.getBean("fb1"));
 	}

 	@Test
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -268,7 +268,6 @@ public class ClassPathBeanDefinitionScannerTests {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setIncludeAnnotationConfig(false);
 		scanner.scan("org.springframework.context.annotation2");
-
 		assertThatIllegalStateException().isThrownBy(() -> scanner.scan(BASE_PACKAGE))
 				.withMessageContaining("myNamedDao")
 				.withMessageContaining(NamedStubDao.class.getName())
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -99,8 +99,8 @@ class ConfigurationClassPostProcessorAotContributionTests {
 				initializer.accept(freshBeanFactory);
 				freshContext.refresh();
 				assertThat(freshBeanFactory.getBeanPostProcessors()).filteredOn(ImportAwareAotBeanPostProcessor.class::isInstance)
-						.singleElement().satisfies(postProcessor ->
-								assertPostProcessorEntry(postProcessor, ImportAwareConfiguration.class, ImportConfiguration.class));
+						.singleElement().satisfies(postProcessor -> assertPostProcessorEntry(postProcessor, ImportAwareConfiguration.class,
+								ImportConfiguration.class));
 				freshContext.close();
 			});
 		}
@@ -117,8 +117,8 @@ class ConfigurationClassPostProcessorAotContributionTests {
 				freshContext.refresh();
 				TestAwareCallbackBean bean = freshContext.getBean(TestAwareCallbackBean.class);
 				assertThat(bean.instances).hasSize(2);
-				assertThat(bean.instances).element(0).isEqualTo(freshContext);
-				assertThat(bean.instances).element(1).isInstanceOfSatisfying(AnnotationMetadata.class, metadata ->
+				assertThat(bean.instances.get(0)).isEqualTo(freshContext);
+				assertThat(bean.instances.get(1)).isInstanceOfSatisfying(AnnotationMetadata.class, metadata ->
 						assertThat(metadata.getClassName()).isEqualTo(TestAwareCallbackConfiguration.class.getName()));
 				freshContext.close();
 			});
@@ -236,14 +236,13 @@ class ConfigurationClassPostProcessorAotContributionTests {
 			}

 			@Override
-			public void afterPropertiesSet() {
+			public void afterPropertiesSet() throws Exception {
 				Assert.notNull(this.metadata, "Metadata was not injected");
 			}

 		}
 	}

-
 	@Nested
 	class PropertySourceTests {

@@ -363,8 +362,8 @@ class ConfigurationClassPostProcessorAotContributionTests {
 		static class PropertySourceWithCustomFactoryConfiguration {

 		}
-	}

+	}

 	@Nested
 	class ConfigurationClassProxyTests {
@@ -385,13 +384,14 @@ class ConfigurationClassPostProcessorAotContributionTests {
 					getRegisteredBean(CglibConfiguration.class))).isNotNull();
 		}

+
 		private RegisteredBean getRegisteredBean(Class<?> bean) {
 			this.beanFactory.registerBeanDefinition("test", new RootBeanDefinition(bean));
 			this.processor.postProcessBeanFactory(this.beanFactory);
 			return RegisteredBean.of(this.beanFactory, "test");
 		}
-	}

+	}

 	@Nullable
 	private BeanFactoryInitializationAotContribution getContribution(Class<?>... types) {
@@ -410,8 +410,8 @@ class ConfigurationClassPostProcessorAotContributionTests {
 				.containsExactly(entry(key.getName(), value.getName()));
 	}

-
 	static class CustomPropertySourcesFactory extends DefaultPropertySourceFactory {
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,8 +35,6 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.ObjectProvider;
@@ -323,8 +321,8 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.setEnvironment(new StandardEnvironment());
 		pp.postProcessBeanFactory(beanFactory);
-		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
-				.isThrownBy(() -> beanFactory.getBean(SimpleComponent.class));
+		assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() ->
+				beanFactory.getBean(SimpleComponent.class));
 	}

 	@Test
@@ -374,11 +372,11 @@ class ConfigurationClassPostProcessorTests {
 		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(SingletonBeanConfig.class));
 		beanFactory.setAllowBeanDefinitionOverriding(false);
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
-		assertThatExceptionOfType(BeanDefinitionStoreException.class)
-				.isThrownBy(() -> pp.postProcessBeanFactory(beanFactory))
-				.withMessageContaining("bar")
-				.withMessageContaining("SingletonBeanConfig")
-				.withMessageContaining(TestBean.class.getName());
+		assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() ->
+				pp.postProcessBeanFactory(beanFactory))
+			.withMessageContaining("bar")
+			.withMessageContaining("SingletonBeanConfig")
+			.withMessageContaining(TestBean.class.getName());
 	}

 	@Test  // gh-25430
@@ -431,12 +429,12 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);

-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> beanFactory.getBean(Bar.class))
-				.withMessageContaining("OverridingSingletonBeanConfig.foo")
-				.withMessageContaining(ExtendedFoo.class.getName())
-				.withMessageContaining(Foo.class.getName())
-				.withMessageContaining("InvalidOverridingSingletonBeanConfig");
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
+				beanFactory.getBean(Bar.class))
+			.withMessageContaining("OverridingSingletonBeanConfig.foo")
+			.withMessageContaining(ExtendedFoo.class.getName())
+			.withMessageContaining(Foo.class.getName())
+			.withMessageContaining("InvalidOverridingSingletonBeanConfig");
 	}

 	@Test  // SPR-15384
@@ -946,8 +944,8 @@ class ConfigurationClassPostProcessorTests {
 		beanFactory.registerBeanDefinition("configClass", new RootBeanDefinition(ConcreteConfig.class));
 		beanFactory.registerBeanDefinition("serviceBeanProvider", new RootBeanDefinition(ServiceBeanProvider.class));
 		new ConfigurationClassPostProcessor().postProcessBeanFactory(beanFactory);
-
 		beanFactory.preInstantiateSingletons();
+
 		beanFactory.getBean(ServiceBean.class);
 	}

@@ -960,8 +958,8 @@ class ConfigurationClassPostProcessorTests {
 		beanFactory.registerBeanDefinition("configClass", new RootBeanDefinition(ConcreteConfigWithDefaultMethods.class));
 		beanFactory.registerBeanDefinition("serviceBeanProvider", new RootBeanDefinition(ServiceBeanProvider.class));
 		new ConfigurationClassPostProcessor().postProcessBeanFactory(beanFactory);
-
 		beanFactory.preInstantiateSingletons();
+
 		beanFactory.getBean(ServiceBean.class);
 	}

@@ -974,25 +972,11 @@ class ConfigurationClassPostProcessorTests {
 		beanFactory.registerBeanDefinition("configClass", new RootBeanDefinition(ConcreteConfigWithDefaultMethods.class.getName()));
 		beanFactory.registerBeanDefinition("serviceBeanProvider", new RootBeanDefinition(ServiceBeanProvider.class.getName()));
 		new ConfigurationClassPostProcessor().postProcessBeanFactory(beanFactory);
-
 		beanFactory.preInstantiateSingletons();
+
 		beanFactory.getBean(ServiceBean.class);
 	}

-	@Test
-	void testConfigWithFailingInit() {  // gh-23343
-		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
-		bpp.setBeanFactory(beanFactory);
-		beanFactory.addBeanPostProcessor(bpp);
-		beanFactory.addBeanPostProcessor(new CommonAnnotationBeanPostProcessor());
-		beanFactory.registerBeanDefinition("configClass", new RootBeanDefinition(ConcreteConfigWithFailingInit.class));
-		new ConfigurationClassPostProcessor().postProcessBeanFactory(beanFactory);
-
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(beanFactory::preInstantiateSingletons);
-		assertThat(beanFactory.containsSingleton("configClass")).isFalse();
-		assertThat(beanFactory.containsSingleton("provider")).isFalse();
-	}
-
 	@Test
 	void testCircularDependency() {
 		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
@@ -1001,17 +985,16 @@ class ConfigurationClassPostProcessorTests {
 		beanFactory.registerBeanDefinition("configClass1", new RootBeanDefinition(A.class));
 		beanFactory.registerBeanDefinition("configClass2", new RootBeanDefinition(AStrich.class));
 		new ConfigurationClassPostProcessor().postProcessBeanFactory(beanFactory);
-
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(beanFactory::preInstantiateSingletons)
-				.withMessageContaining("Circular reference");
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+				beanFactory::preInstantiateSingletons)
+			.withMessageContaining("Circular reference");
 	}

 	@Test
 	void testCircularDependencyWithApplicationContext() {
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> new AnnotationConfigApplicationContext(A.class, AStrich.class))
-				.withMessageContaining("Circular reference");
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
+				new AnnotationConfigApplicationContext(A.class, AStrich.class))
+			.withMessageContaining("Circular reference");
 	}

 	@Test
@@ -1065,7 +1048,9 @@ class ConfigurationClassPostProcessorTests {
 	void testCollectionArgumentOnBeanMethod() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(CollectionArgumentConfiguration.class, TestBean.class);
 		CollectionArgumentConfiguration bean = ctx.getBean(CollectionArgumentConfiguration.class);
-		assertThat(bean.testBeans).containsExactly(ctx.getBean(TestBean.class));
+		assertThat(bean.testBeans).isNotNull();
+		assertThat(bean.testBeans).hasSize(1);
+		assertThat(bean.testBeans.get(0)).isSameAs(ctx.getBean(TestBean.class));
 		ctx.close();
 	}

@@ -1073,7 +1058,8 @@ class ConfigurationClassPostProcessorTests {
 	void testEmptyCollectionArgumentOnBeanMethod() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(CollectionArgumentConfiguration.class);
 		CollectionArgumentConfiguration bean = ctx.getBean(CollectionArgumentConfiguration.class);
-		assertThat(bean.testBeans).isEmpty();
+		assertThat(bean.testBeans).isNotNull();
+		assertThat(bean.testBeans.isEmpty()).isTrue();
 		ctx.close();
 	}

@@ -1081,7 +1067,9 @@ class ConfigurationClassPostProcessorTests {
 	void testMapArgumentOnBeanMethod() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MapArgumentConfiguration.class, DummyRunnable.class);
 		MapArgumentConfiguration bean = ctx.getBean(MapArgumentConfiguration.class);
-		assertThat(bean.testBeans).hasSize(1).containsValue(ctx.getBean(Runnable.class));
+		assertThat(bean.testBeans).isNotNull();
+		assertThat(bean.testBeans).hasSize(1);
+		assertThat(bean.testBeans.values().iterator().next()).isSameAs(ctx.getBean(Runnable.class));
 		ctx.close();
 	}

@@ -1089,7 +1077,8 @@ class ConfigurationClassPostProcessorTests {
 	void testEmptyMapArgumentOnBeanMethod() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MapArgumentConfiguration.class);
 		MapArgumentConfiguration bean = ctx.getBean(MapArgumentConfiguration.class);
-		assertThat(bean.testBeans).isEmpty();
+		assertThat(bean.testBeans).isNotNull();
+		assertThat(bean.testBeans.isEmpty()).isTrue();
 		ctx.close();
 	}

@@ -1097,7 +1086,9 @@ class ConfigurationClassPostProcessorTests {
 	void testCollectionInjectionFromSameConfigurationClass() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(CollectionInjectionConfiguration.class);
 		CollectionInjectionConfiguration bean = ctx.getBean(CollectionInjectionConfiguration.class);
-		assertThat(bean.testBeans).containsExactly(ctx.getBean(TestBean.class));
+		assertThat(bean.testBeans).isNotNull();
+		assertThat(bean.testBeans).hasSize(1);
+		assertThat(bean.testBeans.get(0)).isSameAs(ctx.getBean(TestBean.class));
 		ctx.close();
 	}

@@ -1105,21 +1096,25 @@ class ConfigurationClassPostProcessorTests {
 	void testMapInjectionFromSameConfigurationClass() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MapInjectionConfiguration.class);
 		MapInjectionConfiguration bean = ctx.getBean(MapInjectionConfiguration.class);
-		assertThat(bean.testBeans).containsOnly(Map.entry("testBean", ctx.getBean(Runnable.class)));
+		assertThat(bean.testBeans).isNotNull();
+		assertThat(bean.testBeans).hasSize(1);
+		assertThat(bean.testBeans.get("testBean")).isSameAs(ctx.getBean(Runnable.class));
 		ctx.close();
 	}

 	@Test
 	void testBeanLookupFromSameConfigurationClass() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(BeanLookupConfiguration.class);
-		assertThat(ctx.getBean(BeanLookupConfiguration.class).getTestBean()).isSameAs(ctx.getBean(TestBean.class));
+		BeanLookupConfiguration bean = ctx.getBean(BeanLookupConfiguration.class);
+		assertThat(bean.getTestBean()).isNotNull();
+		assertThat(bean.getTestBean()).isSameAs(ctx.getBean(TestBean.class));
 		ctx.close();
 	}

 	@Test
 	void testNameClashBetweenConfigurationClassAndBean() {
 		assertThatExceptionOfType(BeanDefinitionStoreException.class)
-				.isThrownBy(() -> new AnnotationConfigApplicationContext(MyTestBean.class).getBean("myTestBean", TestBean.class));
+			.isThrownBy(() -> new AnnotationConfigApplicationContext(MyTestBean.class).getBean("myTestBean", TestBean.class));
 	}

 	@Test
@@ -1136,11 +1131,11 @@ class ConfigurationClassPostProcessorTests {
 	@Order(1)
 	static class SingletonBeanConfig {

-		@Bean public Foo foo() {
+		public @Bean Foo foo() {
 			return new Foo();
 		}

-		@Bean public Bar bar() {
+		public @Bean Bar bar() {
 			return new Bar(foo());
 		}
 	}
@@ -1148,11 +1143,11 @@ class ConfigurationClassPostProcessorTests {
 	@Configuration(proxyBeanMethods = false)
 	static class NonEnhancedSingletonBeanConfig {

-		@Bean public Foo foo() {
+		public @Bean Foo foo() {
 			return new Foo();
 		}

-		@Bean public Bar bar() {
+		public @Bean Bar bar() {
 			return new Bar(foo());
 		}
 	}
@@ -1160,13 +1155,11 @@ class ConfigurationClassPostProcessorTests {
 	@Configuration
 	static class StaticSingletonBeanConfig {

-		@Bean
-		public static Foo foo() {
+		public static @Bean Foo foo() {
 			return new Foo();
 		}

-		@Bean
-		public static Bar bar() {
+		public static @Bean Bar bar() {
 			return new Bar(foo());
 		}
 	}
@@ -1175,11 +1168,11 @@ class ConfigurationClassPostProcessorTests {
 	@Order(2)
 	static class OverridingSingletonBeanConfig {

-		@Bean public ExtendedFoo foo() {
+		public @Bean ExtendedFoo foo() {
 			return new ExtendedFoo();
 		}

-		@Bean public Bar bar() {
+		public @Bean Bar bar() {
 			return new Bar(foo());
 		}
 	}
@@ -1187,7 +1180,7 @@ class ConfigurationClassPostProcessorTests {
 	@Configuration
 	static class OverridingAgainSingletonBeanConfig {

-		@Bean public ExtendedAgainFoo foo() {
+		public @Bean ExtendedAgainFoo foo() {
 			return new ExtendedAgainFoo();
 		}
 	}
@@ -1195,7 +1188,7 @@ class ConfigurationClassPostProcessorTests {
 	@Configuration
 	static class InvalidOverridingSingletonBeanConfig {

-		@Bean public Foo foo() {
+		public @Bean Foo foo() {
 			return new Foo();
 		}
 	}
@@ -1207,11 +1200,11 @@ class ConfigurationClassPostProcessorTests {
 		@Order(1)
 		static class SingletonBeanConfig {

-			@Bean public Foo foo() {
+			public @Bean Foo foo() {
 				return new Foo();
 			}

-			@Bean public Bar bar() {
+			public @Bean Bar bar() {
 				return new Bar(foo());
 			}
 		}
@@ -1220,11 +1213,11 @@ class ConfigurationClassPostProcessorTests {
 		@Order(2)
 		static class OverridingSingletonBeanConfig {

-			@Bean public ExtendedFoo foo() {
+			public @Bean ExtendedFoo foo() {
 				return new ExtendedFoo();
 			}

-			@Bean public Bar bar() {
+			public @Bean Bar bar() {
 				return new Bar(foo());
 			}
 		}
@@ -1240,11 +1233,11 @@ class ConfigurationClassPostProcessorTests {
 			public SingletonBeanConfig(ConfigWithOrderedInnerClasses other) {
 			}

-			@Bean public Foo foo() {
+			public @Bean Foo foo() {
 				return new Foo();
 			}

-			@Bean public Bar bar() {
+			public @Bean Bar bar() {
 				return new Bar(foo());
 			}
 		}
@@ -1257,11 +1250,11 @@ class ConfigurationClassPostProcessorTests {
 				other.getObject();
 			}

-			@Bean public ExtendedFoo foo() {
+			public @Bean ExtendedFoo foo() {
 				return new ExtendedFoo();
 			}

-			@Bean public Bar bar() {
+			public @Bean Bar bar() {
 				return new Bar(foo());
 			}
 		}
@@ -1288,7 +1281,7 @@ class ConfigurationClassPostProcessorTests {
 	@Configuration
 	static class UnloadedConfig {

-		@Bean public Foo foo() {
+		public @Bean Foo foo() {
 			return new Foo();
 		}
 	}
@@ -1296,7 +1289,7 @@ class ConfigurationClassPostProcessorTests {
 	@Configuration
 	static class LoadedConfig {

-		@Bean public Bar bar() {
+		public @Bean Bar bar() {
 			return new Bar(new Foo());
 		}
 	}
@@ -1605,7 +1598,7 @@ class ConfigurationClassPostProcessorTests {
 	public static class WildcardWithGenericExtendsConfiguration {

 		@Bean
-		public Repository<?> genericRepo() {
+		public Repository<? extends Object> genericRepo() {
 			return new Repository<String>();
 		}

@@ -1714,7 +1707,7 @@ class ConfigurationClassPostProcessorTests {
 	}

 	@Configuration
-	public abstract static class AbstractConfig {
+	public static abstract class AbstractConfig {

 		@Bean
 		public ServiceBean serviceBean() {
@@ -1765,6 +1758,7 @@ class ConfigurationClassPostProcessorTests {
 	}

 	public interface DefaultMethodsConfig extends BaseDefaultMethods {
+
 	}

 	@Configuration
@@ -1785,29 +1779,6 @@ class ConfigurationClassPostProcessorTests {
 		}
 	}

-	@Configuration
-	public static class ConcreteConfigWithFailingInit implements DefaultMethodsConfig, BeanFactoryAware {
-
-		private BeanFactory beanFactory;
-
-		@Override
-		public void setBeanFactory(BeanFactory beanFactory) {
-			this.beanFactory = beanFactory;
-		}
-
-		@Bean
-		@Override
-		public ServiceBeanProvider provider() {
-			return new ServiceBeanProvider();
-		}
-
-		@PostConstruct
-		public void validate() {
-			beanFactory.getBean("provider");
-			throw new IllegalStateException();
-		}
-	}
-
 	@Primary
 	public static class ServiceBeanProvider {

@@ -1920,7 +1891,7 @@ class ConfigurationClassPostProcessorTests {
 		}
 	}

-	abstract static class FooFactory {
+	static abstract class FooFactory {

 		abstract DependingFoo createFoo(BarArgument bar);
 	}
@@ -2039,7 +2010,7 @@ class ConfigurationClassPostProcessorTests {
 	}

 	@Configuration
-	abstract static class BeanLookupConfiguration {
+	static abstract class BeanLookupConfiguration {

 		@Bean
 		public TestBean thing() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,9 +29,7 @@ import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.type.AnnotationMetadata;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,62 +39,51 @@ import static org.assertj.core.api.Assertions.assertThat;
 * {@link FactoryBean FactoryBeans} defined in the configuration.
 *
 * @author Phillip Webb
- * @author Juergen Hoeller
 */
-class ConfigurationWithFactoryBeanEarlyDeductionTests {
+public class ConfigurationWithFactoryBeanBeanEarlyDeductionTests {

 	@Test
-	void preFreezeDirect() {
+	public void preFreezeDirect() {
 		assertPreFreeze(DirectConfiguration.class);
 	}

 	@Test
-	void postFreezeDirect() {
+	public void postFreezeDirect() {
 		assertPostFreeze(DirectConfiguration.class);
 	}

 	@Test
-	void preFreezeGenericMethod() {
+	public void preFreezeGenericMethod() {
 		assertPreFreeze(GenericMethodConfiguration.class);
 	}

 	@Test
-	void postFreezeGenericMethod() {
+	public void postFreezeGenericMethod() {
 		assertPostFreeze(GenericMethodConfiguration.class);
 	}

 	@Test
-	void preFreezeGenericClass() {
+	public void preFreezeGenericClass() {
 		assertPreFreeze(GenericClassConfiguration.class);
 	}

 	@Test
-	void postFreezeGenericClass() {
+	public void postFreezeGenericClass() {
 		assertPostFreeze(GenericClassConfiguration.class);
 	}

 	@Test
-	void preFreezeAttribute() {
+	public void preFreezeAttribute() {
 		assertPreFreeze(AttributeClassConfiguration.class);
 	}

 	@Test
-	void postFreezeAttribute() {
+	public void postFreezeAttribute() {
 		assertPostFreeze(AttributeClassConfiguration.class);
 	}

 	@Test
-	void preFreezeTargetType() {
-		assertPreFreeze(TargetTypeConfiguration.class);
-	}
-
-	@Test
-	void postFreezeTargetType() {
-		assertPostFreeze(TargetTypeConfiguration.class);
-	}
-
-	@Test
-	void preFreezeUnresolvedGenericFactoryBean() {
+	public void preFreezeUnresolvedGenericFactoryBean() {
 		// Covers the case where a @Configuration is picked up via component scanning
 		// and its bean definition only has a String bean class. In such cases
 		// beanDefinition.hasBeanClass() returns false so we need to actually
@@ -118,13 +105,14 @@ class ConfigurationWithFactoryBeanEarlyDeductionTests {
 		}
 	}

-
 	private void assertPostFreeze(Class<?> configurationClass) {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configurationClass);
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				configurationClass);
 		assertContainsMyBeanName(context);
 	}

-	private void assertPreFreeze(Class<?> configurationClass, BeanFactoryPostProcessor... postProcessors) {
+	private void assertPreFreeze(Class<?> configurationClass,
+			BeanFactoryPostProcessor... postProcessors) {
 		NameCollectingBeanFactoryPostProcessor postProcessor = new NameCollectingBeanFactoryPostProcessor();
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		try (context) {
@@ -144,38 +132,41 @@ class ConfigurationWithFactoryBeanEarlyDeductionTests {
 		assertThat(names).containsExactly("myBean");
 	}

-
-	private static class NameCollectingBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
+	private static class NameCollectingBeanFactoryPostProcessor
+			implements BeanFactoryPostProcessor {

 		private String[] names;

 		@Override
-		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-			ResolvableType typeToMatch = ResolvableType.forClassWithGenerics(MyBean.class, String.class);
-			this.names = beanFactory.getBeanNamesForType(typeToMatch, true, false);
+		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
+				throws BeansException {
+			this.names = beanFactory.getBeanNamesForType(MyBean.class, true, false);
 		}

 		public String[] getNames() {
 			return this.names;
 		}
+
 	}

 	@Configuration
 	static class DirectConfiguration {

 		@Bean
-		MyBean<String> myBean() {
-			return new MyBean<>();
+		MyBean myBean() {
+			return new MyBean();
 		}
+
 	}

 	@Configuration
 	static class GenericMethodConfiguration {

 		@Bean
-		FactoryBean<MyBean<String>> myBean() {
-			return new TestFactoryBean<>(new MyBean<>());
+		FactoryBean<MyBean> myBean() {
+			return new TestFactoryBean<>(new MyBean());
 		}
+
 	}

 	@Configuration
@@ -185,11 +176,13 @@ class ConfigurationWithFactoryBeanEarlyDeductionTests {
 		MyFactoryBean myBean() {
 			return new MyFactoryBean();
 		}
+
 	}

 	@Configuration
 	@Import(AttributeClassRegistrar.class)
 	static class AttributeClassConfiguration {
+
 	}

 	static class AttributeClassRegistrar implements ImportBeanDefinitionRegistrar {
@@ -198,32 +191,16 @@ class ConfigurationWithFactoryBeanEarlyDeductionTests {
 		public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 			BeanDefinition definition = BeanDefinitionBuilder.genericBeanDefinition(
 					RawWithAbstractObjectTypeFactoryBean.class).getBeanDefinition();
-			definition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE,
-					ResolvableType.forClassWithGenerics(MyBean.class, String.class));
+			definition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, MyBean.class);
 			registry.registerBeanDefinition("myBean", definition);
 		}
-	}

-	@Configuration
-	@Import(TargetTypeRegistrar.class)
-	static class TargetTypeConfiguration {
-	}
-
-	static class TargetTypeRegistrar implements ImportBeanDefinitionRegistrar {
-
-		@Override
-		public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-			RootBeanDefinition definition = new RootBeanDefinition(RawWithAbstractObjectTypeFactoryBean.class);
-			definition.setTargetType(ResolvableType.forClassWithGenerics(FactoryBean.class,
-					ResolvableType.forClassWithGenerics(MyBean.class, String.class)));
-			registry.registerBeanDefinition("myBean", definition);
-		}
 	}

 	abstract static class AbstractMyBean {
 	}

-	static class MyBean<T> extends AbstractMyBean {
+	static class MyBean extends AbstractMyBean {
 	}

 	static class TestFactoryBean<T> implements FactoryBean<T> {
@@ -235,7 +212,7 @@ class ConfigurationWithFactoryBeanEarlyDeductionTests {
 		}

 		@Override
-		public T getObject() {
+		public T getObject() throws Exception {
 			return this.instance;
 		}

@@ -243,26 +220,31 @@ class ConfigurationWithFactoryBeanEarlyDeductionTests {
 		public Class<?> getObjectType() {
 			return this.instance.getClass();
 		}
+
 	}

-	static class MyFactoryBean extends TestFactoryBean<MyBean<String>> {
+	static class MyFactoryBean extends TestFactoryBean<MyBean> {

 		public MyFactoryBean() {
-			super(new MyBean<>());
+			super(new MyBean());
 		}
+
 	}

 	static class RawWithAbstractObjectTypeFactoryBean implements FactoryBean<Object> {

+		private final Object object = new MyBean();
+
 		@Override
 		public Object getObject() throws Exception {
-			throw new IllegalStateException();
+			return object;
 		}

 		@Override
 		public Class<?> getObjectType() {
 			return MyBean.class;
 		}
+
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -204,7 +204,7 @@ class ConfigurationClassProcessingTests {
 		BeanFactory factory = initBeanFactory(ConfigWithNullReference.class);

 		TestBean foo = factory.getBean("foo", TestBean.class);
-		assertThat(factory.getBean("bar")).isEqualTo(null);
+		assertThat(factory.getBean("bar").equals(null)).isTrue();
 		assertThat(foo.getSpouse()).isNull();
 	}

@@ -426,7 +426,7 @@ class ConfigurationClassProcessingTests {
 	@Configuration
 	static class ConfigWithFinalBean {

-		@Bean public final TestBean testBean() {
+		public final @Bean TestBean testBean() {
 			return new TestBean();
 		}
 	}
@@ -435,7 +435,7 @@ class ConfigurationClassProcessingTests {
 	@Configuration
 	static class SimplestPossibleConfig {

-		@Bean public String stringBean() {
+		public @Bean String stringBean() {
 			return "foo";
 		}
 	}
@@ -444,11 +444,11 @@ class ConfigurationClassProcessingTests {
 	@Configuration
 	static class ConfigWithNonSpecificReturnTypes {

-		@Bean public Object stringBean() {
+		public @Bean Object stringBean() {
 			return "foo";
 		}

-		@Bean public FactoryBean<?> factoryBean() {
+		public @Bean FactoryBean<?> factoryBean() {
 			ListFactoryBean fb = new ListFactoryBean();
 			fb.setSourceList(Arrays.asList("element1", "element2"));
 			return fb;
@@ -459,13 +459,13 @@ class ConfigurationClassProcessingTests {
 	@Configuration
 	static class ConfigWithPrototypeBean {

-		@Bean public TestBean foo() {
+		public @Bean TestBean foo() {
 			TestBean foo = new SpousyTestBean("foo");
 			foo.setSpouse(bar());
 			return foo;
 		}

-		@Bean public TestBean bar() {
+		public @Bean TestBean bar() {
 			TestBean bar = new SpousyTestBean("bar");
 			bar.setSpouse(baz());
 			return bar;
@@ -605,15 +605,15 @@ class ConfigurationClassProcessingTests {
 		void register(GenericApplicationContext ctx) {
 			ctx.registerBean("spouse", TestBean.class,
 					() -> new TestBean("functional"));
-			Supplier<TestBean> testBeanSupplier =
-					() -> new TestBean(ctx.getBean("spouse", TestBean.class));
-			ctx.registerBean(TestBean.class, testBeanSupplier,
+			Supplier<TestBean> testBeanSupplier = () -> new TestBean(ctx.getBean("spouse", TestBean.class));
+			ctx.registerBean(TestBean.class,
+					testBeanSupplier,
 					bd -> bd.setPrimary(true));
 		}

 		@Bean
-		public NestedTestBean nestedTestBean(TestBean spouse) {
-			return new NestedTestBean(spouse.getSpouse().getName());
+		public NestedTestBean nestedTestBean(TestBean testBean) {
+			return new NestedTestBean(testBean.getSpouse().getName());
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,83 +35,75 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 *
 * @author Keith Donald
 * @author Phillip Webb
- * @author Juergen Hoeller
 */
-class DateFormatterTests {
+public class DateFormatterTests {

 	private static final TimeZone UTC = TimeZone.getTimeZone("UTC");


 	@Test
-	void shouldPrintAndParseDefault() throws Exception {
+	public void shouldPrintAndParseDefault() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
-
 		Date date = getDate(2009, Calendar.JUNE, 1);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("Jun 1, 2009");
 		assertThat(formatter.parse("Jun 1, 2009", Locale.US)).isEqualTo(date);
 	}

 	@Test
-	void shouldPrintAndParseFromPattern() throws ParseException {
+	public void shouldPrintAndParseFromPattern() throws ParseException {
 		DateFormatter formatter = new DateFormatter("yyyy-MM-dd");
 		formatter.setTimeZone(UTC);
-
 		Date date = getDate(2009, Calendar.JUNE, 1);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("2009-06-01");
 		assertThat(formatter.parse("2009-06-01", Locale.US)).isEqualTo(date);
 	}

 	@Test
-	void shouldPrintAndParseShort() throws Exception {
+	public void shouldPrintAndParseShort() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setStyle(DateFormat.SHORT);
-
 		Date date = getDate(2009, Calendar.JUNE, 1);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("6/1/09");
 		assertThat(formatter.parse("6/1/09", Locale.US)).isEqualTo(date);
 	}

 	@Test
-	void shouldPrintAndParseMedium() throws Exception {
+	public void shouldPrintAndParseMedium() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setStyle(DateFormat.MEDIUM);
-
 		Date date = getDate(2009, Calendar.JUNE, 1);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("Jun 1, 2009");
 		assertThat(formatter.parse("Jun 1, 2009", Locale.US)).isEqualTo(date);
 	}

 	@Test
-	void shouldPrintAndParseLong() throws Exception {
+	public void shouldPrintAndParseLong() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setStyle(DateFormat.LONG);
-
 		Date date = getDate(2009, Calendar.JUNE, 1);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("June 1, 2009");
 		assertThat(formatter.parse("June 1, 2009", Locale.US)).isEqualTo(date);
 	}

 	@Test
-	void shouldPrintAndParseFull() throws Exception {
+	public void shouldPrintAndParseFull() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setStyle(DateFormat.FULL);
-
 		Date date = getDate(2009, Calendar.JUNE, 1);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("Monday, June 1, 2009");
 		assertThat(formatter.parse("Monday, June 1, 2009", Locale.US)).isEqualTo(date);
 	}

 	@Test
-	void shouldPrintAndParseIsoDate() throws Exception {
+	public void shouldPrintAndParseISODate() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setIso(ISO.DATE);
-
 		Date date = getDate(2009, Calendar.JUNE, 1, 14, 23, 5, 3);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("2009-06-01");
 		assertThat(formatter.parse("2009-6-01", Locale.US))
@@ -119,56 +111,45 @@ class DateFormatterTests {
 	}

 	@Test
-	void shouldPrintAndParseIsoTime() throws Exception {
+	public void shouldPrintAndParseISOTime() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setIso(ISO.TIME);
-
 		Date date = getDate(2009, Calendar.JANUARY, 1, 14, 23, 5, 3);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("14:23:05.003Z");
 		assertThat(formatter.parse("14:23:05.003Z", Locale.US))
 				.isEqualTo(getDate(1970, Calendar.JANUARY, 1, 14, 23, 5, 3));
-
-		date = getDate(2009, Calendar.JANUARY, 1, 14, 23, 5, 0);
-		assertThat(formatter.print(date, Locale.US)).isEqualTo("14:23:05.000Z");
-		assertThat(formatter.parse("14:23:05Z", Locale.US))
-				.isEqualTo(getDate(1970, Calendar.JANUARY, 1, 14, 23, 5, 0).toInstant());
 	}

 	@Test
-	void shouldPrintAndParseIsoDateTime() throws Exception {
+	public void shouldPrintAndParseISODateTime() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setIso(ISO.DATE_TIME);
-
 		Date date = getDate(2009, Calendar.JUNE, 1, 14, 23, 5, 3);
 		assertThat(formatter.print(date, Locale.US)).isEqualTo("2009-06-01T14:23:05.003Z");
 		assertThat(formatter.parse("2009-06-01T14:23:05.003Z", Locale.US)).isEqualTo(date);
-
-		date = getDate(2009, Calendar.JUNE, 1, 14, 23, 5, 0);
-		assertThat(formatter.print(date, Locale.US)).isEqualTo("2009-06-01T14:23:05.000Z");
-		assertThat(formatter.parse("2009-06-01T14:23:05Z", Locale.US)).isEqualTo(date.toInstant());
 	}

 	@Test
-	void shouldThrowOnUnsupportedStylePattern() {
+	public void shouldThrowOnUnsupportedStylePattern() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setStylePattern("OO");
-
-		assertThatIllegalStateException().isThrownBy(() -> formatter.parse("2009", Locale.US))
-				.withMessageContaining("Unsupported style pattern 'OO'");
+		assertThatIllegalStateException().isThrownBy(() ->
+				formatter.parse("2009", Locale.US))
+			.withMessageContaining("Unsupported style pattern 'OO'");
 	}

 	@Test
-	void shouldUseCorrectOrder() {
+	public void shouldUseCorrectOrder() throws Exception {
 		DateFormatter formatter = new DateFormatter();
 		formatter.setTimeZone(UTC);
 		formatter.setStyle(DateFormat.SHORT);
 		formatter.setStylePattern("L-");
 		formatter.setIso(ISO.DATE_TIME);
 		formatter.setPattern("yyyy");
-
 		Date date = getDate(2009, Calendar.JUNE, 1, 14, 23, 5, 3);
+
 		assertThat(formatter.print(date, Locale.US)).as("uses pattern").isEqualTo("2009");

 		formatter.setPattern("");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Juergen Hoeller
 * @author Sam Brannen
 */
-class DateFormattingTests {
+public class DateFormattingTests {

 	private final FormattingConversionService conversionService = new FormattingConversionService();

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -274,7 +274,9 @@ class DateTimeFormattingTests {
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isZero();
 		String value = binder.getBindingResult().getFieldValue("localDateTime").toString();
-		assertThat(value).startsWith("10/31/09").endsWith("12:00 PM");
+		assertThat(value)
+				.startsWith("10/31/09")
+				.endsWith("12:00 PM");
 	}

 	@Test
@@ -284,7 +286,9 @@ class DateTimeFormattingTests {
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isZero();
 		String value = binder.getBindingResult().getFieldValue("localDateTime").toString();
-		assertThat(value).startsWith("10/31/09").endsWith("12:00 PM");
+		assertThat(value)
+				.startsWith("10/31/09")
+				.endsWith("12:00 PM");
 	}

 	@Test
@@ -294,7 +298,9 @@ class DateTimeFormattingTests {
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isZero();
 		String value = binder.getBindingResult().getFieldValue("styleLocalDateTime").toString();
-		assertThat(value).startsWith("Oct 31, 2009").endsWith("12:00:00 PM");
+		assertThat(value)
+				.startsWith("Oct 31, 2009")
+				.endsWith("12:00:00 PM");
 	}

 	@Test
@@ -304,7 +310,9 @@ class DateTimeFormattingTests {
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isZero();
 		String value = binder.getBindingResult().getFieldValue("localDateTime").toString();
-		assertThat(value).startsWith("10/31/09").endsWith("12:00 PM");
+		assertThat(value)
+				.startsWith("10/31/09")
+				.endsWith("12:00 PM");
 	}

 	@Test
@@ -317,7 +325,9 @@ class DateTimeFormattingTests {
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isZero();
 		String value = binder.getBindingResult().getFieldValue("localDateTime").toString();
-		assertThat(value).startsWith("Oct 31, 2009").endsWith("12:00:00 PM");
+		assertThat(value)
+				.startsWith("Oct 31, 2009")
+				.endsWith("12:00:00 PM");
 	}

 	@Test
@@ -502,7 +512,7 @@ class DateTimeFormattingTests {
 	}

 	@Test
-	void testBindYearMonthAnnotatedPattern() {
+	public void testBindYearMonthAnnotatedPattern() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
 		propertyValues.add("yearMonthAnnotatedPattern", "12/2007");
 		binder.bind(propertyValues);
@@ -521,7 +531,7 @@ class DateTimeFormattingTests {
 	}

 	@Test
-	void testBindMonthDayAnnotatedPattern() {
+	public void testBindMonthDayAnnotatedPattern() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
 		propertyValues.add("monthDayAnnotatedPattern", "1/3");
 		binder.bind(propertyValues);
@@ -530,7 +540,6 @@ class DateTimeFormattingTests {
 		assertThat(binder.getBindingResult().getRawFieldValue("monthDayAnnotatedPattern")).isEqualTo(MonthDay.parse("--01-03"));
 	}

-
 	@Nested
 	class FallbackPatternTests {

@@ -622,10 +631,10 @@ class DateTimeFormattingTests {
 		@DateTimeFormat(style = "M-")
 		private LocalDate styleLocalDate;

-		@DateTimeFormat(style = "S-", fallbackPatterns = {"yyyy-MM-dd", "yyyyMMdd", "yyyy.MM.dd"})
+		@DateTimeFormat(style = "S-", fallbackPatterns = { "yyyy-MM-dd", "yyyyMMdd", "yyyy.MM.dd" })
 		private LocalDate styleLocalDateWithFallbackPatterns;

-		@DateTimeFormat(pattern = "yyyy-MM-dd", fallbackPatterns = {"M/d/yy", "yyyyMMdd", "yyyy.MM.dd"})
+		@DateTimeFormat(pattern = "yyyy-MM-dd", fallbackPatterns = { "M/d/yy", "yyyyMMdd", "yyyy.MM.dd" })
 		private LocalDate patternLocalDateWithFallbackPatterns;

 		private LocalTime localTime;
@@ -633,7 +642,7 @@ class DateTimeFormattingTests {
 		@DateTimeFormat(style = "-M")
 		private LocalTime styleLocalTime;

-		@DateTimeFormat(style = "-M", fallbackPatterns = {"HH:mm:ss", "HH:mm"})
+		@DateTimeFormat(style = "-M", fallbackPatterns = { "HH:mm:ss", "HH:mm"})
 		private LocalTime styleLocalTimeWithFallbackPatterns;

 		private LocalDateTime localDateTime;
@@ -653,7 +662,7 @@ class DateTimeFormattingTests {
 		@DateTimeFormat(iso = ISO.DATE_TIME)
 		private LocalDateTime isoLocalDateTime;

-		@DateTimeFormat(iso = ISO.DATE_TIME, fallbackPatterns = {"yyyy-MM-dd HH:mm:ss", "M/d/yy HH:mm"})
+		@DateTimeFormat(iso = ISO.DATE_TIME, fallbackPatterns = { "yyyy-MM-dd HH:mm:ss", "M/d/yy HH:mm"})
 		private LocalDateTime isoLocalDateTimeWithFallbackPatterns;

 		private Instant instant;
@@ -681,6 +690,7 @@ class DateTimeFormattingTests {

 		private final List<DateTimeBean> children = new ArrayList<>();

+
 		public LocalDate getLocalDate() {
 			return this.localDate;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.format.datetime.standard;
 import java.text.ParseException;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.Locale;
 import java.util.Random;
 import java.util.stream.Stream;

@@ -50,12 +49,13 @@ class InstantFormatterTests {

 	private final InstantFormatter instantFormatter = new InstantFormatter();

-
 	@ParameterizedTest
 	@ArgumentsSource(ISOSerializedInstantProvider.class)
 	void should_parse_an_ISO_formatted_string_representation_of_an_Instant(String input) throws ParseException {
 		Instant expected = DateTimeFormatter.ISO_INSTANT.parse(input, Instant::from);
-		Instant actual = instantFormatter.parse(input, Locale.US);
+
+		Instant actual = instantFormatter.parse(input, null);
+
 		assertThat(actual).isEqualTo(expected);
 	}

@@ -63,7 +63,9 @@ class InstantFormatterTests {
 	@ArgumentsSource(RFC1123SerializedInstantProvider.class)
 	void should_parse_an_RFC1123_formatted_string_representation_of_an_Instant(String input) throws ParseException {
 		Instant expected = DateTimeFormatter.RFC_1123_DATE_TIME.parse(input, Instant::from);
-		Instant actual = instantFormatter.parse(input, Locale.US);
+
+		Instant actual = instantFormatter.parse(input, null);
+
 		assertThat(actual).isEqualTo(expected);
 	}

@@ -71,11 +73,12 @@ class InstantFormatterTests {
 	@ArgumentsSource(RandomInstantProvider.class)
 	void should_serialize_an_Instant_using_ISO_format_and_ignoring_Locale(Instant input) {
 		String expected = DateTimeFormatter.ISO_INSTANT.format(input);
-		String actual = instantFormatter.print(input, Locale.US);
+
+		String actual = instantFormatter.print(input, null);
+
 		assertThat(actual).isEqualTo(expected);
 	}

-
 	private static class RandomInstantProvider implements ArgumentsProvider {

 		private static final long DATA_SET_SIZE = 10;
@@ -97,7 +100,6 @@ class InstantFormatterTests {
 		}
 	}

-
 	private static class ISOSerializedInstantProvider extends RandomInstantProvider {

 		@Override
@@ -106,7 +108,6 @@ class InstantFormatterTests {
 		}
 	}

-
 	private static class RFC1123SerializedInstantProvider extends RandomInstantProvider {

 		// RFC-1123 supports only 4-digit years
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.scheduling.concurrent;

 import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RunnableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;

@@ -52,8 +52,8 @@ class ConcurrentTaskExecutorTests extends AbstractSchedulingTaskExecutorTests {
 	@AfterEach
 	void shutdownExecutor() {
 		for (Runnable task : concurrentExecutor.shutdownNow()) {
-			if (task instanceof Future) {
-				((Future<?>) task).cancel(true);
+			if (task instanceof RunnableFuture) {
+				((RunnableFuture<?>) task).cancel(true);
 			}
 		}
 	}
--- a/Show More
+++ b/Show More