Release version 5.2.5.RELEASE

Do not cache multipart MIME types in cache
Prior to this commmit, "mutipart/*" MIME types would be cached by the `MimeTypeUtils` LRU cache. Since those MIME types are likely to have random boundaries in them, they can waste space in the LRU cache. This is not improving things since we're parsing them anyway. This commit skips the caching step for all "multipart" MIME types. Fixes gh-24767
2026-06-08 17:33:33 +00:00 · 2020-03-24 11:33:07 +00:00 · 2020-03-24 10:59:05 +01:00 · 2020-03-24 10:31:57 +01:00 · 2020-03-24 10:08:37 +01:00 · 2020-03-24 00:08:43 +01:00
8006 changed files with 299373 additions and 170204 deletions
@@ -0,0 +1,16 @@
+# Normalize line endings to LF.
+* text eol=lf
+
+# Ensure that line endings for multipart files in spring-web are not modified.
+*.multipart -text
+
+# Ensure that line endings for DOS batch files are not modified.
+*.bat -text
+
+# Ensure the following are treated as binary.
+*.gif   binary
+*.jar   binary
+*.jpeg  binary
+*.jpg   binary
+*.png   binary
+*.vsd   binary
@@ -0,0 +1,17 @@
+<!--
+!!! For Security Vulnerabilities, please go to https://pivotal.io/security !!!
+-->
+**Affects:** \<Spring Framework version>
+
+---
+<!--
+Thanks for taking the time to create an issue. Please read the following:
+
+- Questions should be asked on Stack Overflow.
+- For bugs, specify affected versions and explain what you are trying to do.
+- For enhancements, provide context and describe the problem.
+
+Issue or Pull Request? Create only one, not both. GitHub treats them as the same.
+If unsure, start with an issue, and if you submit a pull request later, the
+issue will be closed as superseded.
+-->
@@ -21,6 +21,9 @@ classes/
 /build
 buildSrc/build
 /spring-*/build
+/spring-core/kotlin-coroutines/build
+/framework-bom/build
+/integration-tests/build
 /src/asciidoc/build
 target/

@@ -1,9 +0,0 @@
-#com.springsource.sts.gradle.core.preferences.GradleImportPreferences
-#Thu Aug  9 11:34:43 CEST 2012
-enableAfterTasks=true
-afterTasks=afterEclipseImport;
-enableDependendencyManagement=false
-enableBeforeTasks=true
-projects=;spring-aop;spring-aspects;spring-beans;spring-context;spring-context-support;spring-core;spring-expression;spring-instrument;spring-instrument-tomcat;spring-jdbc;spring-jms;spring-orm;spring-oxm;spring-struts;spring-test;spring-tx;spring-web;spring-webmvc;spring-webmvc-portlet;
-enableDSLD=false
-beforeTasks=cleanEclipse;eclipse;\:spring-oxm\:compileTestJava;
@@ -1,5 +0,0 @@
-#com.springsource.sts.gradle.core.preferences.GradleProjectPreferences
-#Tue Feb 21 14:38:31 CET 2012
-com.springsource.sts.gradle.classpath.enableSorting=false
-com.springsource.sts.gradle.rootprojectloc=
-com.springsource.sts.gradle.linkedresources=
@@ -1,9 +0,0 @@
-#com.springsource.sts.gradle.core.actions.GradleRefreshPreferences
-#Thu Aug  9 11:34:43 CEST 2012
-enableAfterTasks=true
-afterTasks=afterEclipseImport;
-useHierarchicalNames=false
-enableBeforeTasks=true
-addResourceFilters=false
-enableDSLD=false
-beforeTasks=cleanEclipse;eclipse;\:spring-oxm\:compileTestJava;
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.

 This Code of Conduct is adapted from the
-http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
@@ -7,8 +7,8 @@ First off, thank you for taking the time to contribute! :+1: :tada:
 * [Code of Conduct](#code-of-conduct)
 * [How to Contribute](#how-to-contribute)
  * [Discuss](#discuss)
-  * [Create a Ticket](#create-a-ticket)
-  * [Ticket Lifecycle](#ticket-lifecycle)
+  * [Create an Issue](#create-an-issue)
+  * [Issue Lifecycle](#issue-lifecycle)
  * [Submit a Pull Request](#submit-a-pull-request)
 * [Build from Source](#build-from-source)
 * [Source Code Style](#source-code-style)
@@ -24,72 +24,71 @@ Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.

 #### Discuss

-If you have a question, check StackOverflow using
+If you have a question, check Stack Overflow using
 [this list of tags](https://spring.io/questions), organized by Spring project.
-Find an existing discussion or start a new one if necessary.
+Find an existing discussion, or start a new one if necessary.

-If you suspect an issue, perform a search in the
-[JIRA issue tracker](https://jira.spring.io/browse/SPR), using a few different keywords.
-When you find related issues and discussions, prior or current, it helps you to learn and
-it helps us to make a decision.
+If you believe there is an issue, search through
+[existing issues](https://github.com/spring-projects/spring-framework/issues) trying a
+few different ways to find discussions, past or current, that are related to the issue.
+Reading those discussions helps you to learn about the issue, and helps us to make a
+decision.

-#### Create a Ticket
+
+#### Create an Issue

 Reporting an issue or making a feature request is a great way to contribute. Your feedback
-and the conversations that result from it provide a continuous flow of ideas. 
+and the conversations that result from it provide a continuous flow of ideas. However,
+before creating a ticket, please take the time to [discuss and research](#discuss) first.

-Before you create a ticket, please take the time to [research first](#Discuss). 
+If creating an issue after a discussion on Stack Overflow, please provide a description
+in the issue instead of simply referring to Stack Overflow. The issue tracker is an
+important place of record for design discussions and should be self-sufficient.

-If creating a ticket after a discussion on StackOverflow, please provide a self-sufficient description in the ticket, independent of the details on StackOverview. We understand this is extra work but the issue tracker is an important place of record for design discussions and decisions that can often be referenced long after the fix version, for example to revisit decisions, to understand the origin of a feature, and so on.
+Once you're ready, create an issue on
+[GitHub](https://github.com/spring-projects/spring-framework/issues).

-When ready create a ticket in the [JIRA issue tracker](https://jira.spring.io/browse/SPR).
+#### Issue Lifecycle

-#### Ticket Lifecycle
+When an issue is first created, it is flagged `waiting-for-triage` waiting for a team
+member to triage it. Once the issue has been reviewed, the team may ask for further
+information if needed, and based on the findings, the issue is either assigned a target
+milestone or is closed with a specific status.

-When an issue is first created, it may not be assigned and will not have a fix version.
-Within a day or two, the issue is assigned to a specific committer and the target
-version is set to "Waiting for Triage". The committer will then review the issue, ask for
-further information if needed, and based on the findings, the issue is either assigned a fix
-version or rejected.
-
-When a fix is ready, the issue is marked "Resolved" and may still be re-opened. Once a fix
-is released, the issue is permanently "Closed". If necessary, you will need to create a new,
-related ticket with a fresh description.
+When a fix is ready, the issue is closed and may still be re-opened until the fix is
+released. After that the issue will typically no longer be reopened. In rare cases if the
+issue was not at all fixed, the issue may be re-opened. In most cases however any
+follow-up reports will need to be created as new issues with a fresh description.

 #### Submit a Pull Request

-You can contribute a source code change by submitting a pull request.
-
 1. If you have not previously done so, please sign the
-[Contributor License Agreement](https://cla.pivotal.io/sign/spring). You will also be reminded
-automatically when you submit a pull request.
+[Contributor License Agreement](https://cla.pivotal.io/sign/spring). You will be reminded
+automatically when you submit the PR.

-1. For all but the most trivial of contributions, please [create a ticket](#Create-a-Ticket).
-The purpose of the ticket is to understand and discuss the underlying issue or feature.
-We use the JIRA issue tracker as the preferred place of record for conversations and
-conclusions. In that sense discussions directly under a PR are more implementation detail
-oriented and transient in nature.
+1. Should you create an issue first? No, just create the pull request and use the
+description to provide context and motivation, as you would for an issue. If you want
+to start a discussion first or have already created an issue, once a pull request is
+created, we will close the issue as superseded by the pull request, and the discussion
+about the issue will continue under the pull request.

 1. Always check out the `master` branch and submit pull requests against it
 (for target version see [settings.gradle](settings.gradle)).
 Backports to prior versions will be considered on a case-by-case basis and reflected as
 the fix version in the issue tracker.

-1. Use short branch names, preferably based on the JIRA issue (e.g. `SPR-1234`), or
-otherwise using succinct, lower-case, dash (-) delimited names, such as `fix-warnings'.
-
 1. Choose the granularity of your commits consciously and squash commits that represent
 multiple edits or corrections of the same logical change. See
-[Rewriting History section of Pro Git](http://git-scm.com/book/en/Git-Tools-Rewriting-History)
-for an overview of streamlining commit history.
+[Rewriting History section of Pro Git](https://git-scm.com/book/en/Git-Tools-Rewriting-History)
+for an overview of streamlining the commit history.

-1. Format commit messages using 55 characters for the subject line, 72 lines for the
-description, followed by related issues, e.g. `Issues: SPR-1234, SPR-1235`.
-See the
-[Commit Guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)
-for best practices around commit messages and use `git log` to see some examples.
+1. Format commit messages using 55 characters for the subject line, 72 characters per line
+for the description, followed by the issue fixed, e.g. `Closes gh-22276`. See the
+[Commit Guidelines section of Pro Git](https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)
+for best practices around commit messages, and use `git log` to see some examples.

-1. List the JIRA issue number in the PR description.
+1. If there is a prior issue, reference the GitHub issue number in the description of the
+pull request.

 If accepted, your contribution may be heavily modified as needed prior to merging.
 You will likely retain author attribution for your Git commits granted that the bulk of
@@ -99,6 +98,13 @@ If asked to make corrections, simply push the changes against the same branch, a
 pull request will be updated. In other words, you do not need to create a new pull request
 when asked to make changes.

+#### Participate in Reviews
+
+Helping to review pull requests is another great way to contribute. Your feedback
+can help to shape the implementation of new features. When reviewing pull requests,
+however, please refrain from approving or rejecting a PR unless you are a core
+committer for the Spring Framework.
+
 ### Build from Source

 See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source)
@@ -110,19 +116,19 @@ source code into your IDE.
 The wiki pages
 [Code Style](https://github.com/spring-projects/spring-framework/wiki/Code-Style) and
 [IntelliJ IDEA Editor Settings](https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings)
-defines the source file coding standards we use along with some IDEA editor settings we customize.
+define the source file coding standards we use along with some IDEA editor settings we customize.

 ### Reference Docs

-The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) directory and, in
-[Asciidoctor](http://asciidoctor.org/) format. For trivial changes, you may be able to browse,
-edit source files, and submit directly from Github.
+The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) directory, in
+[Asciidoctor](https://asciidoctor.org/) format. For trivial changes, you may be able to browse,
+edit source files, and submit directly from GitHub.

-When making changes locally, use `./gradlew asciidoctor` and then browse the result under
+When making changes locally, execute `./gradlew asciidoctor` and then browse the result under
 `build/asciidoc/html5/index.html`.

 Asciidoctor also supports live editing. For more details read
-[Editing AsciiDoc with Live Preview](http://asciidoctor.org/docs/editing-asciidoc-with-live-preview/).
+[Editing AsciiDoc with Live Preview](https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/).
 Note that if you choose the
-[System Monitor](http://asciidoctor.org/docs/editing-asciidoc-with-live-preview/#using-a-system-monitor)
+[System Monitor](https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/#using-a-system-monitor)
 option, you can find a Guardfile under `src/docs/asciidoc`.
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -1,48 +1,30 @@
-# <img src="src/docs/asciidoc/images/spring-framework.png" width="80" height="80"> Spring Framework
+# <img src="src/docs/asciidoc/images/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://build.spring.io/plugins/servlet/wittified/build-status/SPR-PUBM)](https://build.spring.io/browse/SPR)

-This is the home of the Spring Framework, the foundation for all
-[Spring projects](https://spring.io/projects). Together the Spring Framework and the family of Spring projects make up what we call "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". 

-Spring provides everything you need beyond the Java language to create enterprise
-applications in a wide range of scenarios and architectures. Please read the
-[Overview](https://docs.spring.io/spring/docs/current/spring-framework-reference/overview.html#spring-introduction)
-section in the reference for a more complete introduction.
+Spring provides everything required beyond the Java programming language for creating enterprise applications for a wide range of scenarios and architectures. Please read the [Overview](https://docs.spring.io/spring/docs/current/spring-framework-reference/overview.html#spring-introduction) section as reference for a more complete introduction.

 ## Code of Conduct

-This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
-By participating you are expected to uphold this code.
-Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.

 ## Access to Binaries

-For access to artifacts or a distribution zip, see the
-[Spring Framework Artifacts](https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Artifacts)
-wiki page.
+For access to artifacts or a distribution zip, see the [Spring Framework Artifacts](https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Artifacts) wiki page.

 ## Documentation

-The Spring Frameworks maintains reference documentation
-([published](http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and
-[source](src/docs/asciidoc)),
-Github [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
-[API reference](http://docs.spring.io/spring-framework/docs/current/javadoc-api/).
-There are also [guides and tutorials](https://spring.io/guides) across Spring projects.
+The Spring Framework maintains reference documentation ([published](https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and [source](src/docs/asciidoc)), Github [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
+[API reference](https://docs.spring.io/spring-framework/docs/current/javadoc-api/). There are also [guides and tutorials](https://spring.io/guides) across Spring projects.

 ## Build from Source

-See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source)
-wiki page and also [CONTRIBUTING.md](CONTRIBUTING.md).
+See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source) Wiki page and the [CONTRIBUTING.md](CONTRIBUTING.md) file.

 ## Stay in Touch

-Follow [@SpringCentral](https://twitter.com/springcentral),
-[@SpringFramework](https://twitter.com/springframework), and its
-[team members](https://twitter.com/springframework/lists/team/members) on Twitter.
-In-depth articles can be found at [The Spring Blog](http://spring.io/blog/),
-and releases are announced via our [news feed](http://spring.io/blog/category/news).
+Follow [@SpringCentral](https://twitter.com/springcentral), [@SpringFramework](https://twitter.com/springframework), and its [team members](https://twitter.com/springframework/lists/team/members) on Twitter. In-depth articles can be found at [The Spring Blog](https://spring.io/blog/), and releases are announced via our [news feed](https://spring.io/blog/category/news).

 ## License

-The Spring Framework is released under version 2.0 of the
-[Apache License](http://www.apache.org/licenses/LICENSE-2.0).
+The Spring Framework is released under version 2.0 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0).
@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+Please see the
+[Spring Framework Versions](https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Versions)
+wiki page.
+
+## Reporting a Vulnerability
+
+Please see https://pivotal.io/security.
@@ -1,317 +1,411 @@
-buildscript {
-	repositories {
-		maven { url "https://repo.spring.io/plugins-release" }
-	}
-	dependencies {
-		classpath("io.spring.gradle:propdeps-plugin:0.0.8")
-		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
-		classpath("org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16")
-		classpath("org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.7")
-	}
-}
-
-// 3rd party plugin repositories can be configured in settings.gradle
 plugins {
-	id "com.gradle.build-scan" version "1.8"
-	id "io.spring.dependency-management" version "1.0.3.RELEASE" apply false
-	id "org.jetbrains.kotlin.jvm" version "1.2.31" apply false
-	id "org.jetbrains.dokka" version "0.9.16"
-	id "org.asciidoctor.convert" version "1.5.6"
-}
-
-buildScan {
-	licenseAgreementUrl = 'https://gradle.com/terms-of-service'
-	licenseAgree = 'yes'
+	id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.3.71' apply false
+	id 'org.jetbrains.dokka' version '0.10.1' apply false
+	id 'org.asciidoctor.jvm.convert' version '2.4.0'
+	id 'io.spring.gradle-enterprise-conventions' version '0.0.2'
+	id 'io.spring.nohttp' version '0.0.4.RELEASE'
+	id 'de.undercouch.download' version '4.0.0'
+	id 'com.gradle.build-scan' version '3.1.1'
+	id "com.jfrog.artifactory" version '4.12.0' apply false
+	id "io.freefair.aspectj" version "4.1.1" apply false
+	id "com.github.ben-manes.versions" version "0.24.0"
 }

+apply from: "$rootDir/gradle/build-scan-user-data.gradle"
 ext {
-	linkHomepage = 'https://projects.spring.io/spring-framework'
-	linkCi = 'https://build.spring.io/browse/SPR'
-	linkIssue = 'https://jira.spring.io/browse/SPR'
-	linkScmUrl = 'https://github.com/spring-projects/spring-framework'
-	linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-framework.git'
-	linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-framework.git'
-
-	moduleProjects = subprojects.findAll {
-		!it.name.equals('spring-build-src') && !it.name.equals('spring-framework-bom')
+	moduleProjects = subprojects.findAll { it.name.startsWith("spring-") }
+	javaProjects = subprojects - project(":framework-bom")
+	withoutJclOverSlf4j = {
+		exclude group: "org.slf4j", name: "jcl-over-slf4j"
 	}
 }

 configure(allprojects) { project ->
-	group = "org.springframework"
-	version = qualifyVersionIfNecessary(version)
+	apply plugin: "io.spring.dependency-management"

-	ext.aspectjVersion       = "1.8.13"
-	ext.freemarkerVersion    = "2.3.27-incubating"
-	ext.groovyVersion        = "2.4.15"
-	ext.hsqldbVersion        = "2.4.0"
-	ext.jackson2Version      = "2.9.5"
-	ext.jettyVersion         = "9.4.9.v20180320"
-	ext.junitJupiterVersion  = "5.0.3"
-	ext.junitPlatformVersion = "1.0.3"
-	ext.junitVintageVersion  = "4.12.3"
-	ext.kotlinVersion        = "1.2.31"
-	ext.log4jVersion         = "2.11.0"
-	ext.nettyVersion         = "4.1.22.Final"
-	ext.reactorVersion       = "Bismuth-SR8"
-	ext.rxjavaVersion        = "1.3.8"
-	ext.rxjavaAdapterVersion = "1.2.1"
-	ext.rxjava2Version       = "2.1.12"
-	ext.slf4jVersion         = "1.7.25"	 // spring-jcl + consistent 3rd party deps
-	ext.tiles3Version        = "3.0.8"
-	ext.tomcatVersion        = "8.5.29"
-	ext.undertowVersion      = "1.4.23.Final"
+	dependencyManagement {
+		imports {
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.10.3"
+			mavenBom "io.netty:netty-bom:4.1.48.Final"
+			mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR6"
+			mavenBom "io.rsocket:rsocket-bom:1.0.0-RC6"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.27.v20200227"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.71"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.5"
+			mavenBom "org.junit:junit-bom:5.6.1"
+		}
+		dependencies {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.13.1') {
+				entry 'log4j-api'
+				entry 'log4j-core'
+				entry 'log4j-slf4j-impl'
+				entry 'log4j-jul'
+			}
+			dependency "org.slf4j:slf4j-api:1.7.30"
+			dependency "com.google.code.findbugs:jsr305:3.0.2"

-	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
+			dependencySet(group: 'org.aspectj', version: '1.9.5') {
+				entry 'aspectjrt'
+				entry 'aspectjtools'
+				entry 'aspectjweaver'
+			}
+			dependencySet(group: 'org.codehaus.groovy', version: '2.5.10') {
+				entry 'groovy'
+				entry 'groovy-jsr223'
+				entry 'groovy-templates'
+				entry 'groovy-test'
+				entry 'groovy-xml'
+			}

-	apply plugin: "propdeps"
-	apply plugin: "java"
-	apply plugin: "test-source-set-dependencies"
-	apply from: "${gradleScriptDir}/ide.gradle"
+			dependency "io.reactivex:rxjava:1.3.8"
+			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
+			dependency "io.reactivex.rxjava2:rxjava:2.2.19"
+			dependency "io.projectreactor.tools:blockhound:1.0.2.RELEASE"

-	apply plugin: "kotlin"
-	compileKotlin {
-		kotlinOptions {
-			jvmTarget = "1.8"
-			freeCompilerArgs = ["-Xjsr305=strict"]
-			apiVersion = "1.1"
-			languageVersion = "1.1"
+			dependency "com.caucho:hessian:4.0.62"
+			dependency "com.fasterxml:aalto-xml:1.2.2"
+			dependency("com.fasterxml.woodstox:woodstox-core:6.0.3") {
+				exclude group: "stax", name: "stax-api"
+			}
+			dependency "com.google.code.gson:gson:2.8.6"
+			dependency "com.google.protobuf:protobuf-java-util:3.11.4"
+			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
+			dependency("com.thoughtworks.xstream:xstream:1.4.11.1") {
+				exclude group: "xpp3", name: "xpp3_min"
+				exclude group: "xmlpull", name: "xmlpull"
+			}
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.3"
+			dependency("org.codehaus.jettison:jettison:1.3.8") {
+				exclude group: "stax", name: "stax-api"
+			}
+			dependencySet(group: 'org.jibx', version: '1.3.3') {
+				entry 'jibx-bind'
+				entry 'jibx-run'
+			}
+			dependency "org.ogce:xpp3:1.1.6"
+			dependency "org.yaml:snakeyaml:1.26"
+
+			dependency "com.h2database:h2:1.4.200"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.8.1"
+			dependency "com.github.librepdf:openpdf:1.3.13"
+			dependency "com.rometools:rome:1.12.2"
+			dependency "commons-io:commons-io:2.5"
+			dependency "io.vavr:vavr:0.10.2"
+			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
+			dependencySet(group: 'org.apache.activemq', version: '5.8.0') {
+				entry 'activemq-broker'
+				entry('activemq-kahadb-store') {
+					exclude group: "org.springframework", name: "spring-context"
+				}
+				entry 'activemq-stomp'
+			}
+			dependency "org.apache.bcel:bcel:6.0"
+			dependency "org.apache.commons:commons-pool2:2.8.0"
+			dependencySet(group: 'org.apache.derby', version: '10.14.2.0') {
+				entry 'derby'
+				entry 'derbyclient'
+			}
+			dependency "org.apache.poi:poi-ooxml:4.1.2"
+			dependency "org.beanshell:bsh:2.0b5"
+			dependency "org.freemarker:freemarker:2.3.29"
+			dependency "org.hsqldb:hsqldb:2.5.0"
+			dependency "org.quartz-scheduler:quartz:2.3.2"
+			dependency "org.codehaus.fabric3.api:commonj:1.1.0"
+			dependency "net.sf.ehcache:ehcache:2.10.6"
+			dependency "org.ehcache:jcache:1.0.1"
+			dependency "org.ehcache:ehcache:3.4.0"
+			dependency "org.hibernate:hibernate-core:5.4.12.Final"
+			dependency "org.hibernate:hibernate-validator:6.1.2.Final"
+			dependency "org.webjars:webjars-locator-core:0.43"
+			dependency "org.webjars:underscorejs:1.8.3"
+
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.31') {
+				entry 'tomcat-util'
+				entry('tomcat-websocket') {
+					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
+					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
+				}
+			}
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.31') {
+				entry 'tomcat-embed-core'
+				entry 'tomcat-embed-websocket'
+			}
+			dependencySet(group: 'io.undertow', version: '2.0.30.Final') {
+				entry 'undertow-core'
+				entry('undertow-websockets-jsr') {
+					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
+				}
+				entry('undertow-servlet') {
+					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
+					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
+				}
+			}
+
+			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.7') {
+				entry 'okhttp'
+				entry 'mockwebserver'
+			}
+			dependency("org.apache.httpcomponents:httpclient:4.5.11") {
+				exclude group: "commons-logging", name: "commons-logging"
+			}
+			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
+				exclude group: "commons-logging", name: "commons-logging"
+			}
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.2"
+
+			dependency "org.jruby:jruby:9.2.11.0"
+			dependency "org.python:jython-standalone:2.7.1"
+			dependency "org.mozilla:rhino:1.7.11"
+
+			dependency "commons-fileupload:commons-fileupload:1.4"
+			dependency "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
+
+			dependency("dom4j:dom4j:1.6.1") {
+				exclude group: "xml-apis", name: "xml-apis"
+			}
+			dependency("jaxen:jaxen:1.1.1") {
+				exclude group: "xml-apis", name: "xml-apis"
+				exclude group: "xom", name: "xom"
+				exclude group: "xerces", name: "xercesImpl"
+			}
+
+			dependency("junit:junit:4.12") {
+				exclude group: "org.hamcrest", name: "hamcrest-core"
+			}
+			dependency("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1") {
+				exclude group: "junit", name: "junit"
+			}
+			dependency "org.testng:testng:6.14.3"
+			dependency "org.hamcrest:hamcrest:2.1"
+			dependency "org.awaitility:awaitility:3.1.6"
+			dependency "org.assertj:assertj-core:3.15.0"
+			dependencySet(group: 'org.xmlunit', version: '2.6.2') {
+				entry 'xmlunit-assertj'
+				entry('xmlunit-matchers') {
+					exclude group: "org.hamcrest", name: "hamcrest-core"
+				}
+			}
+			dependencySet(group: 'org.mockito', version: '3.2.4') {
+				entry('mockito-core') {
+					exclude group: "org.hamcrest", name: "hamcrest-core"
+				}
+				entry 'mockito-junit-jupiter'
+			}
+			dependency "io.mockk:mockk:1.9.3"
+
+			dependency("net.sourceforge.htmlunit:htmlunit:2.38.0") {
+				exclude group: "commons-logging", name: "commons-logging"
+			}
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.38.0") {
+				exclude group: "commons-logging", name: "commons-logging"
+			}
+			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
+				exclude group: "commons-logging", name: "commons-logging"
+				exclude group: "io.netty", name: "netty"
+			}
+			dependency "org.skyscreamer:jsonassert:1.5.0"
+			dependency "com.jayway.jsonpath:json-path:2.4.0"
+
+			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
+				entry 'tiles-api'
+				entry('tiles-core', withoutJclOverSlf4j)
+				entry('tiles-servlet', withoutJclOverSlf4j)
+				entry('tiles-jsp', withoutJclOverSlf4j)
+				entry('tiles-el', withoutJclOverSlf4j)
+				entry('tiles-extras') {
+					exclude group: "org.springframework", name: "spring-web"
+					exclude group: "org.slf4j", name: "jcl-over-slf4j"
+				}
+			}
+			dependency("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
+				exclude group: "org.apache.taglibs", name: "taglibs-standard-spec"
+			}
+
+			dependency "com.ibm.websphere:uow:6.0.2.17"
+			dependency "com.jamonapi:jamon:2.81"
+			dependency "joda-time:joda-time:2.10.5"
+			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.6"
+			dependency "org.javamoney:moneta:1.3"
+
+			dependency "com.sun.activation:javax.activation:1.2.0"
+			dependency "com.sun.mail:javax.mail:1.6.2"
+			dependencySet(group: 'com.sun.xml.bind', version: '2.3.0.1') {
+				entry 'jaxb-core'
+				entry 'jaxb-impl'
+				entry 'jaxb-xjc'
+			}
+
+			dependency "javax.activation:javax.activation-api:1.2.0"
+			dependency "javax.annotation:javax.annotation-api:1.3.2"
+			dependency "javax.cache:cache-api:1.1.0"
+			dependency "javax.ejb:javax.ejb-api:3.2"
+			dependency "javax.el:javax.el-api:3.0.1-b04"
+			dependency "javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0"
+			dependency "javax.faces:javax.faces-api:2.2"
+			dependency "javax.inject:javax.inject:1"
+			dependency "javax.inject:javax.inject-tck:1"
+			dependency "javax.interceptor:javax.interceptor-api:1.2.2"
+			dependency "javax.jms:javax.jms-api:2.0.1"
+			dependency "javax.json:javax.json-api:1.1.4"
+			dependency "javax.json.bind:javax.json.bind-api:1.0"
+			dependency "javax.mail:javax.mail-api:1.6.2"
+			dependency "javax.money:money-api:1.0.3"
+			dependency "javax.resource:javax.resource-api:1.7.1"
+			dependency "javax.servlet:javax.servlet-api:4.0.1"
+			dependency "javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02"
+			dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1"
+			dependency "javax.transaction:javax.transaction-api:1.3"
+			dependency "javax.validation:validation-api:2.0.1.Final"
+			dependency "javax.websocket:javax.websocket-api:1.1"
+			dependency "javax.xml.bind:jaxb-api:2.3.1"
+			dependency "javax.xml.ws:jaxws-api:2.3.1"
+
+			dependency "org.eclipse.persistence:javax.persistence:2.2.0"
+
+			// Substitute for "javax.management:jmxremote_optional:1.0.1_04" which
+			// is not available on Maven Central
+			dependency "org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea"
+			dependency "org.glassfish:javax.el:3.0.1-b08"
+			dependency "org.glassfish.main:javax.jws:4.0-b33"
+			dependency "org.glassfish.tyrus:tyrus-container-servlet:1.13.1"
+		}
+		generatedPomCustomization {
+			enabled = false
+		}
+		resolutionStrategy {
+			cacheChangingModulesFor 0, "seconds"
+		}
+		repositories {
+			mavenCentral()
+			maven { url "https://repo.spring.io/libs-spring-framework-build" }
 		}
 	}
-	compileTestKotlin {
-		kotlinOptions {
-			jvmTarget = "1.8"
-			freeCompilerArgs = ["-Xjsr305=strict"]
-		}
-	}
-
 	configurations.all {
-		// Check for updates every build
-		resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+		resolutionStrategy {
+			cacheChangingModulesFor 0, "seconds"
+			cacheDynamicVersionsFor 0, "seconds"
+		}
+	}
+}

-		// Consistent slf4j version (e.g. clashes between slf4j versions)
-		resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-			if (details.requested.group == 'org.slf4j') {
-				details.useVersion slf4jVersion
+configure([rootProject] + javaProjects) { project ->
+	group = "org.springframework"
+
+	apply plugin: "java"
+	apply plugin: "java-test-fixtures"
+	apply plugin: "checkstyle"
+	apply plugin: 'org.springframework.build.compile'
+	apply from: "${rootDir}/gradle/custom-java-home.gradle"
+	apply from: "${rootDir}/gradle/ide.gradle"
+
+	pluginManager.withPlugin("kotlin") {
+		apply plugin: "org.jetbrains.dokka"
+		compileKotlin {
+			kotlinOptions {
+				jvmTarget = "1.8"
+				freeCompilerArgs = ["-Xjsr305=strict"]
+				allWarningsAsErrors = true
+			}
+		}
+		compileTestKotlin {
+			kotlinOptions {
+				jvmTarget = "1.8"
+				freeCompilerArgs = ["-Xjsr305=strict"]
 			}
 		}
-
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
-
-	def commonCompilerArgs =
-			["-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
-			 "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
-			 "-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options"]
-
-	compileJava.options*.compilerArgs = commonCompilerArgs +
-			["-Xlint:varargs", "-Xlint:fallthrough", "-Xlint:rawtypes",
-			 "-Xlint:deprecation", "-Xlint:unchecked", "-Werror"]
-
-	compileTestJava.options*.compilerArgs = commonCompilerArgs +
-			["-Xlint:-varargs", "-Xlint:-fallthrough","-Xlint:-rawtypes",
-			 "-Xlint:-deprecation", "-Xlint:-unchecked"]
-
-	compileJava {
-		sourceCompatibility = 1.8  // can be switched to 10 for testing
-		targetCompatibility = 1.8
-		options.encoding = 'UTF-8'
-	}
-
-	compileTestJava {
-		sourceCompatibility = 1.8  // can be switched to 10 for testing
-		targetCompatibility = 1.8
-		options.encoding = 'UTF-8'
-		options.compilerArgs += "-parameters"
 	}

 	test {
+		useJUnitPlatform()
+		include(["**/*Tests.class", "**/*Test.class"])
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
-		scanForTestClasses = false
-		include(["**/*Tests.class", "**/*Test.class"])
-		// Since we set scanForTestClasses to false, we need to filter out inner
-		// classes with the "$" pattern; otherwise, using -Dtest.single=MyTests to
-		// run MyTests by itself will fail if MyTests contains any inner classes.
-		exclude(["**/Abstract*.class", '**/*$*'])
-		reports.junitXml.setDestination(file("$buildDir/test-results"))
+		systemProperty("io.netty.leakDetection.level", "paranoid")
 	}

-	repositories {
-		maven { url "https://repo.spring.io/libs-release" }
+	checkstyle {
+		toolVersion = "8.30"
+		configDir = rootProject.file("src/checkstyle")
 	}

 	dependencies {
-		testCompile("junit:junit:4.12") {
-			exclude group:'org.hamcrest', module:'hamcrest-core'
-		}
-		testCompile("org.mockito:mockito-core:2.12.0") {
-			exclude group:'org.hamcrest', module:'hamcrest-core'
-		}
-		testCompile("com.nhaarman:mockito-kotlin:1.5.0") {
-			exclude module:'kotlin-stdlib'
-			exclude module:'kotlin-reflect'
-			exclude module:'mockito-core'
-		}
-		testCompile("org.hamcrest:hamcrest-all:1.3")
-		testCompile("org.xmlunit:xmlunit-matchers:2.3.0")
-		testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}")
-		testRuntime("org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}")
-		testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}")
-        // JSR-305 only used for non-required meta-annotations
-		compileOnly("com.google.code.findbugs:jsr305:3.0.2")
-		testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
+		testCompile("org.junit.jupiter:junit-jupiter-api")
+		testCompile("org.junit.jupiter:junit-jupiter-params")
+		testCompile("org.mockito:mockito-core")
+		testCompile("org.mockito:mockito-junit-jupiter")
+		testCompile("io.mockk:mockk")
+		testCompile("org.assertj:assertj-core")
+		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
+		testRuntime("org.junit.platform:junit-platform-launcher")
+		testRuntime("org.junit.jupiter:junit-jupiter-engine")
+		testRuntime("org.apache.logging.log4j:log4j-core")
+		testRuntime("org.apache.logging.log4j:log4j-slf4j-impl")
+		testRuntime("org.apache.logging.log4j:log4j-jul")
+		// 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.15")
 	}

 	ext.javadocLinks = [
-		"http://docs.oracle.com/javase/8/docs/api/",
-		"http://docs.oracle.com/javaee/7/api/",
-		"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
-		"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
-		"http://glassfish.java.net/nonav/docs/v3/api/",
-		"http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
-		"http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
-		"http://tiles.apache.org/tiles-request/apidocs/",
-		"http://tiles.apache.org/framework/apidocs/",
-		"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
-		"http://ehcache.org/apidocs/2.10.4",
-		"http://quartz-scheduler.org/api/2.2.1/",
-		"http://fasterxml.github.io/jackson-core/javadoc/2.8/",
-		"http://fasterxml.github.io/jackson-databind/javadoc/2.8/",
-		"http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/",
-		"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"
+			"https://docs.oracle.com/javase/8/docs/api/",
+			"https://docs.oracle.com/javaee/7/api/",
+			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
+			"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://glassfish.java.net/nonav/docs/v3/api/",
+			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
+			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
+			"https://tiles.apache.org/tiles-request/apidocs/",
+			"https://tiles.apache.org/framework/apidocs/",
+			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
+			"https://www.ehcache.org/apidocs/2.10.4/",
+			"https://www.quartz-scheduler.org/api/2.3.0/",
+			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
+			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",
+			"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
+			"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
+			"https://junit.org/junit4/javadoc/4.12/",
+			"https://junit.org/junit5/docs/5.6.1/api/"
 	] as String[]
 }

-configure(subprojects - project(":spring-build-src")) { subproject ->
-	apply from: "${gradleScriptDir}/publish-maven.gradle"
-
-	jar {
-		manifest.attributes["Implementation-Title"] = subproject.name
-		manifest.attributes["Implementation-Version"] = subproject.version
-		manifest.attributes["Automatic-Module-Name"] = subproject.name.replace('-', '.')  // for Jigsaw
-		manifest.attributes["Created-By"] =
-				"${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})"
-
-		from("${rootProject.projectDir}/src/docs/dist") {
-			include "license.txt"
-			include "notice.txt"
-			into "META-INF"
-			expand(copyright: new Date().format("yyyy"), version: project.version)
-		}
-	}
-
-	javadoc {
-		description = "Generates project-level javadoc for use in -javadoc jar"
-
-		options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
-		options.author = true
-		options.header = project.name
-		options.use = true
-		options.links(project.ext.javadocLinks)
-		options.addStringOption('Xdoclint:none', '-quiet')
-
-		// Suppress warnings due to cross-module @see and @link references.
-		// Note that global 'api' task does display all warnings.
-		logging.captureStandardError LogLevel.INFO
-		logging.captureStandardOutput LogLevel.INFO  // suppress "## warnings" message
-	}
-
-	task sourcesJar(type: Jar, dependsOn: classes) {
-		duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-		classifier = 'sources'
-		from sourceSets.main.allSource
-		// Don't include or exclude anything explicitly by default. See SPR-12085.
-	}
-
-	task javadocJar(type: Jar) {
-		classifier = "javadoc"
-		from javadoc
-	}
-
-	artifacts {
-		archives sourcesJar
-		archives javadocJar
-	}
+configure(moduleProjects) { project ->
+	apply from: "${rootDir}/gradle/spring-module.gradle"
 }

 configure(rootProject) {
 	description = "Spring Framework"

 	apply plugin: "groovy"
-	apply plugin: "io.spring.dependency-management"
-	apply from: "${gradleScriptDir}/jdiff.gradle"
-	apply from: "${gradleScriptDir}/docs.gradle"
+	apply plugin: "kotlin"
+	apply plugin: "io.spring.nohttp"
+	apply plugin: 'org.springframework.build.api-diff'
+	apply from: "${rootDir}/gradle/publications.gradle"
+	apply from: "${rootDir}/gradle/docs.gradle"

-	dependencyManagement {
-		imports {
-			mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
-		}
-		resolutionStrategy {
-			cacheChangingModulesFor 0, 'seconds'
-		}
-		applyMavenExclusions = false
-	}
-
-	// don't publish the default jar for the root project
-	configurations.archives.artifacts.clear()
-
-	dependencies {  // for integration tests
-		testCompile(project(":spring-aop"))
-		testCompile(project(":spring-beans"))
-		testCompile(project(":spring-context"))
-		testCompile(project(":spring-core"))
-		testCompile(project(":spring-expression"))
-		testCompile(project(":spring-jdbc"))
-		testCompile(project(":spring-orm"))
-		testCompile(project(":spring-test"))
-		testCompile(project(":spring-tx"))
-		testCompile(project(":spring-web"))
-		testCompile("javax.inject:javax.inject:1")
-		testCompile("javax.resource:javax.resource-api:1.7")
-		testCompile("javax.servlet:javax.servlet-api:3.1.0")
-		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
-		testCompile("org.hibernate:hibernate-core:5.1.13.Final")
-	}
-
-	artifacts {
-		archives docsZip
-		archives schemaZip
-		archives distZip
-	}
-
-	task wrapper(type: Wrapper) {
-		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = '4.4.1'
-
-		doLast() {
-			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
-			def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256m"
-			File wrapperFile = file("gradlew")
-			wrapperFile.text = wrapperFile.text.replace("DEFAULT_JVM_OPTS=",
-					"GRADLE_OPTS=\"$gradleOpts \$GRADLE_OPTS\"\nDEFAULT_JVM_OPTS=")
-			File wrapperBatFile = file("gradlew.bat")
-			wrapperBatFile.text = wrapperBatFile.text.replace("set DEFAULT_JVM_OPTS=",
-					"set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=")
+	nohttp {
+		source.exclude "**/test-output/**"
+		whitelistFile = project.file("src/nohttp/whitelist.lines")
+		def rootPath = file(rootDir).toPath()
+		def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/buildSrc"
+		projectDirs.forEach { dir ->
+			[ 'bin', 'build', 'out', '.settings' ]
+				.collect { rootPath.relativize(new File(dir, it).toPath()) }
+				.forEach { source.exclude "$it/**" }
+			[ '.classpath', '.project' ]
+				.collect { rootPath.relativize(new File(dir, it).toPath()) }
+				.forEach { source.exclude "$it" }
 		}
 	}

-}
-
-/*
- * Support publication of artifacts versioned by topic branch.
- * CI builds supply `-P BRANCH_NAME=<TOPIC>` to gradle at build time.
- * If <TOPIC> starts with 'SPR-', change version
- *     from BUILD-SNAPSHOT => <TOPIC>-SNAPSHOT
- *     e.g. 3.2.1.BUILD-SNAPSHOT => 3.2.1.SPR-1234-SNAPSHOT
- */
-def qualifyVersionIfNecessary(version) {
-	if (rootProject.hasProperty("BRANCH_NAME")) {
-		def qualifier = rootProject.getProperty("BRANCH_NAME")
-		if (qualifier.startsWith("SPR-")) {
-			return version.replace('BUILD', qualifier)
-		}
-	}
-	return version
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				artifact docsZip
+				artifact schemaZip
+				artifact distZip
+			}
+		}
+	}
 }
@@ -0,0 +1,41 @@
+# Spring Framework Build
+
+This folder contains the custom plugins and conventions for the Spring Framework build.
+They are declared in the `build.gradle` file in this folder.
+
+## Build Conventions
+
+### Compiler conventions
+
+The `org.springframework.build.compile` plugin applies the Java compiler conventions to the build.
+By default, the build compiles sources with Java `1.8` source and target compatibility.
+You can test a different source compatibility version on the CLI with a project property like:
+
+```
+./gradlew test -PjavaSourceVersion=11
+```
+
+## Build Plugins
+
+## Optional dependencies
+
+The `org.springframework.build.optional-dependencies` plugin creates a new `optional`
+Gradle configuration - it adds the dependencies to the project's compile and runtime classpath
+but doesn't affect the classpath of dependent projects.
+This plugin does not provide a `provided` configuration, as the native `compileOnly` and `testCompileOnly`
+configurations are preferred.
+
+## API Diff
+
+This plugin uses the [Gradle JApiCmp](https://github.com/melix/japicmp-gradle-plugin) plugin
+to generate API Diff reports for each Spring Framework module. This plugin is applied once on the root
+project and creates tasks in each framework module. Unlike previous versions of this part of the build,
+there is no need for checking out a specific tag. The plugin will fetch the JARs we want to compare the
+current working version with. You can generate the reports for all modules or a single module:
+
+```
+./gradlew apiDiff -PbaselineVersion=5.1.0.RELEASE
+./gradlew :spring-core:apiDiff -PbaselineVersion=5.1.0.RELEASE
+```      
+
+The reports are located under `build/reports/api-diff/$OLDVERSION_to_$NEWVERSION/`.
@@ -0,0 +1,30 @@
+plugins {
+	id 'java-gradle-plugin'
+}
+
+repositories {
+	mavenCentral()
+	gradlePluginPortal()
+}
+
+dependencies {
+	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.2.8"
+	implementation "com.google.guava:guava:28.2-jre" // required by japicmp-gradle-plugin
+}
+
+gradlePlugin {
+	plugins {
+		apiDiffPlugin {
+			id = "org.springframework.build.api-diff"
+			implementationClass = "org.springframework.build.api.ApiDiffPlugin"
+		}
+		compileConventionsPlugin {
+			id = "org.springframework.build.compile"
+			implementationClass = "org.springframework.build.compile.CompilerConventionsPlugin"
+		}
+		optionalDependenciesPlugin {
+			id = "org.springframework.build.optional-dependencies"
+			implementationClass = "org.springframework.build.optional.OptionalDependenciesPlugin"
+		}
+	}
+}
@@ -0,0 +1 @@
+org.gradle.caching=true
@@ -0,0 +1 @@
+apply from: "../gradle/build-cache-settings.gradle"
@@ -1,10 +0,0 @@
-description = "Exposes gradle buildSrc for IDE support"
-
-apply plugin: "groovy"
-
-dependencies {
-	compile gradleApi()
-	compile localGroovy()
-}
-
-configurations.archives.artifacts.clear()
@@ -1,55 +0,0 @@
-/*
- * Copyright 2002-2014 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.build.gradle
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ProjectDependency;
-
-/**
- * Gradle plugin that automatically updates testCompile dependencies to include
- * the test source sets of project dependencies.
- *
- * @author Phillip Webb
- */
-class TestSourceSetDependenciesPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.afterEvaluate {
-			Set<ProjectDependency> projectDependencies = new LinkedHashSet<ProjectDependency>()
-			collectProjectDependencies(projectDependencies, project)
-			projectDependencies.each {
-				project.dependencies.add("testCompile", it.dependencyProject.sourceSets.test.output)
-			}
-		}
-	}
-
-	private void collectProjectDependencies(Set<ProjectDependency> projectDependencies, Project project) {
-		for (def configurationName in ["compile", "optional", "provided", "testCompile"]) {
-			Configuration configuration = project.getConfigurations().findByName(configurationName)
-			if (configuration) {
-				configuration.dependencies.findAll { it instanceof ProjectDependency }.each {
-					projectDependencies.add(it)
-					collectProjectDependencies(projectDependencies, it.dependencyProject)
-				}
-			}
-		}
-	}
-
-}
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.build.api;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+
+import me.champeau.gradle.japicmp.JapicmpPlugin;
+import me.champeau.gradle.japicmp.JapicmpTask;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.plugins.JavaBasePlugin;
+import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
+import org.gradle.api.tasks.TaskProvider;
+import org.gradle.jvm.tasks.Jar;
+
+/**
+ * {@link Plugin} that applies the {@code "japicmp-gradle-plugin"}
+ * and create tasks for all subprojects, diffing the public API one by one
+ * and creating the reports in {@code "build/reports/api-diff/$OLDVERSION_to_$NEWVERSION/"}.
+ * <p>{@code "./gradlew apiDiff -PbaselineVersion=5.1.0.RELEASE"} will output the
+ * reports for the API diff between the baseline version and the current one for all modules.
+ * You can limit the report to a single module with
+ * {@code "./gradlew :spring-core:apiDiff -PbaselineVersion=5.1.0.RELEASE"}.
+ *
+ * @author Brian Clozel
+ */
+public class ApiDiffPlugin implements Plugin<Project> {
+
+	public static final String TASK_NAME = "apiDiff";
+
+	private static final String BASELINE_VERSION_PROPERTY = "baselineVersion";
+
+	private static final List<String> PACKAGE_INCLUDES = Collections.singletonList("org.springframework.*");
+
+	@Override
+	public void apply(Project project) {
+		if (project.hasProperty(BASELINE_VERSION_PROPERTY) && project.equals(project.getRootProject())) {
+			project.getPluginManager().apply(JapicmpPlugin.class);
+			project.getPlugins().withType(JapicmpPlugin.class,
+					plugin -> applyApiDiffConventions(project));
+		}
+	}
+
+	private void applyApiDiffConventions(Project project) {
+		String baselineVersion = project.property(BASELINE_VERSION_PROPERTY).toString();
+		project.subprojects(subProject -> createApiDiffTask(baselineVersion, subProject));
+	}
+
+	private void createApiDiffTask(String baselineVersion, Project project) {
+		if (isProjectEligible(project)) {
+			JapicmpTask apiDiff = project.getTasks().create(TASK_NAME, JapicmpTask.class);
+			apiDiff.setDescription("Generates an API diff report with japicmp");
+			apiDiff.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP);
+
+			apiDiff.setOldClasspath(project.files(createBaselineConfiguration(baselineVersion, project)));
+			TaskProvider<Jar> jar = project.getTasks().withType(Jar.class).named("jar");
+			apiDiff.setNewArchives(project.getLayout().files(jar.get().getArchiveFile().get().getAsFile()));
+			apiDiff.setNewClasspath(getRuntimeClassPath(project));
+			apiDiff.setPackageIncludes(PACKAGE_INCLUDES);
+			apiDiff.setOnlyModified(true);
+			apiDiff.setIgnoreMissingClasses(true);
+			// Ignore Kotlin metadata annotations since they contain
+			// illegal HTML characters and fail the report generation
+			apiDiff.setAnnotationExcludes(Collections.singletonList("@kotlin.Metadata"));
+
+			apiDiff.setHtmlOutputFile(getOutputFile(baselineVersion, project));
+
+			apiDiff.dependsOn(project.getTasks().getByName("jar"));
+		}
+	}
+
+	private boolean isProjectEligible(Project project) {
+		return project.getPlugins().hasPlugin(JavaPlugin.class)
+				&& project.getPlugins().hasPlugin(MavenPublishPlugin.class);
+	}
+
+	private Configuration createBaselineConfiguration(String baselineVersion, Project project) {
+		String baseline = String.join(":",
+				project.getGroup().toString(), project.getName(), baselineVersion);
+		Dependency baselineDependency = project.getDependencies().create(baseline + "@jar");
+		return project.getRootProject().getConfigurations().detachedConfiguration(baselineDependency);
+	}
+
+	private Configuration getRuntimeClassPath(Project project) {
+		return project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
+	}
+
+	private File getOutputFile(String baseLineVersion, Project project) {
+		Path outDir = Paths.get(project.getRootProject().getBuildDir().getAbsolutePath(),
+				"reports", "api-diff",
+				baseLineVersion + "_to_" + project.getRootProject().getVersion());
+		return project.file(outDir.resolve(project.getName() + ".html").toString());
+	}
+
+}
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.build.compile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.gradle.api.JavaVersion;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.tasks.compile.JavaCompile;
+
+/**
+ * {@link Plugin} that applies conventions for compiling Java sources in Spring Framework.
+ * <p>One can override the default Java source compatibility version
+ * with a dedicated property on the CLI: {@code "./gradlew test -PjavaSourceVersion=11"}.
+ *
+ * @author Brian Clozel
+ * @author Sam Brannen
+ */
+public class CompilerConventionsPlugin implements Plugin<Project> {
+
+	/**
+	 * The project property that can be used to switch the Java source
+	 * compatibility version for building source and test classes.
+	 */
+	public static final String JAVA_SOURCE_VERSION_PROPERTY = "javaSourceVersion";
+
+	public static final JavaVersion DEFAULT_COMPILER_VERSION = JavaVersion.VERSION_1_8;
+
+	private static final List<String> COMPILER_ARGS;
+
+	private static final List<String> TEST_COMPILER_ARGS;
+
+	static {
+		List<String> commonCompilerArgs = Arrays.asList(
+				"-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
+				"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
+				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options"
+		);
+		COMPILER_ARGS = new ArrayList<>();
+		COMPILER_ARGS.addAll(commonCompilerArgs);
+		COMPILER_ARGS.addAll(Arrays.asList(
+				"-Xlint:varargs", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation",
+				"-Xlint:unchecked", "-Werror"
+		));
+		TEST_COMPILER_ARGS = new ArrayList<>();
+		TEST_COMPILER_ARGS.addAll(commonCompilerArgs);
+		TEST_COMPILER_ARGS.addAll(Arrays.asList("-Xlint:-varargs", "-Xlint:-fallthrough", "-Xlint:-rawtypes",
+				"-Xlint:-deprecation", "-Xlint:-unchecked", "-parameters"));
+	}
+
+	@Override
+	public void apply(Project project) {
+		project.getPlugins().withType(JavaPlugin.class, javaPlugin -> applyJavaCompileConventions(project));
+	}
+
+	/**
+	 * Applies the common Java compiler options for main sources, test fixture sources, and
+	 * test sources.
+	 * @param project the current project
+	 */
+	private void applyJavaCompileConventions(Project project) {
+		JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class);
+		if (project.hasProperty(JAVA_SOURCE_VERSION_PROPERTY)) {
+			JavaVersion javaSourceVersion = JavaVersion.toVersion(project.property(JAVA_SOURCE_VERSION_PROPERTY));
+			java.setSourceCompatibility(javaSourceVersion);
+		}
+		else {
+			java.setSourceCompatibility(DEFAULT_COMPILER_VERSION);
+		}
+		java.setTargetCompatibility(DEFAULT_COMPILER_VERSION);
+
+		project.getTasks().withType(JavaCompile.class)
+				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
+				.forEach(compileTask -> {
+					compileTask.getOptions().setCompilerArgs(COMPILER_ARGS);
+					compileTask.getOptions().setEncoding("UTF-8");
+				});
+		project.getTasks().withType(JavaCompile.class)
+				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
+						|| compileTask.getName().equals("compileTestFixturesJava"))
+				.forEach(compileTask -> {
+					compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS);
+					compileTask.getOptions().setEncoding("UTF-8");
+				});
+	}
+
+}
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.build.optional;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.plugins.ide.eclipse.EclipsePlugin;
+import org.gradle.plugins.ide.eclipse.model.EclipseModel;
+
+/**
+ * A {@code Plugin} that adds support for Maven-style optional dependencies. Creates a new
+ * {@code optional} configuration. The {@code optional} configuration is part of the
+ * project's compile and runtime classpath's but does not affect the classpath of
+ * dependent projects.
+ *
+ * @author Andy Wilkinson
+ */
+public class OptionalDependenciesPlugin implements Plugin<Project> {
+
+	/**
+	 * Name of the {@code optional} configuration.
+	 */
+	public static final String OPTIONAL_CONFIGURATION_NAME = "optional";
+
+	@Override
+	public void apply(Project project) {
+		Configuration optional = project.getConfigurations().create("optional");
+		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
+			SourceSetContainer sourceSets = project.getConvention()
+					.getPlugin(JavaPluginConvention.class).getSourceSets();
+			sourceSets.all((sourceSet) -> {
+				sourceSet.setCompileClasspath(
+						sourceSet.getCompileClasspath().plus(optional));
+				sourceSet.setRuntimeClasspath(
+						sourceSet.getRuntimeClasspath().plus(optional));
+			});
+		});
+		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {
+			project.getExtensions().getByType(EclipseModel.class)
+					.classpath((classpath) -> {
+						classpath.getPlusConfigurations().add(optional);
+					});
+		});
+	}
+
+}
@@ -1 +0,0 @@
-implementation-class=org.springframework.build.gradle.TestSourceSetDependenciesPlugin
@@ -0,0 +1,29 @@
+description = "Spring Framework (Bill of Materials)"
+
+apply plugin: 'java-platform'
+apply from: "$rootDir/gradle/publications.gradle"
+
+group = "org.springframework"
+
+dependencies {
+	constraints {
+		parent.moduleProjects.sort { "$it.name" }.each {
+			api it
+		}
+	}
+}
+
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			artifactId = 'spring-framework-bom'
+			from components.javaPlatform
+			// remove scope information from published BOM
+			pom.withXml {
+				asNode().dependencyManagement.first().dependencies.first().each {
+					it.remove(it.scope.first())
+				}
+			}
+		}
+	}
+}
@@ -1 +1,4 @@
-version=5.0.5.BUILD-SNAPSHOT
+version=5.2.5.RELEASE
+org.gradle.jvmargs=-Xmx1536M
+org.gradle.caching=true
+org.gradle.parallel=true
@@ -0,0 +1,18 @@
+buildCache {
+	local {
+		enabled = true
+	}
+	remote(HttpBuildCache) {
+		enabled = true
+		url = 'https://ge.spring.io/cache/'
+		def cacheUsername = System.getenv('GRADLE_ENTERPRISE_CACHE_USERNAME')
+		def cachePassword = System.getenv('GRADLE_ENTERPRISE_CACHE_PASSWORD')
+		if (cacheUsername && cachePassword) {
+			push = true
+			credentials {
+				username = cacheUsername
+				password = cachePassword
+			}
+		}
+	}
+}
@@ -0,0 +1,16 @@
+addCustomJavaHomeMetadata()
+addCustomJavaSourceVersionMetadata()
+
+void addCustomJavaHomeMetadata() {
+	def customJavaHome = System.getProperty("customJavaHome")
+	if (customJavaHome) {
+		buildScan.value "Custom JAVA_HOME", customJavaHome
+	}
+}
+
+void addCustomJavaSourceVersionMetadata() {
+	def customJavaSourceVersion = System.getProperty("customJavaSourceVersion")
+	if (customJavaSourceVersion) {
+		buildScan.value "Custom Java Source Version", customJavaSourceVersion
+	}
+}
@@ -0,0 +1,80 @@
+// -----------------------------------------------------------------------------
+//
+// This script adds support for the following two JVM system properties
+// that control the build for alternative JDKs (i.e., a JDK other than
+// the one used to launch the Gradle process).
+//
+// - customJavaHome: absolute path to the alternate JDK installation to
+//     use to compile Java code and execute tests. This system property
+//     is also used in spring-oxm.gradle to determine whether JiBX is
+//     supported.
+//
+// - customJavaSourceVersion: Java version supplied to the `--release`
+//     command line flag to control the Java source and target
+//     compatibility version. Supported versions include 9 or higher.
+//     Do not set this system property if Java 8 should be used.
+//
+// Examples:
+//
+// ./gradlew -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home test
+//
+// ./gradlew --no-build-cache -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home test
+//
+// ./gradlew -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home -DcustomJavaSourceVersion=14 test
+//
+//
+// Credits: inspired by work from Marc Philipp and Stephane Nicoll
+//
+// -----------------------------------------------------------------------------
+
+import org.gradle.internal.os.OperatingSystem
+// import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
+
+def customJavaHome = System.getProperty("customJavaHome")
+
+if (customJavaHome) {
+	def customJavaHomeDir = new File(customJavaHome)
+	def customJavaSourceVersion = System.getProperty("customJavaSourceVersion")
+
+	tasks.withType(JavaCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHomeDir)
+		options.forkOptions.javaHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			options.compilerArgs += [ "--release", customJavaSourceVersion]
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+	tasks.withType(GroovyCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHomeDir)
+		options.forkOptions.javaHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			options.compilerArgs += [ "--release", customJavaSourceVersion]
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+	/*
+	tasks.withType(KotlinJvmCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHome)
+		kotlinOptions.jdkHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+	}
+	*/
+
+	tasks.withType(Test) {
+		def javaExecutable = customJavaHome + "/bin/java"
+		if (OperatingSystem.current().isWindows()) {
+			javaExecutable += ".exe"
+		}
+		logger.info("Java executable for " + it.name + " task in " + project.name + ": " + javaExecutable)
+		executable = javaExecutable
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+}
@@ -1,155 +1,225 @@
-/*
- * Copyright 2002-2017 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.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
+configurations {
+	asciidoctorExt
+}

+dependencies {
+	asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.0.RELEASE")
+}
+
+repositories {
+	maven {
+		url "https://repo.spring.io/release"
+		mavenContent {
+			includeGroup "io.spring.asciidoctor"
+		}
+	}
+}
+
+/**
+ * Produce Javadoc for all Spring Framework modules in "build/docs/javadoc"
+ */
 task api(type: Javadoc) {
 	group = "Documentation"
 	description = "Generates aggregated Javadoc API documentation."
 	title = "${rootProject.description} ${version} API"

 	dependsOn {
-		subprojects.collect {
+		moduleProjects.collect {
 			it.tasks.getByName("jar")
 		}
 	}
-	options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
-	options.author = true
-	options.header = rootProject.description
-	options.overview = "src/docs/api/overview.html"
-	options.stylesheetFile = file("src/docs/api/stylesheet.css")
-	options.splitIndex = true
-	options.links(project.ext.javadocLinks)
-	options.addStringOption('Xdoclint:none', '-quiet')
-
-	source subprojects.collect { project ->
-		project.sourceSets.main.allJava
-	}
-
-	maxMemory = "1024m"
-	destinationDir = new File(buildDir, "api")
-
 	doFirst {
 		classpath = files(
 				// ensure the javadoc process can resolve types compiled from .aj sources
 				project(":spring-aspects").sourceSets.main.output
 		)
-		classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
+		classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
 	}
-}

-// Need https://github.com/Kotlin/dokka/issues/184 to be fixed to avoid "Can't find node by signature" log spam
-dokka {
-	dependsOn {
-		subprojects.collect {
-			it.tasks.getByName("jar")
+	options {
+		encoding = "UTF-8"
+		memberLevel = JavadocMemberLevel.PROTECTED
+		author = true
+		header = rootProject.description
+		use = true
+		overview = "src/docs/api/overview.html"
+		stylesheetFile = file("src/docs/api/stylesheet.css")
+		splitIndex = true
+		links(project.ext.javadocLinks)
+		addStringOption('Xdoclint:none', '-quiet')
+		if(JavaVersion.current().isJava9Compatible()) {
+			addBooleanOption('html5', true)
 		}
 	}
-	doFirst {
-		classpath = subprojects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
-		classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
-
+	source moduleProjects.collect { project ->
+		project.sourceSets.main.allJava
 	}
-	moduleName = "spring-framework"
+	maxMemory = "1024m"
+	destinationDir = file("$buildDir/docs/javadoc")
+}
+
+/**
+ * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
+ */
+dokka {
+	dependsOn {
+		tasks.getByName("api")
+	}
+
+	doFirst {
+		configuration {
+			classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
+			classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
+
+			moduleProjects.findAll {
+				it.pluginManager.hasPlugin("kotlin")
+			}.each { project ->
+				def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
+				kotlinDirs -= project.sourceSets.main.java.srcDirs
+				kotlinDirs.each { dir ->
+					if (dir.exists()) {
+						sourceRoot {
+							path = dir.path
+						}
+					}
+				}
+			}
+		}
+	}
+
 	outputFormat = "html"
 	outputDirectory = "$buildDir/docs/kdoc"

-	sourceDirs = files(subprojects.collect { project ->
-		def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
-		kotlinDirs -= project.sourceSets.main.java.srcDirs
-	})
-	externalDocumentationLink {
-		url = new URL("http://projectreactor.io/docs/core/release/api/")
-	}
-	externalDocumentationLink {
-		url = new URL("http://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
+	configuration {
+		moduleName = "spring-framework"
+
+		externalDocumentationLink {
+			url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
+			packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
+		}
+		externalDocumentationLink {
+			url = new URL("https://projectreactor.io/docs/core/release/api/")
+		}
+		externalDocumentationLink {
+			url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
+		}
+		externalDocumentationLink {
+			url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
+		}
 	}
 }

+task downloadResources(type: Download) {
+	def version = "0.1.3.RELEASE"
+	src "https://repo.spring.io/release/io/spring/docresources/" +
+			"spring-doc-resources/$version/spring-doc-resources-${version}.zip"
+	dest project.file("$buildDir/docs/spring-doc-resources.zip")
+	onlyIfModified true
+	useETag "all"
+}
+
+task extractDocResources(type: Copy, dependsOn: downloadResources) {
+	from project.zipTree(downloadResources.dest);
+	into "$buildDir/docs/spring-docs-resources/"
+}
+
+asciidoctorj {
+	modules {
+		pdf {
+			version '1.5.0-beta.8'
+		}
+	}
+	fatalWarnings ".*"
+}
+
+/**
+ * Produce the Spring Framework Reference documentation
+ * from "src/docs/asciidoc" into  "build/asciidoc/html5"
+ */
 asciidoctor {
+	baseDirFollowsSourceDir()
+	configurations 'asciidoctorExt'
 	sources {
 		include '*.adoc'
 	}
+	outputDir "$buildDir/docs/ref-docs/"
 	resources {
 		from(sourceDir) {
-			include 'images/*', 'stylesheets/*', 'tocbot-3.0.2/*'
+			include 'images/*', 'css/**', 'js/**'
 		}
+		from extractDocResources
 	}
 	logDocuments = true
-	backends = ["html5"]
-	// only ouput PDF documentation for non-SNAPSHOT builds
-	if(!project.getVersion().toString().contains("BUILD-SNAPSHOT")) {
-		backends += "pdf"
+	outputOptions {
+		backends = ["html5", "pdf"]
 	}
 	options doctype: 'book', eruby: 'erubis'
-	attributes  'icons': 'font',
-			'idprefix': '',
-			'idseparator': '-',
-			docinfo: '',
+	attributes([
+			icons: 'font',
+			idprefix: '',
+			idseparator: '-',
+			docinfo: 'shared',
 			revnumber: project.version,
 			sectanchors: '',
 			sectnums: '',
-			'source-highlighter': 'coderay@', // TODO switch to 'rouge' once supported by the html5 backend
-			stylesdir: 'stylesheets/',
-			stylesheet: 'main.css',
+			'source-highlighter': 'highlight.js',
+			highlightjsdir: 'js/highlight',
+			'highlightjs-theme': 'github',
+			stylesdir: 'css/',
+			stylesheet: 'stylesheet.css',
 			'spring-version': project.version
-
+	])
 }

+/**
+ * Zip all docs (API and reference) into a single archive
+ */
 task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'dokka']) {
 	group = "Distribution"
-	baseName = "spring-framework"
-	classifier = "docs"
-	description = "Builds -${classifier} archive containing api and reference " +
-			"for deployment at http://docs.spring.io/spring-framework/docs."
+	description = "Builds -${archiveClassifier} archive containing api and reference " +
+			"for deployment at https://docs.spring.io/spring-framework/docs."

+	archiveBaseName.set("spring-framework")
+	archiveClassifier.set("docs")
 	from("src/dist") {
 		include "changelog.txt"
 	}
-
 	from (api) {
 		into "javadoc-api"
 	}
-
-	from (asciidoctor) {
+	from ("$asciidoctor.outputDir/html5") {
 		into "spring-framework-reference"
 	}
-
+	from ("$asciidoctor.outputDir/pdf") {
+		into "spring-framework-reference/pdf"
+	}
 	from (dokka) {
 		into "kdoc-api"
 	}
 }

+/**
+ * Zip all Spring Framework schemas into a single archive
+ */
 task schemaZip(type: Zip) {
 	group = "Distribution"
-	baseName = "spring-framework"
-	classifier = "schema"
-	description = "Builds -${classifier} archive containing all " +
-			"XSDs for deployment at http://springframework.org/schema."
-	duplicatesStrategy 'exclude'
-	moduleProjects.each { subproject ->
+	archiveBaseName.set("spring-framework")
+	archiveClassifier.set("schema")
+	description = "Builds -${archiveClassifier} archive containing all " +
+			"XSDs for deployment at https://springframework.org/schema."
+	duplicatesStrategy DuplicatesStrategy.EXCLUDE
+	moduleProjects.each { module ->
 		def Properties schemas = new Properties();

-		subproject.sourceSets.main.resources.find {
-			it.path.endsWith("META-INF/spring.schemas")
+		module.sourceSets.main.resources.find {
+			(it.path.endsWith("META-INF/spring.schemas") || it.path.endsWith("META-INF\\spring.schemas"))
 		}?.withInputStream { schemas.load(it) }

 		for (def key : schemas.keySet()) {
 			def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1')
 			assert shortName != key
-			File xsdFile = subproject.sourceSets.main.resources.find {
-				it.path.endsWith(schemas.get(key))
+			File xsdFile = module.sourceSets.main.resources.find {
+				(it.path.endsWith(schemas.get(key)) || it.path.endsWith(schemas.get(key).replaceAll('\\/','\\\\')))
 			}
 			assert xsdFile != null
 			into (shortName) {
@@ -159,15 +229,18 @@ task schemaZip(type: Zip) {
 	}
 }

+/**
+ * Create a distribution zip with everything:
+ * docs, schemas, jars, source jars, javadoc jars
+ */
 task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
-
 	group = "Distribution"
-	baseName = "spring-framework"
-	classifier = "dist"
-	description = "Builds -${classifier} archive, containing all jars and docs, " +
+	archiveBaseName.set("spring-framework")
+	archiveClassifier.set("dist")
+	description = "Builds -${archiveClassifier} archive, containing all jars and docs, " +
 			"suitable for community download page."

-	ext.baseDir = "${baseName}-${project.version}";
+	ext.baseDir = "spring-framework-${project.version}";

 	from("src/docs/dist") {
 		include "readme.txt"
@@ -185,49 +258,17 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		into "${baseDir}/schema"
 	}

-	moduleProjects.each { subproject ->
+	moduleProjects.each { module ->
 		into ("${baseDir}/libs") {
-			from subproject.jar
-			if (subproject.tasks.findByPath("sourcesJar")) {
-				from subproject.sourcesJar
+			from module.jar
+			if (module.tasks.findByPath("sourcesJar")) {
+				from module.sourcesJar
 			}
-			if (subproject.tasks.findByPath("javadocJar")) {
-				from subproject.javadocJar
+			if (module.tasks.findByPath("javadocJar")) {
+				from module.javadocJar
 			}
 		}
 	}
 }

-distZip.mustRunAfter subprojects.test
-
-// Create a distribution that contains all dependencies (required and optional).
-// Not published by default; only for use when building from source.
-task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
-	group = "Distribution"
-	baseName = "spring-framework"
-	classifier = "dist-with-deps"
-	description = "Builds -${classifier} archive, containing everything " +
-			"in the -${distZip.classifier} archive plus all runtime dependencies."
-
-	from zipTree(distZip.archivePath)
-
-	gradle.taskGraph.whenReady { taskGraph ->
-		if (taskGraph.hasTask(":${zipTask.name}")) {
-			def projectNames = rootProject.subprojects*.name
-			def artifacts = new HashSet()
-			subprojects.each { subproject ->
-				(subproject.configurations.runtime.resolvedConfiguration.resolvedArtifacts +
-						subproject.configurations.optional.resolvedConfiguration.resolvedArtifacts).each { artifact ->
-					def dependency = artifact.moduleVersion.id
-					if (!projectNames.contains(dependency.name)) {
-						artifacts << artifact.file
-					}
-				}
-			}
-
-			zipTask.from(artifacts) {
-				into "${distZip.baseDir}/deps"
-			}
-		}
-	}
-}
+distZip.mustRunAfter moduleProjects.check
@@ -1,9 +1,7 @@
 import org.gradle.plugins.ide.eclipse.model.ProjectDependency
 import org.gradle.plugins.ide.eclipse.model.SourceFolder

-
-apply plugin: "propdeps-eclipse"
-apply plugin: "propdeps-idea"
+apply plugin: "eclipse"

 eclipse.jdt {
 	sourceCompatibility = 1.8
@@ -11,7 +9,7 @@ eclipse.jdt {
 }

 // Replace classpath entries with project dependencies (GRADLE-1116)
-// http://issues.gradle.org/browse/GRADLE-1116
+// https://issues.gradle.org/browse/GRADLE-1116
 eclipse.classpath.file.whenMerged { classpath ->
 	def regexp = /.*?\/([^\/]+)\/build\/([^\/]+\/)+(?:main|test)/ // only match those that end in main or test (avoids removing necessary entries like build/classes/jaxb)
 	def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp }
@@ -91,6 +89,14 @@ task cleanEclipseJdtUi(type: Delete) {
 	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
 }

+task eclipseBuildship(type: Copy) {
+	from rootProject.files(
+		"src/eclipse/org.eclipse.jdt.ui.prefs",
+		"src/eclipse/org.eclipse.jdt.core.prefs")
+	into project.file('.settings/')
+	outputs.upToDateWhen { false }
+}
+
 tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
 tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
 tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent)
@@ -1,76 +0,0 @@
-/**
- * Generate a JDiff report between the current version and an older version.
- *
- * Usage:
- *  gradle jdiff -D OLD_VERSION=3.1.3.RELEASE -D OLD_VERSION_ROOT=/path/to/3.1.3.RELEASE
- *
- * View generated report at:
- *  build/reports/jdiff/changes.html
- *
- * @param OLD_VERSION required
- * @param OLD_VERSION_ROOT required, typically pointing to a separate git clone dir
- */
-task jdiff {
-	description = "Generates a JDiff report"
-	group = "Documentation"
-
-	def jdiffHome = "${rootProject.rootDir}/gradle/jdiff"
-
-	ant.taskdef(
-			name: "jdiff",
-			classname: "jdiff.JDiffAntTask",
-			classpath: "${jdiffHome}/antjdiff.jar")
-
-	def currentVersion = rootProject.version
-	def currentVersionRoot = rootProject.rootDir
-
-	def oldVersion = System.getProperty("OLD_VERSION")
-	def oldVersionRoot = System.getProperty("OLD_VERSION_ROOT")
-
-	def outputDir = "${rootProject.buildDir}/reports/jdiff/${oldVersion}_to_${currentVersion}"
-
-	doLast {
-		if (oldVersion == null)
-			throw new IllegalArgumentException(
-				"Set OLD_VERSION property to indicate older of the two versions being compared")
-		if (oldVersionRoot == null)
-			throw new IllegalArgumentException(
-				"Set OLD_VERSION_ROOT property to indicate the root directory for ${oldVersion}")
-
-		oldVersionRoot = new File(oldVersionRoot)
-
-		ant.property(name: "JDIFF_HOME", value: jdiffHome)
-		ant.mkdir(dir: outputDir)
-		ant.jdiff(
-				destdir: outputDir,
-				source: "1.8",
-				verbose: "off",
-				stats: "on",
-				docchanges: "off") {
-			old(name: "Spring Framework ${oldVersion}") {
-				oldVersionRoot.eachDirMatch( {
-						def candidate = new File(it)
-						candidate.name.matches("org.springframework.*") ||
-						candidate.name.matches("spring-.*") }) { match ->
-					match.eachDirRecurse { subdir ->
-						if (subdir.path ==~ '.*/src/main/java$') {
-							dirset(dir: subdir.path, includes: "org/**")
-						}
-					}
-				}
-			}
-			"new"(name: "Spring Framework ${currentVersion}") {
-				currentVersionRoot.eachDirMatch( {
-						def candidate = new File(it)
-						candidate.name.matches("org.springframework.*") ||
-						candidate.name.matches("spring-.*") }) { match ->
-					match.eachDirRecurse { subdir ->
-						if (subdir.path ==~ '.*/src/main/java$') {
-							dirset(dir: subdir.path, includes: "org/**")
-						}
-					}
-				}
-			}
-		}
-	}
-}
@@ -1,506 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-
-
@@ -1,9 +0,0 @@
-/**
- * This class is used only as a "null" argument for Javadoc when comparing
- * two API files. Javadoc has to have a package, .java or .class file as an
- * argument, even though JDiff doesn't use it.
- */
-public class Null {
-    public Null() {
-    }
-}
@@ -1,6 +0,0 @@
-This distribution of JDiff 1.1.1 is included in the Spring Framework build
-because JDiff has a hard requirement on a JDIFF_HOME directory containing
-jdiff.jar and xerces.jar as well as other presentation resources.
-
-The actual generation of JDiff reports is driven by the `jdiff` task declared
-in build.gradle in the project root.
@@ -1,59 +0,0 @@
-
-                           JDiff Doclet
-                           ------------
-
-                           Matthew Doar
-                          mdoar@pobox.com
-
-
-The JDiff doclet is used to generate a report describing the
-difference between two public Java APIs. 
-
-The file jdiff.html contains the reference page for JDiff.  The latest
-version of JDiff can be downloaded at:
-http://sourceforge.net/projects/javadiff
-
-To use the Ant task on your own project, see example.xml. More examples
-of using JDiff to compare the public APIs of J2SE1.3 and J2SE1.4 can
-be seen at http://www.jdiff.org
-
-For an example with the source distribution, run "ant" and
-look at the HTML output in ./build/reports/example/changes.html 
-The page at ./build/reports/example/changes/com.acme.sp.SPImpl.html
-shows what a typical page of changes looks like. 
-
-System Requirements
-------------------
-
-JDiff has been tested with all releases of Java since J2SE1.2 but
-releases of JDiff after 1.10.0 focus on JDK1.5.
-
-License
-------
-
-JDiff is licensed under the Lesser GNU General Public License (LGPL).
-See the file LICENSE.txt.
-
-Acknowledgements
----------------
-
-JDiff uses Stuart D. Gathman's Java translation of Gene Myers' O(ND) 
-difference algorithm.
-
-JDiff uses Xerces 1.4.2 from http://www.apache.org.
-
-JDiff also includes a script to use the classdoc application from
-http://classdoc.sourceforge.net or http://www.jensgulden.de, by Jens
-Gulden, (mail@jensgulden.de), to call a doclet such as jdiff on a .jar
-file rather than on source.
-
-Many thanks to the reviewers at Sun and Vitria who gave feedback on early
-versions of JDiff output, and also to the distillers of Laphroaig, and to
-Arturo Fuente for his consistently fine cigars which helped inspire
-much of this work.
-
-
-Footnote:
-
-If you are looking for a generalized diff tool for XML, try diffmk from
-http://wwws.sun.com/software/xml/developers/diffmk/
@@ -0,0 +1,55 @@
+apply plugin: "maven-publish"
+apply plugin: 'com.jfrog.artifactory'
+
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			pom {
+				afterEvaluate {
+					name = project.description
+					description = project.description
+				}
+				url = "https://github.com/spring-projects/spring-framework"
+				organization {
+					name = "Spring IO"
+					url = "https://spring.io/projects/spring-framework"
+				}
+				licenses {
+					license {
+						name = "Apache License, Version 2.0"
+						url = "https://www.apache.org/licenses/LICENSE-2.0"
+						distribution = "repo"
+					}
+				}
+				scm {
+					url = "https://github.com/spring-projects/spring-framework"
+					connection = "scm:git:git://github.com/spring-projects/spring-framework"
+					developerConnection = "scm:git:git://github.com/spring-projects/spring-framework"
+				}
+				developers {
+					developer {
+						id = "jhoeller"
+						name = "Juergen Hoeller"
+						email = "jhoeller@pivotal.io"
+					}
+				}
+				issueManagement {
+					system = "GitHub"
+					url = "https://github.com/spring-projects/spring-framework/issues"
+				}
+			}
+			versionMapping {
+				usage('java-api') {
+					fromResolutionResult()
+				}
+				usage('java-runtime') {
+					fromResolutionResult()
+				}
+			}
+		}
+	}
+}
+
+artifactoryPublish {
+	publications(publishing.publications.mavenJava)
+}
@@ -1,55 +0,0 @@
-apply plugin: "propdeps-maven"
-
-install {
-	repositories.mavenInstaller {
-		customizePom(pom, project)
-	}
-}
-
-def customizePom(pom, gradleProject) {
-	pom.whenConfigured { generatedPom ->
-		// eliminate test-scoped dependencies (no need in maven central poms)
-		generatedPom.dependencies.removeAll { dep ->
-			dep.scope == "test"
-		}
-
-		// sort to make pom dependencies order consistent to ease comparison of older poms
-		generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
-			"$dep.scope:$dep.groupId:$dep.artifactId"
-		}
-
-		// add all items necessary for maven central publication
-		generatedPom.project {
-			name = gradleProject.description
-			description = gradleProject.description
-			url = "https://github.com/spring-projects/spring-framework"
-			organization {
-				name = "Spring IO"
-				url = "http://projects.spring.io/spring-framework"
-			}
-			licenses {
-				license {
-					name "Apache License, Version 2.0"
-					url "http://www.apache.org/licenses/LICENSE-2.0"
-					distribution "repo"
-				}
-			}
-			scm {
-				url = "https://github.com/spring-projects/spring-framework"
-				connection = "scm:git:git://github.com/spring-projects/spring-framework"
-				developerConnection = "scm:git:git://github.com/spring-projects/spring-framework"
-			}
-			developers {
-				developer {
-					id = "jhoeller"
-					name = "Juergen Hoeller"
-					email = "jhoeller@pivotal.io"
-				}
-			}
-			issueManagement {
-				system = "Jira"
-				url = "https://jira.springsource.org/browse/SPR"
-			}
-		}
-	}
-}
@@ -0,0 +1,71 @@
+apply plugin: 'org.springframework.build.compile'
+apply plugin: 'org.springframework.build.optional-dependencies'
+apply from: "$rootDir/gradle/publications.gradle"
+
+jar {
+	manifest.attributes["Implementation-Title"] = project.name
+	manifest.attributes["Implementation-Version"] = project.version
+	manifest.attributes["Automatic-Module-Name"] = project.name.replace('-', '.')  // for Jigsaw
+	manifest.attributes["Created-By"] =
+			"${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})"
+
+	from("${rootDir}/src/docs/dist") {
+		include "license.txt"
+		include "notice.txt"
+		into "META-INF"
+		expand(copyright: new Date().format("yyyy"), version: project.version)
+	}
+}
+
+normalization {
+	runtimeClasspath {
+		ignore "META-INF/MANIFEST.MF"
+	}
+}
+
+javadoc {
+	description = "Generates project-level javadoc for use in -javadoc jar"
+
+	options.encoding = "UTF-8"
+	options.memberLevel = JavadocMemberLevel.PROTECTED
+	options.author = true
+	options.header = project.name
+	options.use = true
+	options.links(project.ext.javadocLinks)
+	options.addStringOption("Xdoclint:none", "-quiet")
+
+	// Suppress warnings due to cross-module @see and @link references.
+	// Note that global 'api' task does display all warnings.
+	logging.captureStandardError LogLevel.INFO
+	logging.captureStandardOutput LogLevel.INFO  // suppress "## warnings" message
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	archiveClassifier.set("sources")
+	from sourceSets.main.allSource
+	// Don't include or exclude anything explicitly by default. See SPR-12085.
+}
+
+task javadocJar(type: Jar) {
+	archiveClassifier.set("javadoc")
+	from javadoc
+}
+
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			from components.java
+			artifact sourcesJar
+			artifact javadocJar
+		}
+	}
+}
+
+// Disable publication of test fixture artifacts.
+//
+// Once we upgrade to Gradle 6.x, we will need to delete the following line ...
+components.java.variants.removeAll { it.outgoingConfiguration.name.startsWith("testFixtures") }
+// ... and uncomment the following two lines.
+// components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
+// components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh

+#
+# Copyright 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.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,8 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m $GRADLE_OPTS"
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -110,8 +125,8 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -14,8 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -1,122 +0,0 @@
-@echo off
-
-set CURRENT_DIR=%~dp0
-cd %CURRENT_DIR%
-
-cls
-
-echo.
-echo -----------------------------------------------------------------------
-echo Spring Framework - Eclipse/STS project import guide
-echo.
-echo This script will guide you through the process of importing the Spring
-echo Framework projects into Eclipse or the Spring Tool Suite (STS). It is
-echo recommended that you have a recent version of Eclipse or STS. As a bare
-echo minimum you will need Eclipse with full Java 8 support, the AspectJ
-echo Development Tools (AJDT), and the Groovy Compiler.
-echo.
-echo If you need to download and install Eclipse or STS, please do that now
-echo by visiting one of the following sites:
-echo.
-echo - Eclipse downloads: http://download.eclipse.org/eclipse/downloads
-echo - STS downloads: http://spring.io/tools/sts/all
-echo - STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html
-echo - ADJT: http://www.eclipse.org/ajdt/downloads/
-echo - Groovy Eclipse: https://github.com/groovy/groovy-eclipse/wiki
-echo.
-echo Otherwise, press enter and we'll begin.
-
-pause
-
-REM this command:
-REM - wipes out any existing Eclipse metadata
-REM - generates OXM test classes to avoid errors on import into Eclipse
-REM - generates metadata for all subprojects
-REM - skips metadata gen for the root project (-x :eclipse) to work
-REM   around Eclipse's inability to import hierarchical project structures
-REM SET COMMAND="./gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
-SET COMMAND=gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 1: Generate subproject Eclipse metadata
-echo. 
-echo The first step will be to generate Eclipse project metadata for each
-echo of the spring-* subprojects. This happens via the built-in
-echo "Gradle wrapper" script (./gradlew in this directory). If this is your
-echo first time using the Gradle wrapper, this step may take a few minutes
-echo while a Gradle distribution is downloaded for you.
-echo. 
-echo The command run will be:
-echo. 
-echo     %COMMAND%
-echo. 
-echo Press enter when ready.
-
-pause
-
-call %COMMAND%
-if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 2: Import subprojects into Eclipse/STS
-echo.
-echo Within Eclipse/STS, do the following:
-echo. 
-echo File ^> Import... ^> Existing Projects into Workspace
-echo      ^> When prompted for the 'root directory', provide %CURRENT_DIR%
-echo      ^> Press enter. You will see the modules show up under "Projects"
-echo      ^> All projects should be selected/checked. Click Finish.
-echo      ^> When the project import is complete, you should have no errors.
-echo.
-echo When the above is complete, return here and press the enter key.
-
-pause
-
-set COMMAND=gradlew --no-daemon :eclipse
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 3: generate root project Eclipse metadata
-echo. 
-echo Unfortunately, Eclipse does not allow for importing project
-echo hierarchies, so we had to skip root project metadata generation in the
-echo during step 1. In this step we simply generate root project metadata
-echo so you can import it in the next step.
-echo. 
-echo The command run will be:
-echo. 
-echo     %COMMAND%
-echo. 
-echo Press the enter key when ready.
-pause
-
-call %COMMAND%
-if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 4: Import root project into Eclipse/STS
-echo. 
-echo Follow the project import steps listed in step 2 above to import the
-echo root project.
-echo. 
-echo Press enter when complete, and move on to the final step.
-
-pause
-
-echo.
-echo -----------------------------------------------------------------------
-echo STEP 5: Enable Git support for all projects
-echo. 
-echo - In the Eclipse/STS Package Explorer, select all spring* projects.
-echo - Right-click to open the context menu and select Team ^> Share Project...
-echo - In the Share Project dialog that appears, select Git and press Next
-echo - Check "Use or create repository in parent folder of project"
-echo - Click Finish
-echo. 
-echo When complete, you'll have Git support enabled for all projects.
-echo. 
-echo You're ready to code! Goodbye!
-
@@ -0,0 +1,52 @@
+# Spring Framework - Eclipse/STS Project Import Guide
+
+This document will guide you through the process of importing the Spring Framework
+projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
+have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
+8 support, Eclipse Buildship, the Kotlin plugin, and the Groovy plugin.
+
+The following instructions have been tested against [STS](https://spring.io/tools) 4.3.2
+([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-432-changelog))
+(based on Eclipse 4.12) with [Eclipse Buildship](https://projects.eclipse.org/projects/tools.buildship).
+The instructions should work with the latest Eclipse distribution as long as you install
+[Buildship](https://marketplace.eclipse.org/content/buildship-gradle-integration). Note
+that STS 4 comes with Buildship preinstalled.
+
+## Steps
+
+_When instructed to execute `./gradlew` from the command line, be sure to execute it within your locally cloned `spring-framework` working directory._
+
+1. Ensure that Eclipse launches with JDK 8.
+   - For example, on Mac OS this can be configured in the `Info.plist` file located in the `Contents` folder of the installed Eclipse or STS application (e.g., the `Eclipse.app` file).
+1. Install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) in Eclipse.
+1. Install the [Eclipse Groovy Development Tools](https://github.com/groovy/groovy-eclipse/wiki) in Eclipse.
+1. Switch to Groovy 2.5 (Preferences -> Groovy -> Compiler -> Switch to 2.5...) in Eclipse.
+1. Change the _Forbidden reference (access rule)_ in Eclipse from Error to Warning
+(Preferences -> Java -> Compiler -> Errors/Warnings -> Deprecated and restricted API -> Forbidden reference (access rule)).
+1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project. The AspectJ Development Tools available in the Eclipse Marketplace have been tested with these instructions using STS 4.5 (Eclipse 4.14).
+1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute TestNG tests in the `spring-test` module.
+1. Build `spring-oxm` from the command line with `./gradlew :spring-oxm:check`.
+1. To apply project specific settings, run `./gradlew eclipseBuildship` from the command line.
+1. Import into Eclipse (File -> Import -> Gradle -> Existing Gradle Project -> Navigate to the locally cloned `spring-framework` directory -> Select Finish).
+   - If you have not installed AJDT, exclude the `spring-aspects` project from the import, if prompted, or close it after the import.
+   - If you run into errors during the import, you may need to set the _Java home_ for Gradle Buildship to the location of your JDK 8 installation in Eclipse (Preferences -> Gradle -> Java home).
+1. If you need to execute JAXB-related tests in the `spring-oxm` project and wish to have the generated sources available, add the `build/generated-sources/jaxb` folder to the build path (right click on the `jaxb` folder and select `Build Path -> Use as Source Folder`).
+   - If you do not see the `build` folder in the `spring-oxm` project, ensure that the "Gradle build folder" is not filtered out from the view. This setting is available under "Filters" in the configuration of the Package Explorer (available by clicking on the small downward facing arrow in the upper right corner of the Package Explorer).
+1. Code away!
+
+## Known Issues
+
+1. `spring-core` and `spring-oxm` should be pre-compiled due to repackaged dependencies.
+   - See `*RepackJar` tasks in the build.
+1. `spring-aspects` does not compile due to references to aspect types unknown to Eclipse.
+   - If you installed _AJDT_ into Eclipse it should work.
+1. While JUnit tests pass from the command line with Gradle, some may fail when run from
+   the IDE.
+   - Resolving this is a work in progress.
+   - If attempting to run all JUnit tests from within the IDE, you may need to set the following VM options to avoid out of memory errors: `-XX:MaxPermSize=2048m -Xmx2048m -XX:MaxHeapSize=2048m`
+
+## Tips
+
+In any case, please do not check in your own generated `.classpath` file, `.project`
+file, or `.settings` folder. You'll notice these files are already intentionally in
+`.gitignore`. The same policy holds for IDEA metadata.
@@ -1,129 +0,0 @@
-cd `dirname $0`
-clear
-cat <<EOM
-
------------------------------------------------------------------------
-Spring Framework - Eclipse/STS Project Import Guide
-
-This script will guide you through the process of importing the Spring
-Framework projects into Eclipse or the Spring Tool Suite (STS). It is
-recommended that you have a recent version of Eclipse or STS. As a bare
-minimum you will need Eclipse with full Java 8 support, the AspectJ
-Development Tools (AJDT), and the Groovy Compiler.
-
-This script has been tested against:
-
- STS:     3.8.3.RELEASE (Eclipse Neon.2 4.6.2)
- AJDT:    2.2.4.201612122115 (Eclipse Neon 4.6)
-
-If you need to download and install Eclipse or STS, please do that now
-by visiting one of the following sites:
-
- Eclipse downloads: http://download.eclipse.org/eclipse/downloads
- STS downloads: http://spring.io/tools/sts/all
- STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html
- ADJT: http://www.eclipse.org/ajdt/downloads/
- Groovy Eclipse: https://github.com/groovy/groovy-eclipse/wiki
-
-Once Eclipse/STS is installed, press enter, and we'll begin.
-EOM
-
-read
-
-# this command:
-# - wipes out any existing Eclipse metadata
-# - generates OXM test classes to avoid errors on import into Eclipse
-# - generates metadata for all subprojects
-# - skips metadata gen for the root project (-x :eclipse) to work
-#   around Eclipse's inability to import hierarchical project structures
-COMMAND="./gradlew --no-daemon cleanEclipse :spring-oxm:compileTestJava eclipse -x :eclipse"
-
-cat <<EOM
-
------------------------------------------------------------------------
-STEP 1: Generate subproject Eclipse metadata
-
-The first step will be to generate Eclipse project metadata for each of
-the spring-* subprojects. This happens via the built-in "Gradle wrapper"
-script (./gradlew in this directory). If this is your first time using
-the Gradle wrapper, this step may take a few minutes while a Gradle
-distribution is downloaded for you.
-
-The command run will be:
-
-    $COMMAND
-
-Press enter when ready.
-EOM
-
-read
-
-$COMMAND || exit
-
-cat <<EOM
-
------------------------------------------------------------------------
-STEP 2: Import subprojects into Eclipse/STS
-
-Within Eclipse/STS, do the following:
-
- File > Import... > Existing Projects into Workspace
- When prompted for the 'root directory', provide $PWD.
- Press enter. You will see the modules show up under "Projects".
- All projects should be selected/checked. Click Finish.
- When the project import is complete, you should have no errors.
-
-When the above is complete, return here and press the enter key.
-EOM
-
-read
-
-COMMAND="./gradlew --no-daemon :eclipse"
-
-cat <<EOM
-
------------------------------------------------------------------------
-STEP 3: Generate root project Eclipse metadata
-
-Unfortunately, Eclipse does not support importing project hierarchies,
-so we had to skip root project metadata generation during step 1. In
-this step we simply generate root project metadata so that you can
-import it in the next step.
-
-The command run will be:
-
-    $COMMAND
-
-Press the enter key when ready.
-EOM
-
-read
-
-$COMMAND || exit
-
-cat <<EOM
------------------------------------------------------------------------
-STEP 4: Import root project into Eclipse/STS
-
-Follow the project import steps listed in step 2 above to import the
-root "spring" project.
-
-Press enter when complete, and move on to the final step.
-EOM
-
-read
-
-cat <<EOM
------------------------------------------------------------------------
-STEP 5: Enable Git support for all projects
-
- In the Eclipse/STS Package Explorer, select all spring* projects.
- Right-click to open the context menu and select Team > Share Project...
- In the Share Project dialog that appears, select Git and press Next.
- Check "Use or create repository in parent folder of project".
- Click Finish.
-
-When complete, you'll have Git support enabled for all projects.
-
-You're ready to code! Goodbye!
-EOM
@@ -14,7 +14,7 @@ _Within your locally cloned spring-framework working directory:_
 1. `spring-core` and `spring-oxm` should be pre-compiled due to repackaged dependencies.
 See `*RepackJar` tasks in the build and https://youtrack.jetbrains.com/issue/IDEA-160605).
 2. `spring-aspects` does not compile due to references to aspect types unknown to
-IntelliJ IDEA. See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the
+IntelliJ IDEA. See https://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the
 'spring-aspects' can be excluded from the project to avoid compilation errors.
 3. While JUnit tests pass from the command line with Gradle, some may fail when run from
 IntelliJ IDEA. Resolving this is a work in progress. If attempting to run all JUnit tests from within
@@ -31,6 +31,6 @@ You'll notice these files are already intentionally in .gitignore. The same poli

 ## FAQ

-Q. What about IntelliJ IDEA's own [Gradle support](http://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?
+Q. What about IntelliJ IDEA's own [Gradle support](https://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?

-A. Keep an eye on http://youtrack.jetbrains.com/issue/IDEA-53476
+A. Keep an eye on https://youtrack.jetbrains.com/issue/IDEA-53476
@@ -0,0 +1,30 @@
+description = "Spring Integration Tests"
+
+dependencies {
+	testCompile(project(":spring-aop"))
+	testCompile(project(":spring-beans"))
+	testCompile(project(":spring-context"))
+	testCompile(project(":spring-core"))
+	testCompile(testFixtures(project(":spring-aop")))
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-core")))
+	testCompile(testFixtures(project(":spring-tx")))
+	testCompile(project(":spring-expression"))
+	testCompile(project(":spring-jdbc"))
+	testCompile(project(":spring-orm"))
+	testCompile(project(":spring-test"))
+	testCompile(project(":spring-tx"))
+	testCompile(project(":spring-web"))
+	testCompile("javax.inject:javax.inject")
+	testCompile("javax.resource:javax.resource-api")
+	testCompile("javax.servlet:javax.servlet-api")
+	testCompile("org.aspectj:aspectjweaver")
+	testCompile("org.hsqldb:hsqldb")
+	testCompile("org.hibernate:hibernate-core")
+}
+
+normalization {
+	runtimeClasspath {
+		ignore "META-INF/MANIFEST.MF"
+	}
+}
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.config;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.testfixture.beans.ITestBean;
+import org.springframework.beans.testfixture.beans.TestBean;
+import org.springframework.core.testfixture.io.SerializationTestUtils;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for scoped proxy use in conjunction with aop: namespace.
+ * Deemed an integration test because .web mocks and application contexts are required.
+ *
+ * @author Rob Harrop
+ * @author Juergen Hoeller
+ * @author Chris Beams
+ * @see org.springframework.aop.config.AopNamespaceHandlerTests
+ */
+@SpringJUnitWebConfig
+class AopNamespaceHandlerScopeIntegrationTests {
+
+	@Autowired
+	ITestBean singletonScoped;
+
+	@Autowired
+	ITestBean requestScoped;
+
+	@Autowired
+	ITestBean sessionScoped;
+
+	@Autowired
+	ITestBean sessionScopedAlias;
+
+	@Autowired
+	ITestBean testBean;
+
+
+	@Test
+	void testSingletonScoping() throws Exception {
+		assertThat(AopUtils.isAopProxy(singletonScoped)).as("Should be AOP proxy").isTrue();
+		boolean condition = singletonScoped instanceof TestBean;
+		assertThat(condition).as("Should be target class proxy").isTrue();
+		String rob = "Rob Harrop";
+		String bram = "Bram Smeets";
+		assertThat(singletonScoped.getName()).isEqualTo(rob);
+		singletonScoped.setName(bram);
+		assertThat(singletonScoped.getName()).isEqualTo(bram);
+		ITestBean deserialized = (ITestBean) SerializationTestUtils.serializeAndDeserialize(singletonScoped);
+		assertThat(deserialized.getName()).isEqualTo(bram);
+	}
+
+	@Test
+	void testRequestScoping() throws Exception {
+		MockHttpServletRequest oldRequest = new MockHttpServletRequest();
+		MockHttpServletRequest newRequest = new MockHttpServletRequest();
+
+		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(oldRequest));
+
+		assertThat(AopUtils.isAopProxy(requestScoped)).as("Should be AOP proxy").isTrue();
+		boolean condition = requestScoped instanceof TestBean;
+		assertThat(condition).as("Should be target class proxy").isTrue();
+
+		assertThat(AopUtils.isAopProxy(testBean)).as("Should be AOP proxy").isTrue();
+		boolean condition1 = testBean instanceof TestBean;
+		assertThat(condition1).as("Regular bean should be JDK proxy").isFalse();
+
+		String rob = "Rob Harrop";
+		String bram = "Bram Smeets";
+
+		assertThat(requestScoped.getName()).isEqualTo(rob);
+		requestScoped.setName(bram);
+		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(newRequest));
+		assertThat(requestScoped.getName()).isEqualTo(rob);
+		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(oldRequest));
+		assertThat(requestScoped.getName()).isEqualTo(bram);
+
+		assertThat(((Advised) requestScoped).getAdvisors().length > 0).as("Should have advisors").isTrue();
+	}
+
+	@Test
+	void testSessionScoping() throws Exception {
+		MockHttpSession oldSession = new MockHttpSession();
+		MockHttpSession newSession = new MockHttpSession();
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setSession(oldSession);
+		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+		assertThat(AopUtils.isAopProxy(sessionScoped)).as("Should be AOP proxy").isTrue();
+		boolean condition1 = sessionScoped instanceof TestBean;
+		assertThat(condition1).as("Should not be target class proxy").isFalse();
+
+		assertThat(sessionScopedAlias).isSameAs(sessionScoped);
+
+		assertThat(AopUtils.isAopProxy(testBean)).as("Should be AOP proxy").isTrue();
+		boolean condition = testBean instanceof TestBean;
+		assertThat(condition).as("Regular bean should be JDK proxy").isFalse();
+
+		String rob = "Rob Harrop";
+		String bram = "Bram Smeets";
+
+		assertThat(sessionScoped.getName()).isEqualTo(rob);
+		sessionScoped.setName(bram);
+		request.setSession(newSession);
+		assertThat(sessionScoped.getName()).isEqualTo(rob);
+		request.setSession(oldSession);
+		assertThat(sessionScoped.getName()).isEqualTo(bram);
+
+		assertThat(((Advised) sessionScoped).getAdvisors().length > 0).as("Should have advisors").isTrue();
+	}
+
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2013 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,41 +16,40 @@

 package org.springframework.aop.framework.autoproxy;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.List;

 import javax.servlet.ServletException;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.advice.MethodCounter;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.lang.Nullable;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.advice.MethodCounter;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
-import org.springframework.tests.sample.beans.ITestBean;
-import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.NoTransactionException;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
+import org.springframework.transaction.testfixture.CallCountingTransactionManager;
+
+import static org.assertj.core.api.Assertions.assertThat;

 /**
 * Integration tests for auto proxy creation by advisor recognition working in
- * conjunction with transaction managment resources.
+ * conjunction with transaction management resources.
 *
 * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorTests
 *
 * @author Rod Johnson
 * @author Chris Beams
 */
-public class AdvisorAutoProxyCreatorIntegrationTests {
+class AdvisorAutoProxyCreatorIntegrationTests {

 	private static final Class<?> CLASS = AdvisorAutoProxyCreatorIntegrationTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
@@ -68,95 +67,95 @@ public class AdvisorAutoProxyCreatorIntegrationTests {
 	}

 	@Test
-	public void testDefaultExclusionPrefix() throws Exception {
+	void testDefaultExclusionPrefix() throws Exception {
 		DefaultAdvisorAutoProxyCreator aapc = (DefaultAdvisorAutoProxyCreator) getBeanFactory().getBean(ADVISOR_APC_BEAN_NAME);
-		assertEquals(ADVISOR_APC_BEAN_NAME + DefaultAdvisorAutoProxyCreator.SEPARATOR, aapc.getAdvisorBeanNamePrefix());
-		assertFalse(aapc.isUsePrefix());
+		assertThat(aapc.getAdvisorBeanNamePrefix()).isEqualTo((ADVISOR_APC_BEAN_NAME + DefaultAdvisorAutoProxyCreator.SEPARATOR));
+		assertThat(aapc.isUsePrefix()).isFalse();
 	}

 	/**
 	 * If no pointcuts match (no attrs) there should be proxying.
 	 */
 	@Test
-	public void testNoProxy() throws Exception {
+	void testNoProxy() throws Exception {
 		BeanFactory bf = getBeanFactory();
 		Object o = bf.getBean("noSetters");
-		assertFalse(AopUtils.isAopProxy(o));
+		assertThat(AopUtils.isAopProxy(o)).isFalse();
 	}

 	@Test
-	public void testTxIsProxied() throws Exception {
+	void testTxIsProxied() throws Exception {
 		BeanFactory bf = getBeanFactory();
 		ITestBean test = (ITestBean) bf.getBean("test");
-		assertTrue(AopUtils.isAopProxy(test));
+		assertThat(AopUtils.isAopProxy(test)).isTrue();
 	}

 	@Test
-	public void testRegexpApplied() throws Exception {
+	void testRegexpApplied() throws Exception {
 		BeanFactory bf = getBeanFactory();
 		ITestBean test = (ITestBean) bf.getBean("test");
 		MethodCounter counter = (MethodCounter) bf.getBean("countingAdvice");
-		assertEquals(0, counter.getCalls());
+		assertThat(counter.getCalls()).isEqualTo(0);
 		test.getName();
-		assertEquals(1, counter.getCalls());
+		assertThat(counter.getCalls()).isEqualTo(1);
 	}

 	@Test
-	public void testTransactionAttributeOnMethod() throws Exception {
+	void testTransactionAttributeOnMethod() throws Exception {
 		BeanFactory bf = getBeanFactory();
 		ITestBean test = (ITestBean) bf.getBean("test");

 		CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME);
 		OrderedTxCheckAdvisor txc = (OrderedTxCheckAdvisor) bf.getBean("orderedBeforeTransaction");
-		assertEquals(0, txc.getCountingBeforeAdvice().getCalls());
+		assertThat(txc.getCountingBeforeAdvice().getCalls()).isEqualTo(0);

-		assertEquals(0, txMan.commits);
-		assertEquals("Initial value was correct", 4, test.getAge());
+		assertThat(txMan.commits).isEqualTo(0);
+		assertThat(test.getAge()).as("Initial value was correct").isEqualTo(4);
 		int newAge = 5;
 		test.setAge(newAge);
-		assertEquals(1, txc.getCountingBeforeAdvice().getCalls());
+		assertThat(txc.getCountingBeforeAdvice().getCalls()).isEqualTo(1);

-		assertEquals("New value set correctly", newAge, test.getAge());
-		assertEquals("Transaction counts match", 1, txMan.commits);
+		assertThat(test.getAge()).as("New value set correctly").isEqualTo(newAge);
+		assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);
 	}

 	/**
 	 * Should not roll back on servlet exception.
 	 */
 	@Test
-	public void testRollbackRulesOnMethodCauseRollback() throws Exception {
+	void testRollbackRulesOnMethodCauseRollback() throws Exception {
 		BeanFactory bf = getBeanFactory();
 		Rollback rb = (Rollback) bf.getBean("rollback");

 		CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME);
 		OrderedTxCheckAdvisor txc = (OrderedTxCheckAdvisor) bf.getBean("orderedBeforeTransaction");
-		assertEquals(0, txc.getCountingBeforeAdvice().getCalls());
+		assertThat(txc.getCountingBeforeAdvice().getCalls()).isEqualTo(0);

-		assertEquals(0, txMan.commits);
+		assertThat(txMan.commits).isEqualTo(0);
 		rb.echoException(null);
 		// Fires only on setters
-		assertEquals(0, txc.getCountingBeforeAdvice().getCalls());
-		assertEquals("Transaction counts match", 1, txMan.commits);
+		assertThat(txc.getCountingBeforeAdvice().getCalls()).isEqualTo(0);
+		assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);

-		assertEquals(0, txMan.rollbacks);
+		assertThat(txMan.rollbacks).isEqualTo(0);
 		Exception ex = new Exception();
 		try {
 			rb.echoException(ex);
 		}
 		catch (Exception actual) {
-			assertEquals(ex, actual);
+			assertThat(actual).isEqualTo(ex);
 		}
-		assertEquals("Transaction counts match", 1, txMan.rollbacks);
+		assertThat(txMan.rollbacks).as("Transaction counts match").isEqualTo(1);
 	}

 	@Test
-	public void testRollbackRulesOnMethodPreventRollback() throws Exception {
+	void testRollbackRulesOnMethodPreventRollback() throws Exception {
 		BeanFactory bf = getBeanFactory();
 		Rollback rb = (Rollback) bf.getBean("rollback");

 		CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME);

-		assertEquals(0, txMan.commits);
+		assertThat(txMan.commits).isEqualTo(0);
 		// Should NOT roll back on ServletException
 		try {
 			rb.echoException(new ServletException());
@@ -164,25 +163,26 @@ public class AdvisorAutoProxyCreatorIntegrationTests {
 		catch (ServletException ex) {

 		}
-		assertEquals("Transaction counts match", 1, txMan.commits);
+		assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);
 	}

 	@Test
-	public void testProgrammaticRollback() throws Exception {
+	void testProgrammaticRollback() throws Exception {
 		BeanFactory bf = getBeanFactory();

 		Object bean = bf.getBean(TXMANAGER_BEAN_NAME);
-		assertTrue(bean instanceof CallCountingTransactionManager);
+		boolean condition = bean instanceof CallCountingTransactionManager;
+		assertThat(condition).isTrue();
 		CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME);

 		Rollback rb = (Rollback) bf.getBean("rollback");
-		assertEquals(0, txMan.commits);
+		assertThat(txMan.commits).isEqualTo(0);
 		rb.rollbackOnly(false);
-		assertEquals("Transaction counts match", 1, txMan.commits);
-		assertEquals(0, txMan.rollbacks);
+		assertThat(txMan.commits).as("Transaction counts match").isEqualTo(1);
+		assertThat(txMan.rollbacks).isEqualTo(0);
 		// Will cause rollback only
 		rb.rollbackOnly(true);
-		assertEquals(1, txMan.rollbacks);
+		assertThat(txMan.rollbacks).isEqualTo(1);
 	}

 }
@@ -290,7 +290,6 @@ class Rollback {
 	/**
 	 * Inherits transaction attribute.
 	 * Illustrates programmatic rollback.
-	 * @param rollbackOnly
 	 */
 	public void rollbackOnly(boolean rollbackOnly) {
 		if (rollbackOnly) {
@@ -311,8 +310,9 @@ class Rollback {
 	 * @org.springframework.transaction.interceptor.NoRollbackRule ( "ServletException" )
 	 */
 	public void echoException(Exception ex) throws Exception {
-		if (ex != null)
+		if (ex != null) {
 			throw ex;
+		}
 	}

 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,12 +14,13 @@
 * limitations under the License.
 */

-package com.foo;
+package org.springframework.beans.factory.xml;

 import java.util.ArrayList;
 import java.util.List;

 public class Component {
+
 	private String name;
 	private List<Component> components = new ArrayList<>();

@@ -39,4 +40,5 @@ public class Component {
 	public void setName(String name) {
 		this.name = name;
 	}
+
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2017 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.foo;
+package org.springframework.beans.factory.xml;

 import java.util.List;

@@ -24,8 +24,6 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.xml.DomUtils;

@@ -0,0 +1,81 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.xml;
+
+import java.util.List;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Costin Leau
+ */
+@TestInstance(Lifecycle.PER_CLASS)
+class ComponentBeanDefinitionParserTests {
+
+	private final DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+
+	@BeforeAll
+	void setUp() throws Exception {
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+			new ClassPathResource("component-config.xml", ComponentBeanDefinitionParserTests.class));
+	}
+
+	@AfterAll
+	void tearDown() {
+		bf.destroySingletons();
+	}
+
+	@Test
+	void testBionicBasic() {
+		Component cp = getBionicFamily();
+		assertThat("Bionic-1").isEqualTo(cp.getName());
+	}
+
+	@Test
+	void testBionicFirstLevelChildren() {
+		Component cp = getBionicFamily();
+		List<Component> components = cp.getComponents();
+		assertThat(2).isEqualTo(components.size());
+		assertThat("Mother-1").isEqualTo(components.get(0).getName());
+		assertThat("Rock-1").isEqualTo(components.get(1).getName());
+	}
+
+	@Test
+	void testBionicSecondLevelChildren() {
+		Component cp = getBionicFamily();
+		List<Component> components = cp.getComponents().get(0).getComponents();
+		assertThat(2).isEqualTo(components.size());
+		assertThat("Karate-1").isEqualTo(components.get(0).getName());
+		assertThat("Sport-1").isEqualTo(components.get(1).getName());
+	}
+
+	private Component getBionicFamily() {
+		return bf.getBean("bionic-family", Component.class);
+	}
+
+}
+
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2013 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,13 +14,14 @@
 * limitations under the License.
 */

-package com.foo;
+package org.springframework.beans.factory.xml;

 import java.util.List;

 import org.springframework.beans.factory.FactoryBean;

 public class ComponentFactoryBean implements FactoryBean<Component> {
+
 	private Component parent;
 	private List<Component> children;

@@ -51,4 +52,5 @@ public class ComponentFactoryBean implements FactoryBean<Component> {
 	public boolean isSingleton() {
 		return true;
 	}
+
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2013 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,14 +14,12 @@
 * limitations under the License.
 */

-package com.foo;
-
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+package org.springframework.beans.factory.xml;

 public class ComponentNamespaceHandler extends NamespaceHandlerSupport {
+
 	@Override
 	public void init() {
-		registerBeanDefinitionParser("component",
-				new ComponentBeanDefinitionParser());
+		registerBeanDefinitionParser("component", new ComponentBeanDefinitionParser());
 	}
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2014 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,7 +19,7 @@ package org.springframework.cache.annotation;
 import java.util.Collections;
 import java.util.List;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
@@ -33,8 +33,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Repository;

-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
 * Integration tests for the @EnableCaching annotation.
@@ -43,52 +43,52 @@ import static org.junit.Assert.*;
 * @since 3.1
 */
@SuppressWarnings("resource")
-public class EnableCachingIntegrationTests {
+class EnableCachingIntegrationTests {

 	@Test
-	public void repositoryIsClassBasedCacheProxy() {
+	void repositoryIsClassBasedCacheProxy() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, ProxyTargetClassCachingConfig.class);
 		ctx.refresh();

 		assertCacheProxying(ctx);
-		assertThat(AopUtils.isCglibProxy(ctx.getBean(FooRepository.class)), is(true));
+		assertThat(AopUtils.isCglibProxy(ctx.getBean(FooRepository.class))).isTrue();
 	}

 	@Test
-	public void repositoryUsesAspectJAdviceMode() {
+	void repositoryUsesAspectJAdviceMode() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, AspectJCacheConfig.class);
-		try {
-			ctx.refresh();
-		}
-		catch (Exception ex) {
-			// 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.
-			assertTrue(ex.getMessage().contains("AspectJCachingConfiguration"));
-		}
+		// 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.
+		assertThatExceptionOfType(Exception.class).isThrownBy(
+				ctx::refresh)
+			.withMessageContaining("AspectJCachingConfiguration");
 	}

+
 	private void assertCacheProxying(AnnotationConfigApplicationContext ctx) {
 		FooRepository repo = ctx.getBean(FooRepository.class);
+		assertThat(isCacheProxy(repo)).isTrue();
+	}

-		boolean isCacheProxy = false;
+	private boolean isCacheProxy(FooRepository repo) {
 		if (AopUtils.isAopProxy(repo)) {
 			for (Advisor advisor : ((Advised)repo).getAdvisors()) {
 				if (advisor instanceof BeanFactoryCacheOperationSourceAdvisor) {
-					isCacheProxy = true;
-					break;
+					return true;
 				}
 			}
 		}
-		assertTrue("FooRepository is not a cache proxy", isCacheProxy);
+		return false;
 	}


 	@Configuration
 	@EnableCaching(proxyTargetClass=true)
 	static class ProxyTargetClassCachingConfig {
+
 		@Bean
 		CacheManager mgr() {
 			return new NoOpCacheManager();
@@ -98,6 +98,7 @@ public class EnableCachingIntegrationTests {

 	@Configuration
 	static class Config {
+
 		@Bean
 		FooRepository fooRepository() {
 			return new DummyFooRepository();
@@ -108,6 +109,7 @@ public class EnableCachingIntegrationTests {
 	@Configuration
 	@EnableCaching(mode=AdviceMode.ASPECTJ)
 	static class AspectJCacheConfig {
+
 		@Bean
 		CacheManager cacheManager() {
 			return new NoOpCacheManager();
@@ -116,6 +118,7 @@ public class EnableCachingIntegrationTests {


 	interface FooRepository {
+
 		List<Object> findAll();
 	}

@@ -129,4 +132,5 @@ public class EnableCachingIntegrationTests {
 			return Collections.emptyList();
 		}
 	}
+
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2013 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,13 +20,13 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import javax.inject.Named;
 import javax.inject.Singleton;

-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
@@ -42,12 +42,14 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.support.GenericWebApplicationContext;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Mark Fisher
 * @author Juergen Hoeller
 * @author Chris Beams
 */
-public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
+class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {

 	private static final String DEFAULT_NAME = "default";

@@ -62,8 +64,8 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 	private ServletRequestAttributes newRequestAttributesWithSession;


-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setup() {
 		this.oldRequestAttributes = new ServletRequestAttributes(new MockHttpServletRequest());
 		this.newRequestAttributes = new ServletRequestAttributes(new MockHttpServletRequest());

@@ -76,223 +78,228 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 		this.newRequestAttributesWithSession = new ServletRequestAttributes(newRequestWithSession);
 	}

-	@After
-	public void tearDown() throws Exception {
+	@AfterEach
+	void reset() {
 		RequestContextHolder.setRequestAttributes(null);
 	}


 	@Test
-	public void testPrototype() {
+	void testPrototype() {
 		ApplicationContext context = createContext(ScopedProxyMode.NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("prototype");
-		assertNotNull(bean);
-		assertTrue(context.isPrototype("prototype"));
-		assertFalse(context.isSingleton("prototype"));
+		assertThat(bean).isNotNull();
+		assertThat(context.isPrototype("prototype")).isTrue();
+		assertThat(context.isSingleton("prototype")).isFalse();
 	}

 	@Test
-	public void testSingletonScopeWithNoProxy() {
+	void testSingletonScopeWithNoProxy() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(ScopedProxyMode.NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton");
-		assertTrue(context.isSingleton("singleton"));
-		assertFalse(context.isPrototype("singleton"));
+		assertThat(context.isSingleton("singleton")).isTrue();
+		assertThat(context.isPrototype("singleton")).isFalse();

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// singleton bean, so name should be modified even after lookup
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("singleton");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void testSingletonScopeIgnoresProxyInterfaces() {
+	void testSingletonScopeIgnoresProxyInterfaces() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(ScopedProxyMode.INTERFACES);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// singleton bean, so name should be modified even after lookup
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("singleton");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void testSingletonScopeIgnoresProxyTargetClass() {
+	void testSingletonScopeIgnoresProxyTargetClass() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(ScopedProxyMode.TARGET_CLASS);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// singleton bean, so name should be modified even after lookup
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("singleton");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void testRequestScopeWithNoProxy() {
+	void testRequestScopeWithNoProxy() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(ScopedProxyMode.NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("request");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// but a newly retrieved bean should have the default name
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("request");
-		assertEquals(DEFAULT_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(DEFAULT_NAME);
 	}

 	@Test
-	public void testRequestScopeWithProxiedInterfaces() {
+	void testRequestScopeWithProxiedInterfaces() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(ScopedProxyMode.INTERFACES);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("request");

 		// should be dynamic proxy, implementing both interfaces
-		assertTrue(AopUtils.isJdkDynamicProxy(bean));
-		assertTrue(bean instanceof AnotherScopeTestInterface);
+		assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue();
+		boolean condition = bean instanceof AnotherScopeTestInterface;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void testRequestScopeWithProxiedTargetClass() {
+	void testRequestScopeWithProxiedTargetClass() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(ScopedProxyMode.TARGET_CLASS);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("request");

 		// should be a class-based proxy
-		assertTrue(AopUtils.isCglibProxy(bean));
-		assertTrue(bean instanceof RequestScopedTestBean);
+		assertThat(AopUtils.isCglibProxy(bean)).isTrue();
+		boolean condition = bean instanceof RequestScopedTestBean;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void testSessionScopeWithNoProxy() {
+	void testSessionScopeWithNoProxy() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
 		ApplicationContext context = createContext(ScopedProxyMode.NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("session");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// but a newly retrieved bean should have the default name
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("session");
-		assertEquals(DEFAULT_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(DEFAULT_NAME);
 	}

 	@Test
-	public void testSessionScopeWithProxiedInterfaces() {
+	void testSessionScopeWithProxiedInterfaces() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
 		ApplicationContext context = createContext(ScopedProxyMode.INTERFACES);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("session");

 		// should be dynamic proxy, implementing both interfaces
-		assertTrue(AopUtils.isJdkDynamicProxy(bean));
-		assertTrue(bean instanceof AnotherScopeTestInterface);
+		assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue();
+		boolean condition = bean instanceof AnotherScopeTestInterface;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		IScopedTestBean bean2 = (IScopedTestBean) context.getBean("session");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 		bean2.setName(DEFAULT_NAME);
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void testSessionScopeWithProxiedTargetClass() {
+	void testSessionScopeWithProxiedTargetClass() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
 		ApplicationContext context = createContext(ScopedProxyMode.TARGET_CLASS);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("session");

 		// should be a class-based proxy
-		assertTrue(AopUtils.isCglibProxy(bean));
-		assertTrue(bean instanceof ScopedTestBean);
-		assertTrue(bean instanceof SessionScopedTestBean);
+		assertThat(AopUtils.isCglibProxy(bean)).isTrue();
+		boolean condition1 = bean instanceof ScopedTestBean;
+		assertThat(condition1).isTrue();
+		boolean condition = bean instanceof SessionScopedTestBean;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		IScopedTestBean bean2 = (IScopedTestBean) context.getBean("session");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 		bean2.setName(DEFAULT_NAME);
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}


@@ -335,12 +342,12 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 	}


- 	public static interface IScopedTestBean {
+	public interface IScopedTestBean {

- 		String getName();
+		String getName();

- 		void setName(String name);
- 	}
+		void setName(String name);
+	}


 	public static abstract class ScopedTestBean implements IScopedTestBean {
@@ -366,7 +373,7 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 	}


-	public static interface AnotherScopeTestInterface {
+	public interface AnotherScopeTestInterface {
 	}


@@ -385,14 +392,14 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
 	@javax.inject.Scope
-	public static @interface RequestScoped {
+	public @interface RequestScoped {
 	}


 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
 	@javax.inject.Scope
-	public static @interface SessionScoped {
+	public @interface SessionScoped {
 	}

 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +16,9 @@

 package org.springframework.context.annotation.scope;

-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.ApplicationContext;
@@ -33,9 +33,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.support.GenericWebApplicationContext;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.context.annotation.ScopedProxyMode.DEFAULT;
 import static org.springframework.context.annotation.ScopedProxyMode.INTERFACES;
 import static org.springframework.context.annotation.ScopedProxyMode.NO;
@@ -47,7 +45,7 @@ import static org.springframework.context.annotation.ScopedProxyMode.TARGET_CLAS
 * @author Chris Beams
 * @author Sam Brannen
 */
-public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
+class ClassPathBeanDefinitionScannerScopeIntegrationTests {

 	private static final String DEFAULT_NAME = "default";
 	private static final String MODIFIED_NAME = "modified";
@@ -59,8 +57,8 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 	private ServletRequestAttributes newRequestAttributesWithSession;


-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setup() {
 		MockHttpServletRequest oldRequestWithSession = new MockHttpServletRequest();
 		oldRequestWithSession.setSession(new MockHttpSession());
 		this.oldRequestAttributesWithSession = new ServletRequestAttributes(oldRequestWithSession);
@@ -70,212 +68,217 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 		this.newRequestAttributesWithSession = new ServletRequestAttributes(newRequestWithSession);
 	}

-	@After
-	public void tearDown() throws Exception {
+	@AfterEach
+	void reset() {
 		RequestContextHolder.resetRequestAttributes();
 	}


 	@Test
-	public void singletonScopeWithNoProxy() {
+	void singletonScopeWithNoProxy() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// singleton bean, so name should be modified even after lookup
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("singleton");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void singletonScopeIgnoresProxyInterfaces() {
+	void singletonScopeIgnoresProxyInterfaces() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(INTERFACES);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// singleton bean, so name should be modified even after lookup
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("singleton");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void singletonScopeIgnoresProxyTargetClass() {
+	void singletonScopeIgnoresProxyTargetClass() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(TARGET_CLASS);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("singleton");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// singleton bean, so name should be modified even after lookup
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("singleton");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void requestScopeWithNoProxy() {
+	void requestScopeWithNoProxy() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("request");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// but a newly retrieved bean should have the default name
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("request");
-		assertEquals(DEFAULT_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(DEFAULT_NAME);
 	}

 	@Test
-	public void requestScopeWithProxiedInterfaces() {
+	void requestScopeWithProxiedInterfaces() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(INTERFACES);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("request");

 		// should be dynamic proxy, implementing both interfaces
-		assertTrue(AopUtils.isJdkDynamicProxy(bean));
-		assertTrue(bean instanceof AnotherScopeTestInterface);
+		assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue();
+		boolean condition = bean instanceof AnotherScopeTestInterface;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void requestScopeWithProxiedTargetClass() {
+	void requestScopeWithProxiedTargetClass() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
 		ApplicationContext context = createContext(TARGET_CLASS);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("request");

 		// should be a class-based proxy
-		assertTrue(AopUtils.isCglibProxy(bean));
-		assertTrue(bean instanceof RequestScopedTestBean);
+		assertThat(AopUtils.isCglibProxy(bean)).isTrue();
+		boolean condition = bean instanceof RequestScopedTestBean;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributes);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributes);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void sessionScopeWithNoProxy() {
+	void sessionScopeWithNoProxy() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
 		ApplicationContext context = createContext(NO);
 		ScopedTestBean bean = (ScopedTestBean) context.getBean("session");

 		// should not be a proxy
-		assertFalse(AopUtils.isAopProxy(bean));
+		assertThat(AopUtils.isAopProxy(bean)).isFalse();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// not a proxy so this should not have changed
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);

 		// but a newly retrieved bean should have the default name
 		ScopedTestBean bean2 = (ScopedTestBean) context.getBean("session");
-		assertEquals(DEFAULT_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(DEFAULT_NAME);
 	}

 	@Test
-	public void sessionScopeWithProxiedInterfaces() {
+	void sessionScopeWithProxiedInterfaces() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
 		ApplicationContext context = createContext(INTERFACES);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("session");

 		// should be dynamic proxy, implementing both interfaces
-		assertTrue(AopUtils.isJdkDynamicProxy(bean));
-		assertTrue(bean instanceof AnotherScopeTestInterface);
+		assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue();
+		boolean condition = bean instanceof AnotherScopeTestInterface;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		IScopedTestBean bean2 = (IScopedTestBean) context.getBean("session");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 		bean2.setName(DEFAULT_NAME);
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}

 	@Test
-	public void sessionScopeWithProxiedTargetClass() {
+	void sessionScopeWithProxiedTargetClass() {
 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
 		ApplicationContext context = createContext(TARGET_CLASS);
 		IScopedTestBean bean = (IScopedTestBean) context.getBean("session");

 		// should be a class-based proxy
-		assertTrue(AopUtils.isCglibProxy(bean));
-		assertTrue(bean instanceof ScopedTestBean);
-		assertTrue(bean instanceof SessionScopedTestBean);
+		assertThat(AopUtils.isCglibProxy(bean)).isTrue();
+		boolean condition1 = bean instanceof ScopedTestBean;
+		assertThat(condition1).isTrue();
+		boolean condition = bean instanceof SessionScopedTestBean;
+		assertThat(condition).isTrue();

-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// this is a proxy so it should be reset to default
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);
 		bean.setName(MODIFIED_NAME);

 		IScopedTestBean bean2 = (IScopedTestBean) context.getBean("session");
-		assertEquals(MODIFIED_NAME, bean2.getName());
+		assertThat(bean2.getName()).isEqualTo(MODIFIED_NAME);
 		bean2.setName(DEFAULT_NAME);
-		assertEquals(DEFAULT_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(DEFAULT_NAME);

 		RequestContextHolder.setRequestAttributes(oldRequestAttributesWithSession);
-		assertEquals(MODIFIED_NAME, bean.getName());
+		assertThat(bean.getName()).isEqualTo(MODIFIED_NAME);
 	}


@@ -295,12 +298,12 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 	}


- 	static interface IScopedTestBean {
+	interface IScopedTestBean {

- 		String getName();
+		String getName();

- 		void setName(String name);
- 	}
+		void setName(String name);
+	}


 	static abstract class ScopedTestBean implements IScopedTestBean {
@@ -320,7 +323,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 	}


-	static interface AnotherScopeTestInterface {
+	interface AnotherScopeTestInterface {
 	}


@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,8 +19,8 @@ package org.springframework.core.env;
 import java.io.File;
 import java.io.IOException;

-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -57,11 +57,19 @@ import org.springframework.web.context.support.StandardServletEnvironment;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.context.support.XmlWebApplicationContext;

-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
-import static org.springframework.context.ConfigurableApplicationContext.*;
-import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+import static org.springframework.context.ConfigurableApplicationContext.ENVIRONMENT_BEAN_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DERIVED_DEV_BEAN_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DERIVED_DEV_ENV_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DEV_BEAN_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DEV_ENV_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.ENVIRONMENT_AWARE_BEAN_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.PROD_BEAN_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.PROD_ENV_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.TRANSITIVE_BEAN_NAME;
+import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.XML_PATH;

 /**
 * System integration tests for container support of the {@link Environment} API.
@@ -91,15 +99,15 @@ public class EnvironmentSystemIntegrationTests {

 	private final ConfigurableEnvironment prodWebEnv = new StandardServletEnvironment();

-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		prodEnv.setActiveProfiles(PROD_ENV_NAME);
 		devEnv.setActiveProfiles(DEV_ENV_NAME);
 		prodWebEnv.setActiveProfiles(PROD_ENV_NAME);
 	}

 	@Test
-	public void genericApplicationContext_standardEnv() {
+	void genericApplicationContext_standardEnv() {
 		ConfigurableApplicationContext ctx = new GenericApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
 		ctx.refresh();

@@ -109,7 +117,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void genericApplicationContext_customEnv() {
+	void genericApplicationContext_customEnv() {
 		GenericApplicationContext ctx = new GenericApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
 		ctx.setEnvironment(prodEnv);
 		ctx.refresh();
@@ -120,51 +128,51 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void xmlBeanDefinitionReader_inheritsEnvironmentFromEnvironmentCapableBDR() {
+	void xmlBeanDefinitionReader_inheritsEnvironmentFromEnvironmentCapableBDR() {
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.setEnvironment(prodEnv);
 		new XmlBeanDefinitionReader(ctx).loadBeanDefinitions(XML_PATH);
 		ctx.refresh();
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void annotatedBeanDefinitionReader_inheritsEnvironmentFromEnvironmentCapableBDR() {
+	void annotatedBeanDefinitionReader_inheritsEnvironmentFromEnvironmentCapableBDR() {
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.setEnvironment(prodEnv);
 		new AnnotatedBeanDefinitionReader(ctx).register(Config.class);
 		ctx.refresh();
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void classPathBeanDefinitionScanner_inheritsEnvironmentFromEnvironmentCapableBDR_scanProfileAnnotatedConfigClasses() {
+	void classPathBeanDefinitionScanner_inheritsEnvironmentFromEnvironmentCapableBDR_scanProfileAnnotatedConfigClasses() {
 		// it's actually ConfigurationClassPostProcessor's Environment that gets the job done here.
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.setEnvironment(prodEnv);
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(ctx);
 		scanner.scan("org.springframework.core.env.scan1");
 		ctx.refresh();
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void classPathBeanDefinitionScanner_inheritsEnvironmentFromEnvironmentCapableBDR_scanProfileAnnotatedComponents() {
+	void classPathBeanDefinitionScanner_inheritsEnvironmentFromEnvironmentCapableBDR_scanProfileAnnotatedComponents() {
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.setEnvironment(prodEnv);
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(ctx);
 		scanner.scan("org.springframework.core.env.scan2");
 		ctx.refresh();
-		assertThat(scanner.getEnvironment(), is((Environment)ctx.getEnvironment()));
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(scanner.getEnvironment()).isEqualTo(ctx.getEnvironment());
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void genericXmlApplicationContext() {
+	void genericXmlApplicationContext() {
 		GenericXmlApplicationContext ctx = new GenericXmlApplicationContext();
 		assertHasStandardEnvironment(ctx);
 		ctx.setEnvironment(prodEnv);
@@ -174,12 +182,12 @@ public class EnvironmentSystemIntegrationTests {
 		assertHasEnvironment(ctx, prodEnv);
 		assertEnvironmentBeanRegistered(ctx);
 		assertEnvironmentAwareInvoked(ctx, prodEnv);
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void classPathXmlApplicationContext() {
+	void classPathXmlApplicationContext() {
 		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext(XML_PATH);
 		ctx.setEnvironment(prodEnv);
 		ctx.refresh();
@@ -187,12 +195,12 @@ public class EnvironmentSystemIntegrationTests {
 		assertEnvironmentBeanRegistered(ctx);
 		assertHasEnvironment(ctx, prodEnv);
 		assertEnvironmentAwareInvoked(ctx, ctx.getEnvironment());
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void fileSystemXmlApplicationContext() throws IOException {
+	void fileSystemXmlApplicationContext() throws IOException {
 		ClassPathResource xml = new ClassPathResource(XML_PATH);
 		File tmpFile = File.createTempFile("test", "xml");
 		FileCopyUtils.copy(xml.getFile(), tmpFile);
@@ -205,12 +213,12 @@ public class EnvironmentSystemIntegrationTests {
 		assertEnvironmentBeanRegistered(ctx);
 		assertHasEnvironment(ctx, prodEnv);
 		assertEnvironmentAwareInvoked(ctx, ctx.getEnvironment());
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void annotationConfigApplicationContext_withPojos() {
+	void annotationConfigApplicationContext_withPojos() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();

 		assertHasStandardEnvironment(ctx);
@@ -223,7 +231,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void annotationConfigApplicationContext_withProdEnvAndProdConfigClass() {
+	void annotationConfigApplicationContext_withProdEnvAndProdConfigClass() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();

 		assertHasStandardEnvironment(ctx);
@@ -232,11 +240,11 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.register(ProdConfig.class);
 		ctx.refresh();

-		assertThat("should have prod bean", ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void annotationConfigApplicationContext_withProdEnvAndDevConfigClass() {
+	void annotationConfigApplicationContext_withProdEnvAndDevConfigClass() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();

 		assertHasStandardEnvironment(ctx);
@@ -245,12 +253,12 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.register(DevConfig.class);
 		ctx.refresh();

-		assertThat("should not have dev bean", ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat("should not have transitive bean", ctx.containsBean(TRANSITIVE_BEAN_NAME), is(false));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(TRANSITIVE_BEAN_NAME)).isFalse();
 	}

 	@Test
-	public void annotationConfigApplicationContext_withDevEnvAndDevConfigClass() {
+	void annotationConfigApplicationContext_withDevEnvAndDevConfigClass() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();

 		assertHasStandardEnvironment(ctx);
@@ -259,12 +267,12 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.register(DevConfig.class);
 		ctx.refresh();

-		assertThat("should have dev bean", ctx.containsBean(DEV_BEAN_NAME), is(true));
-		assertThat("should have transitive bean", ctx.containsBean(TRANSITIVE_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isTrue();
+		assertThat(ctx.containsBean(TRANSITIVE_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void annotationConfigApplicationContext_withImportedConfigClasses() {
+	void annotationConfigApplicationContext_withImportedConfigClasses() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();

 		assertHasStandardEnvironment(ctx);
@@ -274,13 +282,13 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.refresh();

 		assertEnvironmentAwareInvoked(ctx, prodEnv);
-		assertThat("should have prod bean", ctx.containsBean(PROD_BEAN_NAME), is(true));
-		assertThat("should not have dev bean", ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat("should not have transitive bean", ctx.containsBean(TRANSITIVE_BEAN_NAME), is(false));
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(TRANSITIVE_BEAN_NAME)).isFalse();
 	}

 	@Test
-	public void mostSpecificDerivedClassDrivesEnvironment_withDerivedDevEnvAndDerivedDevConfigClass() {
+	void mostSpecificDerivedClassDrivesEnvironment_withDerivedDevEnvAndDerivedDevConfigClass() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		StandardEnvironment derivedDevEnv = new StandardEnvironment();
 		derivedDevEnv.setActiveProfiles(DERIVED_DEV_ENV_NAME);
@@ -288,25 +296,55 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.register(DerivedDevConfig.class);
 		ctx.refresh();

-		assertThat("should have dev bean", ctx.containsBean(DEV_BEAN_NAME), is(true));
-		assertThat("should have derived dev bean", ctx.containsBean(DERIVED_DEV_BEAN_NAME), is(true));
-		assertThat("should have transitive bean", ctx.containsBean(TRANSITIVE_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isTrue();
+		assertThat(ctx.containsBean(DERIVED_DEV_BEAN_NAME)).isTrue();
+		assertThat(ctx.containsBean(TRANSITIVE_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void mostSpecificDerivedClassDrivesEnvironment_withDevEnvAndDerivedDevConfigClass() {
+	void mostSpecificDerivedClassDrivesEnvironment_withDevEnvAndDerivedDevConfigClass() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.setEnvironment(devEnv);
 		ctx.register(DerivedDevConfig.class);
 		ctx.refresh();

-		assertThat("should not have dev bean", ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat("should not have derived dev bean", ctx.containsBean(DERIVED_DEV_BEAN_NAME), is(false));
-		assertThat("should not have transitive bean", ctx.containsBean(TRANSITIVE_BEAN_NAME), is(false));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(DERIVED_DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(TRANSITIVE_BEAN_NAME)).isFalse();
 	}

 	@Test
-	public void webApplicationContext() {
+	void annotationConfigApplicationContext_withProfileExpressionMatchOr() {
+		testProfileExpression(true, "p3");
+	}
+
+	@Test
+	void annotationConfigApplicationContext_withProfileExpressionMatchAnd() {
+		testProfileExpression(true, "p1", "p2");
+	}
+
+	@Test
+	void annotationConfigApplicationContext_withProfileExpressionNoMatchAnd() {
+		testProfileExpression(false, "p1");
+	}
+
+	@Test
+	void annotationConfigApplicationContext_withProfileExpressionNoMatchNone() {
+		testProfileExpression(false, "p4");
+	}
+
+	private void testProfileExpression(boolean expected, String... activeProfiles) {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		StandardEnvironment environment = new StandardEnvironment();
+		environment.setActiveProfiles(activeProfiles);
+		ctx.setEnvironment(environment);
+		ctx.register(ProfileExpressionConfig.class);
+		ctx.refresh();
+		assertThat(ctx.containsBean("expressionBean")).isEqualTo(expected);
+	}
+
+	@Test
+	void webApplicationContext() {
 		GenericWebApplicationContext ctx = new GenericWebApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
 		assertHasStandardServletEnvironment(ctx);
 		ctx.setEnvironment(prodWebEnv);
@@ -318,7 +356,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void xmlWebApplicationContext() {
+	void xmlWebApplicationContext() {
 		AbstractRefreshableWebApplicationContext ctx = new XmlWebApplicationContext();
 		ctx.setConfigLocation("classpath:" + XML_PATH);
 		ctx.setEnvironment(prodWebEnv);
@@ -327,12 +365,12 @@ public class EnvironmentSystemIntegrationTests {
 		assertHasEnvironment(ctx, prodWebEnv);
 		assertEnvironmentBeanRegistered(ctx);
 		assertEnvironmentAwareInvoked(ctx, prodWebEnv);
-		assertThat(ctx.containsBean(DEV_BEAN_NAME), is(false));
-		assertThat(ctx.containsBean(PROD_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(DEV_BEAN_NAME)).isFalse();
+		assertThat(ctx.containsBean(PROD_BEAN_NAME)).isTrue();
 	}

 	@Test
-	public void staticApplicationContext() {
+	void staticApplicationContext() {
 		StaticApplicationContext ctx = new StaticApplicationContext();

 		assertHasStandardEnvironment(ctx);
@@ -348,7 +386,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void staticWebApplicationContext() {
+	void staticWebApplicationContext() {
 		StaticWebApplicationContext ctx = new StaticWebApplicationContext();

 		assertHasStandardServletEnvironment(ctx);
@@ -364,7 +402,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void annotationConfigWebApplicationContext() {
+	void annotationConfigWebApplicationContext() {
 		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
 		ctx.setEnvironment(prodWebEnv);
 		ctx.setConfigLocation(EnvironmentAwareBean.class.getName());
@@ -376,7 +414,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void registerServletParamPropertySources_AbstractRefreshableWebApplicationContext() {
+	void registerServletParamPropertySources_AbstractRefreshableWebApplicationContext() {
 		MockServletContext servletContext = new MockServletContext();
 		servletContext.addInitParameter("pCommon", "pCommonContextValue");
 		servletContext.addInitParameter("pContext1", "pContext1Value");
@@ -391,23 +429,23 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.refresh();

 		ConfigurableEnvironment environment = ctx.getEnvironment();
-		assertThat(environment, instanceOf(StandardServletEnvironment.class));
+		assertThat(environment).isInstanceOf(StandardServletEnvironment.class);
 		MutablePropertySources propertySources = environment.getPropertySources();
-		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME), is(true));
-		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME), is(true));
+		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)).isTrue();
+		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)).isTrue();

 		// ServletConfig gets precedence
-		assertThat(environment.getProperty("pCommon"), is("pCommonConfigValue"));
-		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)),
-				lessThan(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME))));
+		assertThat(environment.getProperty("pCommon")).isEqualTo("pCommonConfigValue");
+		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)))
+				.isLessThan(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)));

 		// but all params are available
-		assertThat(environment.getProperty("pContext1"), is("pContext1Value"));
-		assertThat(environment.getProperty("pConfig1"), is("pConfig1Value"));
+		assertThat(environment.getProperty("pContext1")).isEqualTo("pContext1Value");
+		assertThat(environment.getProperty("pConfig1")).isEqualTo("pConfig1Value");

 		// Servlet* PropertySources have precedence over System* PropertySources
-		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)),
-				lessThan(propertySources.precedenceOf(PropertySource.named(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME))));
+		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)))
+				.isLessThan(propertySources.precedenceOf(PropertySource.named(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)));

 		// Replace system properties with a mock property source for convenience
 		MockPropertySource mockSystemProperties = new MockPropertySource(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
@@ -416,12 +454,12 @@ public class EnvironmentSystemIntegrationTests {
 		propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockSystemProperties);

 		// assert that servletconfig params resolve with higher precedence than sysprops
-		assertThat(environment.getProperty("pCommon"), is("pCommonConfigValue"));
-		assertThat(environment.getProperty("pSysProps1"), is("pSysProps1Value"));
+		assertThat(environment.getProperty("pCommon")).isEqualTo("pCommonConfigValue");
+		assertThat(environment.getProperty("pSysProps1")).isEqualTo("pSysProps1Value");
 	}

 	@Test
-	public void registerServletParamPropertySources_GenericWebApplicationContext() {
+	void registerServletParamPropertySources_GenericWebApplicationContext() {
 		MockServletContext servletContext = new MockServletContext();
 		servletContext.addInitParameter("pCommon", "pCommonContextValue");
 		servletContext.addInitParameter("pContext1", "pContext1Value");
@@ -431,17 +469,17 @@ public class EnvironmentSystemIntegrationTests {
 		ctx.refresh();

 		ConfigurableEnvironment environment = ctx.getEnvironment();
-		assertThat(environment, instanceOf(StandardServletEnvironment.class));
+		assertThat(environment).isInstanceOf(StandardServletEnvironment.class);
 		MutablePropertySources propertySources = environment.getPropertySources();
-		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME), is(true));
+		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)).isTrue();

 		// ServletContext params are available
-		assertThat(environment.getProperty("pCommon"), is("pCommonContextValue"));
-		assertThat(environment.getProperty("pContext1"), is("pContext1Value"));
+		assertThat(environment.getProperty("pCommon")).isEqualTo("pCommonContextValue");
+		assertThat(environment.getProperty("pContext1")).isEqualTo("pContext1Value");

 		// Servlet* PropertySources have precedence over System* PropertySources
-		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)),
-				lessThan(propertySources.precedenceOf(PropertySource.named(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME))));
+		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)))
+				.isLessThan(propertySources.precedenceOf(PropertySource.named(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)));

 		// Replace system properties with a mock property source for convenience
 		MockPropertySource mockSystemProperties = new MockPropertySource(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
@@ -450,12 +488,12 @@ public class EnvironmentSystemIntegrationTests {
 		propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockSystemProperties);

 		// assert that servletcontext init params resolve with higher precedence than sysprops
-		assertThat(environment.getProperty("pCommon"), is("pCommonContextValue"));
-		assertThat(environment.getProperty("pSysProps1"), is("pSysProps1Value"));
+		assertThat(environment.getProperty("pCommon")).isEqualTo("pCommonContextValue");
+		assertThat(environment.getProperty("pSysProps1")).isEqualTo("pSysProps1Value");
 	}

 	@Test
-	public void registerServletParamPropertySources_StaticWebApplicationContext() {
+	void registerServletParamPropertySources_StaticWebApplicationContext() {
 		MockServletContext servletContext = new MockServletContext();
 		servletContext.addInitParameter("pCommon", "pCommonContextValue");
 		servletContext.addInitParameter("pContext1", "pContext1Value");
@@ -470,21 +508,21 @@ public class EnvironmentSystemIntegrationTests {

 		ConfigurableEnvironment environment = ctx.getEnvironment();
 		MutablePropertySources propertySources = environment.getPropertySources();
-		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME), is(true));
-		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME), is(true));
+		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)).isTrue();
+		assertThat(propertySources.contains(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)).isTrue();

 		// ServletConfig gets precedence
-		assertThat(environment.getProperty("pCommon"), is("pCommonConfigValue"));
-		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)),
-				lessThan(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME))));
+		assertThat(environment.getProperty("pCommon")).isEqualTo("pCommonConfigValue");
+		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)))
+				.isLessThan(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME)));

 		// but all params are available
-		assertThat(environment.getProperty("pContext1"), is("pContext1Value"));
-		assertThat(environment.getProperty("pConfig1"), is("pConfig1Value"));
+		assertThat(environment.getProperty("pContext1")).isEqualTo("pContext1Value");
+		assertThat(environment.getProperty("pConfig1")).isEqualTo("pConfig1Value");

 		// Servlet* PropertySources have precedence over System* PropertySources
-		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)),
-				lessThan(propertySources.precedenceOf(PropertySource.named(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME))));
+		assertThat(propertySources.precedenceOf(PropertySource.named(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME)))
+				.isLessThan(propertySources.precedenceOf(PropertySource.named(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)));

 		// Replace system properties with a mock property source for convenience
 		MockPropertySource mockSystemProperties = new MockPropertySource(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
@@ -493,12 +531,12 @@ public class EnvironmentSystemIntegrationTests {
 		propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockSystemProperties);

 		// assert that servletconfig params resolve with higher precedence than sysprops
-		assertThat(environment.getProperty("pCommon"), is("pCommonConfigValue"));
-		assertThat(environment.getProperty("pSysProps1"), is("pSysProps1Value"));
+		assertThat(environment.getProperty("pCommon")).isEqualTo("pCommonConfigValue");
+		assertThat(environment.getProperty("pSysProps1")).isEqualTo("pSysProps1Value");
 	}

 	@Test
-	public void resourceAdapterApplicationContext() {
+	void resourceAdapterApplicationContext() {
 		ResourceAdapterApplicationContext ctx = new ResourceAdapterApplicationContext(new SimpleBootstrapContext(new SimpleTaskWorkManager()));

 		assertHasStandardEnvironment(ctx);
@@ -514,7 +552,7 @@ public class EnvironmentSystemIntegrationTests {
 	}

 	@Test
-	public void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
+	void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
 		{
 			ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext();
 			ctx.refresh();
@@ -523,12 +561,8 @@ public class EnvironmentSystemIntegrationTests {
 		{
 			ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext();
 			ctx.getEnvironment().setRequiredProperties("foo", "bar");
-			try {
-				ctx.refresh();
-				fail("expected missing property exception");
-			}
-			catch (MissingRequiredPropertiesException ex) {
-			}
+			assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(
+					ctx::refresh);
 		}

 		{
@@ -554,33 +588,33 @@ public class EnvironmentSystemIntegrationTests {
 	private void assertEnvironmentBeanRegistered(
 			ConfigurableApplicationContext ctx) {
 		// ensure environment is registered as a bean
-		assertThat(ctx.containsBean(ENVIRONMENT_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(ENVIRONMENT_BEAN_NAME)).isTrue();
 	}

 	private void assertHasStandardEnvironment(ApplicationContext ctx) {
 		Environment defaultEnv = ctx.getEnvironment();
-		assertThat(defaultEnv, notNullValue());
-		assertThat(defaultEnv, instanceOf(StandardEnvironment.class));
+		assertThat(defaultEnv).isNotNull();
+		assertThat(defaultEnv).isInstanceOf(StandardEnvironment.class);
 	}

 	private void assertHasStandardServletEnvironment(WebApplicationContext ctx) {
 		// ensure a default servlet environment exists
 		Environment defaultEnv = ctx.getEnvironment();
-		assertThat(defaultEnv, notNullValue());
-		assertThat(defaultEnv, instanceOf(StandardServletEnvironment.class));
+		assertThat(defaultEnv).isNotNull();
+		assertThat(defaultEnv).isInstanceOf(StandardServletEnvironment.class);
 	}

 	private void assertHasEnvironment(ApplicationContext ctx, Environment expectedEnv) {
 		// ensure the custom environment took
 		Environment actualEnv = ctx.getEnvironment();
-		assertThat(actualEnv, notNullValue());
-		assertThat(actualEnv, is(expectedEnv));
+		assertThat(actualEnv).isNotNull();
+		assertThat(actualEnv).isEqualTo(expectedEnv);
 		// ensure environment is registered as a bean
-		assertThat(ctx.containsBean(ENVIRONMENT_BEAN_NAME), is(true));
+		assertThat(ctx.containsBean(ENVIRONMENT_BEAN_NAME)).isTrue();
 	}

 	private void assertEnvironmentAwareInvoked(ConfigurableApplicationContext ctx, Environment expectedEnv) {
-		assertThat(ctx.getBean(EnvironmentAwareBean.class).environment, is(expectedEnv));
+		assertThat(ctx.getBean(EnvironmentAwareBean.class).environment).isEqualTo(expectedEnv);
 	}


@@ -644,6 +678,15 @@ public class EnvironmentSystemIntegrationTests {
 		}
 	}

+	@Profile("(p1 & p2) | p3")
+	@Configuration
+	static class ProfileExpressionConfig {
+		@Bean
+		public Object expressionBean() {
+			return new Object();
+		}
+	}
+

 	/**
 	 * Constants used both locally and in scan* sub-packages
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2014 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,22 +16,25 @@

 package org.springframework.core.env;

-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+import org.junit.jupiter.api.Test;

-import org.junit.Test;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.support.GenericApplicationContext;

-@SuppressWarnings("resource")
-public class PropertyPlaceholderConfigurerEnvironmentIntegrationTests {
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+
+class PropertyPlaceholderConfigurerEnvironmentIntegrationTests {
+
 	@Test
-	public void test() {
+	@SuppressWarnings("deprecation")
+	void test() {
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.registerBeanDefinition("ppc",
-				rootBeanDefinition(PropertyPlaceholderConfigurer.class)
+				rootBeanDefinition(org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.class)
 				.addPropertyValue("searchSystemEnvironment", false)
 				.getBeanDefinition());
 		ctx.refresh();
 		ctx.getBean("ppc");
+		ctx.close();
 	}
+
 }
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env.scan1;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({ DevConfig.class, ProdConfig.class })
+class Config {
+
+}
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env.scan1;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Profile(org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DEV_ENV_NAME)
+@Configuration
+class DevConfig {
+
+	@Bean
+	public Object devBean() {
+		return new Object();
+	}
+
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2010 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,39 +14,19 @@
 * limitations under the License.
 */

-/**
- * Mirrors the structure of beans and environment-specific config files
- * in EnvironmentIntegrationTests-context.xml
- */
 package org.springframework.core.env.scan1;

-import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DEV_ENV_NAME;
-import static org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.PROD_ENV_NAME;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;

-@Configuration
-@Import({DevConfig.class, ProdConfig.class})
-class Config {
-}
-
-@Profile(DEV_ENV_NAME)
-@Configuration
-class DevConfig {
-	@Bean
-	public Object devBean() {
-		return new Object();
-	}
-}
-
-@Profile(PROD_ENV_NAME)
+@Profile(org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.PROD_ENV_NAME)
@Configuration
 class ProdConfig {
+
 	@Bean
 	public Object prodBean() {
 		return new Object();
 	}
+
 }
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env.scan2;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Profile(org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DEV_ENV_NAME)
+@Component(org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.DEV_BEAN_NAME)
+class DevBean {
+}
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env.scan2;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Profile(org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.PROD_ENV_NAME)
+@Component(org.springframework.core.env.EnvironmentSystemIntegrationTests.Constants.PROD_BEAN_NAME)
+class ProdBean {
+
+}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,26 @@ package org.springframework.expression.spel.support;

 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;

-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.MethodExecutor;

-public class Spr7538Tests {
+class Spr7538Tests {

-	@Ignore @Test
-	public void repro() throws Exception {
+	@Test
+	void repro() throws Exception {
 		AlwaysTrueReleaseStrategy target = new AlwaysTrueReleaseStrategy();
 		BeanFactoryTypeConverter converter = new BeanFactoryTypeConverter();

 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setTypeConverter(converter);

-		List<Foo> arguments = new ArrayList<>();
-
-		// !!!! With the below line commented you'll get NPE. Uncomment and everything is OK!
-		//arguments.add(new Foo());
+		List<Foo> arguments = Collections.emptyList();

 		List<TypeDescriptor> paramDescriptors = new ArrayList<>();
 		Method method = AlwaysTrueReleaseStrategy.class.getMethod("checkCompleteness", List.class);
@@ -55,11 +53,11 @@ public class Spr7538Tests {
 		System.out.println("Result: " + result);
 	}

-	public static class AlwaysTrueReleaseStrategy {
+	static class AlwaysTrueReleaseStrategy {
 		public boolean checkCompleteness(List<Foo> messages) {
 			return true;
 		}
 	}

-	public static class Foo{}
-}
+	static class Foo{}
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,8 +19,7 @@ package org.springframework.scheduling.annotation;
 import java.util.concurrent.atomic.AtomicInteger;

 import org.aspectj.lang.annotation.Aspect;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator;
 import org.springframework.aop.support.AopUtils;
@@ -29,19 +28,19 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.testfixture.EnabledForTestGroups;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.stereotype.Repository;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
-import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.testfixture.CallCountingTransactionManager;

-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.springframework.core.testfixture.TestGroup.PERFORMANCE;

 /**
 * Integration tests cornering bug SPR-8651, which revealed that @Scheduled methods may
@@ -53,29 +52,20 @@ import static org.mockito.BDDMockito.*;
 * @since 3.1
 */
@SuppressWarnings("resource")
-public class ScheduledAndTransactionalAnnotationIntegrationTests {
-
-	@Before
-	public void setUp() {
-		Assume.group(TestGroup.PERFORMANCE);
-	}
-
+@EnabledForTestGroups(PERFORMANCE)
+class ScheduledAndTransactionalAnnotationIntegrationTests {

 	@Test
-	public void failsWhenJdkProxyAndScheduledMethodNotPresentOnInterface() {
+	void failsWhenJdkProxyAndScheduledMethodNotPresentOnInterface() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, JdkProxyTxConfig.class, RepoConfigA.class);
-		try {
-			ctx.refresh();
-			fail("Should have thrown BeanCreationException");
-		}
-		catch (BeanCreationException ex) {
-			assertTrue(ex.getRootCause() instanceof IllegalStateException);
-		}
+		assertThatExceptionOfType(BeanCreationException.class)
+			.isThrownBy(ctx::refresh)
+			.satisfies(ex -> assertThat(ex.getRootCause()).isInstanceOf(IllegalStateException.class));
 	}

 	@Test
-	public void succeedsWhenSubclassProxyAndScheduledMethodNotPresentOnInterface() throws InterruptedException {
+	void succeedsWhenSubclassProxyAndScheduledMethodNotPresentOnInterface() throws InterruptedException {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, SubclassProxyTxConfig.class, RepoConfigA.class);
 		ctx.refresh();
@@ -84,13 +74,13 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {

 		MyRepository repository = ctx.getBean(MyRepository.class);
 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
-		assertThat("repository is not a proxy", AopUtils.isCglibProxy(repository), equalTo(true));
-		assertThat("@Scheduled method never called", repository.getInvocationCount(), greaterThan(0));
-		assertThat("no transactions were committed", txManager.commits, greaterThan(0));
+		assertThat(AopUtils.isCglibProxy(repository)).isEqualTo(true);
+		assertThat(repository.getInvocationCount()).isGreaterThan(0);
+		assertThat(txManager.commits).isGreaterThan(0);
 	}

 	@Test
-	public void succeedsWhenJdkProxyAndScheduledMethodIsPresentOnInterface() throws InterruptedException {
+	void succeedsWhenJdkProxyAndScheduledMethodIsPresentOnInterface() throws InterruptedException {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, JdkProxyTxConfig.class, RepoConfigB.class);
 		ctx.refresh();
@@ -99,13 +89,13 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {

 		MyRepositoryWithScheduledMethod repository = ctx.getBean(MyRepositoryWithScheduledMethod.class);
 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
-		assertThat("repository is not a proxy", AopUtils.isJdkDynamicProxy(repository), is(true));
-		assertThat("@Scheduled method never called", repository.getInvocationCount(), greaterThan(0));
-		assertThat("no transactions were committed", txManager.commits, greaterThan(0));
+		assertThat(AopUtils.isJdkDynamicProxy(repository)).isTrue();
+		assertThat(repository.getInvocationCount()).isGreaterThan(0);
+		assertThat(txManager.commits).isGreaterThan(0);
 	}

 	@Test
-	public void withAspectConfig() throws InterruptedException {
+	void withAspectConfig() throws InterruptedException {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AspectConfig.class, MyRepositoryWithScheduledMethodImpl.class);
 		ctx.refresh();
@@ -113,8 +103,8 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 		Thread.sleep(100);  // allow @Scheduled method to be called several times

 		MyRepositoryWithScheduledMethod repository = ctx.getBean(MyRepositoryWithScheduledMethod.class);
-		assertThat("repository is not a proxy", AopUtils.isCglibProxy(repository), is(true));
-		assertThat("@Scheduled method never called", repository.getInvocationCount(), greaterThan(0));
+		assertThat(AopUtils.isCglibProxy(repository)).isTrue();
+		assertThat(repository.getInvocationCount()).isGreaterThan(0);
 	}


@@ -134,7 +124,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 	static class RepoConfigA {

 		@Bean
-		public MyRepository repository() {
+		MyRepository repository() {
 			return new MyRepositoryImpl();
 		}
 	}
@@ -144,7 +134,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 	static class RepoConfigB {

 		@Bean
-		public MyRepositoryWithScheduledMethod repository() {
+		MyRepositoryWithScheduledMethod repository() {
 			return new MyRepositoryWithScheduledMethodImpl();
 		}
 	}
@@ -155,17 +145,17 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 	static class Config {

 		@Bean
-		public PlatformTransactionManager txManager() {
+		PlatformTransactionManager txManager() {
 			return new CallCountingTransactionManager();
 		}

 		@Bean
-		public PersistenceExceptionTranslator peTranslator() {
+		PersistenceExceptionTranslator peTranslator() {
 			return mock(PersistenceExceptionTranslator.class);
 		}

 		@Bean
-		public PersistenceExceptionTranslationPostProcessor peTranslationPostProcessor() {
+		static PersistenceExceptionTranslationPostProcessor peTranslationPostProcessor() {
 			return new PersistenceExceptionTranslationPostProcessor();
 		}
 	}
@@ -176,14 +166,14 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 	static class AspectConfig {

 		@Bean
-		public static AnnotationAwareAspectJAutoProxyCreator autoProxyCreator() {
+		static AnnotationAwareAspectJAutoProxyCreator autoProxyCreator() {
 			AnnotationAwareAspectJAutoProxyCreator apc = new AnnotationAwareAspectJAutoProxyCreator();
 			apc.setProxyTargetClass(true);
 			return apc;
 		}

 		@Bean
-		public static MyAspect myAspect() {
+		static MyAspect myAspect() {
 			return new MyAspect();
 		}
 	}
@@ -251,7 +241,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 		@Override
 		public int getInvocationCount() {
 			if (this.myAspect != null) {
-				assertEquals(this.count.get(), this.myAspect.count.get());
+				assertThat(this.myAspect.count.get()).isEqualTo(this.count.get());
 			}
 			return this.count.get();
 		}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,21 +16,15 @@

 package org.springframework.transaction.annotation;

-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

 import javax.sql.DataSource;

-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.aop.Advisor;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.cache.Cache;
@@ -46,126 +40,119 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.stereotype.Repository;
-import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.interceptor.BeanFactoryTransactionAttributeSourceAdvisor;
+import org.springframework.transaction.testfixture.CallCountingTransactionManager;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

 /**
 * Integration tests for the @EnableTransactionManagement annotation.
 *
 * @author Chris Beams
+ * @author Sam Brannen
 * @since 3.1
 */
@SuppressWarnings("resource")
-public class EnableTransactionManagementIntegrationTests {
+class EnableTransactionManagementIntegrationTests {

 	@Test
-	public void repositoryIsNotTxProxy() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(Config.class);
-		ctx.refresh();
+	void repositoryIsNotTxProxy() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class);

-		try {
-			assertTxProxying(ctx);
-			fail("expected exception");
-		}
-		catch (AssertionError ex) {
-			assertThat(ex.getMessage(), equalTo("FooRepository is not a TX proxy"));
-		}
+		assertThat(isTxProxy(ctx.getBean(FooRepository.class))).isFalse();
 	}

 	@Test
-	public void repositoryIsTxProxy_withDefaultTxManagerName() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(Config.class, DefaultTxManagerNameConfig.class);
-		ctx.refresh();
+	void repositoryIsTxProxy_withDefaultTxManagerName() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class, DefaultTxManagerNameConfig.class);

 		assertTxProxying(ctx);
 	}

 	@Test
-	public void repositoryIsTxProxy_withCustomTxManagerName() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(Config.class, CustomTxManagerNameConfig.class);
-		ctx.refresh();
-
-		assertTxProxying(ctx);
-	}
-
-	@Ignore @Test // TODO SPR-8207
-	public void repositoryIsTxProxy_withNonConventionalTxManagerName_fallsBackToByTypeLookup() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(Config.class, NonConventionalTxManagerNameConfig.class);
-		ctx.refresh();
+	void repositoryIsTxProxy_withCustomTxManagerName() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class, CustomTxManagerNameConfig.class);

 		assertTxProxying(ctx);
 	}

 	@Test
-	public void repositoryIsClassBasedTxProxy() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(Config.class, ProxyTargetClassTxConfig.class);
-		ctx.refresh();
-
-		assertTxProxying(ctx);
-		assertThat(AopUtils.isCglibProxy(ctx.getBean(FooRepository.class)), is(true));
+	void repositoryIsTxProxy_withNonConventionalTxManagerName_fallsBackToByTypeLookup() {
+		assertTxProxying(new AnnotationConfigApplicationContext(Config.class, NonConventionalTxManagerNameConfig.class));
 	}

 	@Test
-	public void repositoryUsesAspectJAdviceMode() {
+	void repositoryIsClassBasedTxProxy() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class, ProxyTargetClassTxConfig.class);
+
+		assertTxProxying(ctx);
+		assertThat(AopUtils.isCglibProxy(ctx.getBean(FooRepository.class))).isTrue();
+	}
+
+	@Test
+	void repositoryUsesAspectJAdviceMode() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, AspectJTxConfig.class);
-		try {
-			ctx.refresh();
-		}
-		catch (Exception ex) {
-			// 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.
-			assertTrue(ex.getMessage().contains("AspectJTransactionManagementConfiguration"));
-		}
+		// 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.
+		assertThatExceptionOfType(Exception.class)
+			.isThrownBy(ctx::refresh)
+			.withMessageContaining("AspectJJtaTransactionManagementConfiguration");
 	}

 	@Test
-	public void implicitTxManager() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(ImplicitTxManagerConfig.class);
-		ctx.refresh();
+	void implicitTxManager() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImplicitTxManagerConfig.class);

 		FooRepository fooRepository = ctx.getBean(FooRepository.class);
 		fooRepository.findAll();

 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
-		assertThat(txManager.begun, equalTo(1));
-		assertThat(txManager.commits, equalTo(1));
-		assertThat(txManager.rollbacks, equalTo(0));
+		assertThat(txManager.begun).isEqualTo(1);
+		assertThat(txManager.commits).isEqualTo(1);
+		assertThat(txManager.rollbacks).isEqualTo(0);
 	}

 	@Test
-	public void explicitTxManager() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(ExplicitTxManagerConfig.class);
-		ctx.refresh();
+	void explicitTxManager() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ExplicitTxManagerConfig.class);

 		FooRepository fooRepository = ctx.getBean(FooRepository.class);
 		fooRepository.findAll();

 		CallCountingTransactionManager txManager1 = ctx.getBean("txManager1", CallCountingTransactionManager.class);
-		assertThat(txManager1.begun, equalTo(1));
-		assertThat(txManager1.commits, equalTo(1));
-		assertThat(txManager1.rollbacks, equalTo(0));
+		assertThat(txManager1.begun).isEqualTo(1);
+		assertThat(txManager1.commits).isEqualTo(1);
+		assertThat(txManager1.rollbacks).isEqualTo(0);

 		CallCountingTransactionManager txManager2 = ctx.getBean("txManager2", CallCountingTransactionManager.class);
-		assertThat(txManager2.begun, equalTo(0));
-		assertThat(txManager2.commits, equalTo(0));
-		assertThat(txManager2.rollbacks, equalTo(0));
+		assertThat(txManager2.begun).isEqualTo(0);
+		assertThat(txManager2.commits).isEqualTo(0);
+		assertThat(txManager2.rollbacks).isEqualTo(0);
 	}

 	@Test
-	public void apcEscalation() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(EnableTxAndCachingConfig.class);
-		ctx.refresh();
+	void apcEscalation() {
+		new AnnotationConfigApplicationContext(EnableTxAndCachingConfig.class);
+	}
+
+
+	private void assertTxProxying(AnnotationConfigApplicationContext ctx) {
+		FooRepository repo = ctx.getBean(FooRepository.class);
+		assertThat(isTxProxy(repo)).isTrue();
+		// trigger a transaction
+		repo.findAll();
+	}
+
+	private boolean isTxProxy(FooRepository repo) {
+		if (!AopUtils.isAopProxy(repo)) {
+			return false;
+		}
+		return Arrays.stream(((Advised) repo).getAdvisors())
+				.anyMatch(BeanFactoryTransactionAttributeSourceAdvisor.class::isInstance);
 	}


@@ -173,6 +160,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@EnableTransactionManagement
 	@ImportResource("org/springframework/transaction/annotation/enable-caching.xml")
 	static class EnableTxAndCachingConfig {
+
 		@Bean
 		public PlatformTransactionManager txManager() {
 			return new CallCountingTransactionManager();
@@ -197,6 +185,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Configuration
 	@EnableTransactionManagement
 	static class ImplicitTxManagerConfig {
+
 		@Bean
 		public PlatformTransactionManager txManager() {
 			return new CallCountingTransactionManager();
@@ -212,6 +201,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Configuration
 	@EnableTransactionManagement
 	static class ExplicitTxManagerConfig implements TransactionManagementConfigurer {
+
 		@Bean
 		public PlatformTransactionManager txManager1() {
 			return new CallCountingTransactionManager();
@@ -233,28 +223,11 @@ public class EnableTransactionManagementIntegrationTests {
 		}
 	}

-	private void assertTxProxying(AnnotationConfigApplicationContext ctx) {
-		FooRepository repo = ctx.getBean(FooRepository.class);
-
-		boolean isTxProxy = false;
-		if (AopUtils.isAopProxy(repo)) {
-			for (Advisor advisor : ((Advised)repo).getAdvisors()) {
-				if (advisor instanceof BeanFactoryTransactionAttributeSourceAdvisor) {
-					isTxProxy = true;
-					break;
-				}
-			}
-		}
-		assertTrue("FooRepository is not a TX proxy", isTxProxy);
-
-		// trigger a transaction
-		repo.findAll();
-	}
-

 	@Configuration
 	@EnableTransactionManagement
 	static class DefaultTxManagerNameConfig {
+
 		@Bean
 		PlatformTransactionManager transactionManager(DataSource dataSource) {
 			return new DataSourceTransactionManager(dataSource);
@@ -265,6 +238,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Configuration
 	@EnableTransactionManagement
 	static class CustomTxManagerNameConfig {
+
 		@Bean
 		PlatformTransactionManager txManager(DataSource dataSource) {
 			return new DataSourceTransactionManager(dataSource);
@@ -275,6 +249,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Configuration
 	@EnableTransactionManagement
 	static class NonConventionalTxManagerNameConfig {
+
 		@Bean
 		PlatformTransactionManager txManager(DataSource dataSource) {
 			return new DataSourceTransactionManager(dataSource);
@@ -285,6 +260,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Configuration
 	@EnableTransactionManagement(proxyTargetClass=true)
 	static class ProxyTargetClassTxConfig {
+
 		@Bean
 		PlatformTransactionManager transactionManager(DataSource dataSource) {
 			return new DataSourceTransactionManager(dataSource);
@@ -295,6 +271,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Configuration
 	@EnableTransactionManagement(mode=AdviceMode.ASPECTJ)
 	static class AspectJTxConfig {
+
 		@Bean
 		PlatformTransactionManager transactionManager(DataSource dataSource) {
 			return new DataSourceTransactionManager(dataSource);
@@ -304,6 +281,7 @@ public class EnableTransactionManagementIntegrationTests {

 	@Configuration
 	static class Config {
+
 		@Bean
 		FooRepository fooRepository() {
 			JdbcFooRepository repos = new JdbcFooRepository();
@@ -321,6 +299,7 @@ public class EnableTransactionManagementIntegrationTests {


 	interface FooRepository {
+
 		List<Object> findAll();
 	}

@@ -338,6 +317,7 @@ public class EnableTransactionManagementIntegrationTests {
 		}
 	}

+
 	@Repository
 	static class DummyFooRepository implements FooRepository {

@@ -347,4 +327,5 @@ public class EnableTransactionManagementIntegrationTests {
 			return Collections.emptyList();
 		}
 	}
+
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2014 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,16 +16,14 @@

 package org.springframework.transaction.annotation;

-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;

-import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * Tests proving that regardless the proxy strategy used (JDK interface-based vs. CGLIB
 * subclass-based), discovery of advice-oriented annotations is consistent.
@@ -37,66 +35,66 @@ import org.springframework.context.annotation.Configuration;
 * @author Chris Beams
 */
@SuppressWarnings("resource")
-public class ProxyAnnotationDiscoveryTests {
+class ProxyAnnotationDiscoveryTests {

 	@Test
-	public void annotatedServiceWithoutInterface_PTC_true() {
+	void annotatedServiceWithoutInterface_PTC_true() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(PTCTrue.class, AnnotatedServiceWithoutInterface.class);
 		ctx.refresh();
 		AnnotatedServiceWithoutInterface s = ctx.getBean(AnnotatedServiceWithoutInterface.class);
-		assertTrue("expected a subclass proxy", AopUtils.isCglibProxy(s));
-		assertThat(s, instanceOf(AnnotatedServiceWithoutInterface.class));
+		assertThat(AopUtils.isCglibProxy(s)).isTrue();
+		assertThat(s).isInstanceOf(AnnotatedServiceWithoutInterface.class);
 	}

 	@Test
-	public void annotatedServiceWithoutInterface_PTC_false() {
+	void annotatedServiceWithoutInterface_PTC_false() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(PTCFalse.class, AnnotatedServiceWithoutInterface.class);
 		ctx.refresh();
 		AnnotatedServiceWithoutInterface s = ctx.getBean(AnnotatedServiceWithoutInterface.class);
-		assertTrue("expected a subclass proxy", AopUtils.isCglibProxy(s));
-		assertThat(s, instanceOf(AnnotatedServiceWithoutInterface.class));
+		assertThat(AopUtils.isCglibProxy(s)).isTrue();
+		assertThat(s).isInstanceOf(AnnotatedServiceWithoutInterface.class);
 	}

 	@Test
-	public void nonAnnotatedService_PTC_true() {
+	void nonAnnotatedService_PTC_true() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(PTCTrue.class, AnnotatedServiceImpl.class);
 		ctx.refresh();
 		NonAnnotatedService s = ctx.getBean(NonAnnotatedService.class);
-		assertTrue("expected a subclass proxy", AopUtils.isCglibProxy(s));
-		assertThat(s, instanceOf(AnnotatedServiceImpl.class));
+		assertThat(AopUtils.isCglibProxy(s)).isTrue();
+		assertThat(s).isInstanceOf(AnnotatedServiceImpl.class);
 	}

 	@Test
-	public void nonAnnotatedService_PTC_false() {
+	void nonAnnotatedService_PTC_false() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(PTCFalse.class, AnnotatedServiceImpl.class);
 		ctx.refresh();
 		NonAnnotatedService s = ctx.getBean(NonAnnotatedService.class);
-		assertTrue("expected a jdk proxy", AopUtils.isJdkDynamicProxy(s));
-		assertThat(s, not(instanceOf(AnnotatedServiceImpl.class)));
+		assertThat(AopUtils.isJdkDynamicProxy(s)).isTrue();
+		assertThat(s).isNotInstanceOf(AnnotatedServiceImpl.class);
 	}

 	@Test
-	public void annotatedService_PTC_true() {
+	void annotatedService_PTC_true() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(PTCTrue.class, NonAnnotatedServiceImpl.class);
 		ctx.refresh();
 		AnnotatedService s = ctx.getBean(AnnotatedService.class);
-		assertTrue("expected a subclass proxy", AopUtils.isCglibProxy(s));
-		assertThat(s, instanceOf(NonAnnotatedServiceImpl.class));
+		assertThat(AopUtils.isCglibProxy(s)).isTrue();
+		assertThat(s).isInstanceOf(NonAnnotatedServiceImpl.class);
 	}

 	@Test
-	public void annotatedService_PTC_false() {
+	void annotatedService_PTC_false() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(PTCFalse.class, NonAnnotatedServiceImpl.class);
 		ctx.refresh();
 		AnnotatedService s = ctx.getBean(AnnotatedService.class);
-		assertTrue("expected a jdk proxy", AopUtils.isJdkDynamicProxy(s));
-		assertThat(s, not(instanceOf(NonAnnotatedServiceImpl.class)));
+		assertThat(AopUtils.isJdkDynamicProxy(s)).isTrue();
+		assertThat(s).isNotInstanceOf(NonAnnotatedServiceImpl.class);
 	}
 }

@@ -0,0 +1 @@
+http\://www.foo.example/schema/component=org.springframework.beans.factory.xml.ComponentNamespaceHandler
@@ -0,0 +1 @@
+http\://www.foo.example/schema/component/component.xsd=org/springframework/beans/factory/xml/component.xsd
@@ -2,11 +2,11 @@
 <Configuration status="WARN">
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n" />
 		</Console>
 	</Appenders>
 	<Loggers>
-		<Root level="error">
+		<Root level="debug">
 			<AppenderRef ref="Console" />
 		</Root>
 	</Loggers>
@@ -2,8 +2,8 @@
 <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"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+		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">

 	<aop:config>
 		<aop:advisor advice-ref="advice" pointcut="execution(* *..ITestBean.*(..))"/>
@@ -11,19 +11,19 @@

 	<bean id="advice" class="org.springframework.aop.interceptor.DebugInterceptor"/>

-	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean"/>
+	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>

-	<bean id="singletonScoped" class="org.springframework.tests.sample.beans.TestBean">
+	<bean id="singletonScoped" class="org.springframework.beans.testfixture.beans.TestBean">
 		<aop:scoped-proxy/>
 		<property name="name" value="Rob Harrop"/>
 	</bean>

-	<bean id="requestScoped" class="org.springframework.tests.sample.beans.TestBean" scope="request">
+	<bean id="requestScoped" class="org.springframework.beans.testfixture.beans.TestBean" scope="request">
 		<aop:scoped-proxy/>
 		<property name="name" value="Rob Harrop"/>
 	</bean>

-	<bean id="sessionScoped" name="sessionScopedAlias" class="org.springframework.tests.sample.beans.TestBean" scope="session">
+	<bean id="sessionScoped" name="sessionScopedAlias" class="org.springframework.beans.testfixture.beans.TestBean" scope="session">
 		<aop:scoped-proxy proxy-target-class="false"/>
 		<property name="name" value="Rob Harrop"/>
 	</bean>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">

 <!--
 	Common bean definitions for auto proxy creator tests.
@@ -34,7 +34,7 @@
 	</bean>

 	<!-- Often we can leave the definition of such infrastructural beans to child factories -->
-	<bean id="txManager" class="org.springframework.tests.transaction.CallCountingTransactionManager"/>
+	<bean id="txManager" class="org.springframework.transaction.testfixture.CallCountingTransactionManager"/>

 	<bean id="tas" class="org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource">
 		<property name="properties">
@@ -74,20 +74,20 @@

 	<!-- These two beans would otherwise be eligible for autoproxying -->

-	<bean id="singletonDependency" class="org.springframework.tests.sample.beans.TestBean" scope="singleton"/>
+	<bean id="singletonDependency" class="org.springframework.beans.testfixture.beans.TestBean" scope="singleton"/>

-	<bean id="prototypeDependency" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/>
+	<bean id="prototypeDependency" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>

 	<!-- ====== End test for prototype definitions to try to provoke circular references ========================= -->

 	<bean class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
 		<property name="advice"><ref bean="countingAdvice"/></property>
-		<property name="pattern"><value>org.springframework.tests.sample.beans.ITestBean.getName</value></property>
+		<property name="pattern"><value>org.springframework.beans.testfixture.beans.ITestBean.getName</value></property>
 	</bean>

-	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingAfterReturningAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.aop.testfixture.advice.CountingAfterReturningAdvice"/>

-	<bean id="test" class="org.springframework.tests.sample.beans.TestBean">
+	<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean">
 		<property name="age"><value>4</value></property>
 	</bean>

@@ -97,7 +97,7 @@

 	<!-- The following beans test whether auto-proxying falls over for a null value -->

-	<bean id="tb" class="org.springframework.tests.sample.beans.TestBean"/>
+	<bean id="tb" class="org.springframework.beans.testfixture.beans.TestBean"/>

 	<bean id="nullValueReturned" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetObject" ref="tb"/>
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:foo="http://www.foo.com/schema/component"
+      xmlns:foo="http://www.foo.example/schema/component"
      xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.foo.com/schema/component http://www.foo.com/schema/component/component.xsd">
+http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.foo.example/schema/component http://www.foo.example/schema/component/component.xsd">

   <foo:component id="bionic-family" name="Bionic-1">
      <foo:component name="Mother-1">
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<xsd:schema xmlns="http://www.foo.com/schema/component"
+<xsd:schema xmlns="http://www.foo.example/schema/component"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-         targetNamespace="http://www.foo.com/schema/component"
+         targetNamespace="http://www.foo.example/schema/component"
         elementFormDefault="qualified"
         attributeFormDefault="unqualified">

@@ -4,8 +4,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation=
-		"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+		"http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"
 	default-autowire="byType">

 	<context:component-scan base-package="org.springframework.context.annotation">
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="dev">

 	<bean id="devBean" class="java.lang.Object"/>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 	profile="prod">

 	<bean id="prodBean" class="java.lang.Object"/>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">

 	<bean id="envAwareBean" class="org.springframework.core.env.EnvironmentSystemIntegrationTests$EnvironmentAwareBean"/>

@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:cache="http://www.springframework.org/schema/cache"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd">

 	<cache:annotation-driven/>

@@ -1,21 +1,10 @@
-/*
 pluginManagement {
 	repositories {
-		maven {
-			url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
-		}
-		gradlePluginPortal()
-	}
-}
-*/
-
-// Workaround for https://github.com/Kotlin/dokka/issues/146
-pluginManagement {
-	repositories {
-		jcenter()
 		gradlePluginPortal()
+		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 }
+apply from: "$rootDir/gradle/build-cache-settings.gradle"

 include "spring-aop"
 include "spring-aspects"
@@ -24,6 +13,8 @@ include "spring-context"
 include "spring-context-support"
 include "spring-context-indexer"
 include "spring-core"
+include "kotlin-coroutines"
+project(':kotlin-coroutines').projectDir = file('spring-core/kotlin-coroutines')
 include "spring-expression"
 include "spring-instrument"
 include "spring-jcl"
@@ -38,13 +29,10 @@ include "spring-web"
 include "spring-webmvc"
 include "spring-webflux"
 include "spring-websocket"
-include "spring-framework-bom"
+include "framework-bom"
+include "integration-tests"

-// Exposes gradle buildSrc for IDE support
-include "buildSrc"
-rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"
-
-rootProject.name = 'spring'
+rootProject.name = "spring"
 rootProject.children.each {project ->
 	project.buildFileName = "${project.name}.gradle"
 }
@@ -2,8 +2,11 @@ description = "Spring AOP"

 dependencies {
 	compile(project(":spring-beans"))
-	compile(project(':spring-core'))
-	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-	optional("org.apache.commons:commons-pool2:2.5.0")
-	optional("com.jamonapi:jamon:2.81")
+	compile(project(":spring-core"))
+	optional("org.aspectj:aspectjweaver")
+	optional("org.apache.commons:commons-pool2")
+	optional("com.jamonapi:jamon")
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-core")))
+	testFixturesImplementation(testFixtures(project(":spring-core")))
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,7 +20,7 @@ package org.aopalliance.aop;
 * Superclass for all AOP infrastructure exceptions.
 * Unchecked, as such exceptions are fatal and end user
 * code shouldn't be forced to catch them.
- * 
+ *
 * @author Rod Johnson
 * @author Bob Lee
 * @author Juergen Hoeller
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,7 +19,7 @@ package org.aopalliance.intercept;
 import java.lang.reflect.Constructor;

 /**
- * Description of an invocation to a constuctor, given to an
+ * Description of an invocation to a constructor, given to an
 * interceptor upon constructor-call.
 *
 * <p>A constructor invocation is a joinpoint and can be intercepted
@@ -30,12 +30,12 @@ import java.lang.reflect.Constructor;
 */
 public interface ConstructorInvocation extends Invocation {

-    /**
-     * Get the constructor being called.
-     * <p>This method is a friendly implementation of the
-     * {@link Joinpoint#getStaticPart()} method (same result).
-     * @return the constructor being called
-     */
-    Constructor<?> getConstructor();
+	/**
+	 * Get the constructor being called.
+	 * <p>This method is a friendly implementation of the
+	 * {@link Joinpoint#getStaticPart()} method (same result).
+	 * @return the constructor being called
+	 */
+	Constructor<?> getConstructor();

 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2016 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.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@ import org.aopalliance.aop.Advice;
 * <p>A generic interceptor can intercept runtime events that occur
 * within a base program. Those events are materialized by (reified
 * in) joinpoints. Runtime joinpoints can be invocations, field
- * access, exceptions... 
+ * access, exceptions...
 *
 * <p>This interface is not used directly. Use the sub-interfaces
 * to intercept specific events. For instance, the following class
@@ -32,8 +32,8 @@ import org.aopalliance.aop.Advice;
 * debugger:
 *
 * <pre class=code>
- * class DebuggingInterceptor implements MethodInterceptor, 
- *     ConstructorInterceptor, FieldInterceptor {
+ * class DebuggingInterceptor implements MethodInterceptor,
+ *     ConstructorInterceptor {
 *
 *   Object invoke(MethodInvocation i) throws Throwable {
 *     debug(i.getMethod(), i.getThis(), i.getArgs());
@@ -44,16 +44,6 @@ import org.aopalliance.aop.Advice;
 *     debug(i.getConstructor(), i.getThis(), i.getArgs());
 *     return i.proceed();
 *   }
- * 
- *   Object get(FieldAccess fa) throws Throwable {
- *     debug(fa.getField(), fa.getThis(), null);
- *     return fa.proceed();
- *   }
- *
- *   Object set(FieldAccess fa) throws Throwable {
- *     debug(fa.getField(), fa.getThis(), fa.getValueToSet());
- *     return fa.proceed();
- *   }
 *
 *   void debug(AccessibleObject ao, Object this, Object value) {
 *     ...
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`apply from: "../gradle/build-cache-settings.gradle"`
				`@@ -1 +0,0 @@`
				`implementation-class=org.springframework.build.gradle.TestSourceSetDependenciesPlugin`
				`@@ -0,0 +1 @@`
				`http\://www.foo.example/schema/component=org.springframework.beans.factory.xml.ComponentNamespaceHandler`