Merge branch 'spring-operator-polish-urls-build-4.1.x' into 4.1.x

Manual URL Cleanup
Closes gh-22518
2026-06-08 17:33:33 +00:00 · 2019-03-12 14:34:12 +01:00 · 2019-03-12 14:33:52 +01:00 · 2019-03-05 21:56:12 -06:00 · 2016-04-08 15:44:36 -04:00 · 2015-12-17 00:51:54 -08:00
2572 changed files with 83582 additions and 159484 deletions
@@ -22,18 +22,10 @@ do not find something similar, please create a new JIRA issue before submitting
 a pull request unless the change is truly trivial -- for example: typo fixes,
 removing compiler warnings, etc.

-### Discuss non-trivial contribution ideas with committers
-
-If you're considering anything more than correcting a typo or fixing a minor
-bug, please discuss it on the [spring-framework-contrib][] mailing list before
-submitting a pull request. We're happy to provide guidance, but please spend an
-hour or two researching the subject on your own, including searching the mailing
-list for prior discussions.
-
-### Sign the Individual Contributor License Agreement (ICLA)
+### Sign the Contributor License Agreement

 If you have not previously done so, please fill out and submit the
-[Spring ICLA form][]. You'll receive a token when this process is complete.
+[SpringSource CLA form][]. You'll receive a token when this process is complete.
 Keep track of this; you may be asked for it later!

 Note that emailing/postal mailing a signed copy is _not_ necessary. Submission
@@ -42,8 +34,8 @@ of the web form is all that is required.
 Once you've completed the web form, simply add the following in a comment on
 your pull request:

-    I have signed and agree to the terms of the Spring Individual Contributor
-    License Agreement.
+    I have signed and agree to the terms of the SpringSource Individual
+    Contributor License Agreement.

 You do not need to include your token/id. Please add the above statement to all
 future pull requests as well, simply so that the Spring Framework team knows
@@ -93,7 +85,7 @@ present in the framework.

 ```java
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -114,18 +106,16 @@ package ...;
 ### Update Apache license header in modified files as necessary

 Always check the date range in the license header. For example, if you've
-modified a file in 2015 whose header still reads:
+modified a file in 2014 whose header still reads:

 ```java
-/*
 * Copyright 2002-2011 the original author or authors.
 ```

-Then be sure to update it to 2015 accordingly:
+Then be sure to update it to 2014 accordingly:

 ```java
-/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
 ```

 ### Use @since tags for newly-added public API types and methods
@@ -137,7 +127,7 @@ For example:
 * ...
 *
 * @author First Last
- * @since 4.2.3
+ * @since 4.0
 * @see ...
 */
 ```
@@ -189,11 +179,11 @@ intend to submit as pull requests. For example, this is not acceptable:
    Author: Nickname <user@mail.com>

 Rather, please include your first and last name, properly capitalized, as
-submitted against the Spring Individual Contributor License Agreement (ICLA):
+submitted against the SpringSource contributor license agreement:

    Author: First Last <user@mail.com>

-This helps ensure traceability against the ICLA and also goes a long way to
+This helps ensure traceability against the CLA and also goes a long way to
 ensuring useful output from tools like `git shortlog` and others.

 You can configure this via the account admin area in GitHub (useful for
@@ -236,16 +226,16 @@ Most importantly, please format your commit messages in the following way
    Issue: SPR-1234, SPR-1235


-1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link".
+1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link"
 1. Begin the subject line with a capitalized verb, e.g. "Add, Prune, Fix,
    Introduce, Avoid, etc."
-1. Do not end the subject line with a period.
-1. Restrict the subject line to 50 characters or less if possible.
-1. Wrap lines in the body at 72 characters or less.
+1. Do not end the subject line with a period
+1. Restrict the subject line to 50 characters or less if possible
+1. Wrap lines in the body at 72 characters or less
 1. Mention associated JIRA issue(s) at the end of the commit comment, prefixed
-    with "Issue: " as above.
+    with "Issue: " as above
 1. In the body of the commit message, explain how things worked before this
-    commit, what has changed, and how things work now.
+    commit, what has changed, and how things work now

 For examples of this style, issue a `git log --author=cbeams` in the
 `spring-framework` git repository. For convenience, here are several such commits:
@@ -276,9 +266,9 @@ In the body:
    mechanisms in the framework insufficient? Make a case that this is a
    general-purpose problem and that yours is a general-purpose solution, etc.
 1. Add any additional information and ask questions; start a conversation or
-    continue one from JIRA.
-1. Mention the JIRA issue ID.
-1. Also mention that you have submitted the ICLA as described above.
+    continue one from JIRA
+1. Mention the JIRA issue ID
+1. Also mention that you have submitted the CLA as described above

 Note that for pull requests containing a single commit, GitHub will default the
 subject line and body of the pull request to match the subject line and body of
@@ -309,7 +299,7 @@ need to issue a new pull request when asked to make changes.
 [help documentation]: http://help.github.com/send-pull-requests
 [JIRA issue tracker]: https://jira.spring.io/browse/SPR
 [spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib
-[Spring ICLA form]: https://support.springsource.com/spring_committer_signup
+[SpringSource CLA form]: https://support.springsource.com/spring_committer_signup
 [fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
 [Spring Framework Code Style]: https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style
 [Rewriting History section of Pro Git]: http://git-scm.com/book/en/Git-Tools-Rewriting-History
@@ -1,29 +1,30 @@
 ## Spring Framework
 The Spring Framework provides a comprehensive programming and configuration
-model for modern Java-based enterprise applications -- on any kind of deployment
+model for modern Java-based enterprise applications - on any kind of deployment
 platform. A key element of Spring is infrastructural support at the application
 level: Spring focuses on the "plumbing" of enterprise applications so that teams
 can focus on application-level business logic, without unnecessary ties to
 specific deployment environments.

-The framework also serves as the foundation for [Spring Integration][], [Spring Batch][]
-and the rest of the Spring [family of projects][]. Browse the repositories under
-the [Spring organization][] on GitHub for a full list.
+The framework also serves as the foundation for [Spring Integration][], [Spring
+Batch][] and the rest of the Spring [family of projects][]. Browse the repositories
+under the [Spring organization][] on GitHub for a full list.

 ## Downloading Artifacts
 See [downloading Spring artifacts][] for Maven repository information. Unable to
-use Maven or other transitive dependency management tools?
-See [building a distribution with dependencies][].
+use Maven or other transitive dependency management tools? See [building a
+distribution with dependencies][].

 ## Documentation
 See the current [Javadoc][] and [reference docs][].

 ## Getting Support
-Check out the [spring][spring tags] tags on [Stack Overflow][]. [Commercial support][]
+Check out the [Spring forums][] and the [spring][spring tag] and
+[spring-mvc][spring-mvc tag] tags on [Stack Overflow][]. [Commercial support][]
 is available too.

 ## Issue Tracking
-Report issues via the [Spring Framework JIRA][]. Understand our issue management
+Report issues via the [Spring Framework JIRA]. Understand our issue management
 process by reading about [the lifecycle of an issue][]. Think you've found a
 bug? Please consider submitting a reproduction project via the
 [spring-framework-issues][] GitHub repository. The [readme][] there provides
@@ -76,7 +77,9 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
 [building a distribution with dependencies]: https://github.com/spring-projects/spring-framework/wiki/Building-a-distribution-with-dependencies
 [Javadoc]: http://docs.spring.io/spring-framework/docs/current/javadoc-api/
 [reference docs]: http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/
-[spring tags]: http://spring.io/questions
+[Spring forums]: http://forum.spring.io/
+[spring tag]: http://stackoverflow.com/questions/tagged/spring
+[spring-mvc tag]: http://stackoverflow.com/questions/tagged/spring-mvc
 [Stack Overflow]: http://stackoverflow.com/faq
 [Commercial support]: http://spring.io/services
 [Spring Framework JIRA]: https://jira.spring.io/browse/SPR
@@ -4,7 +4,7 @@ buildscript {
 	}
 	dependencies {
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-		classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.2")
+		classpath("org.asciidoctor:asciidoctor-gradle-plugin:0.7.0")
 		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
 		classpath("ws.antonov.gradle.plugins:gradle-plugin-protobuf:0.9.1")
 	}
@@ -28,56 +28,35 @@ configure(allprojects) { project ->
 	version = qualifyVersionIfNecessary(version)

 	ext.aspectjVersion       = "1.8.7"
-	ext.eclipselinkVersion   = "2.4.2"
-	ext.ehcacheVersion       = "2.10.1"
-	ext.ehcachejcacheVersion = "1.0.1"
-	ext.ehcache3Version      = "3.0.0.m3"
-	ext.ejbApiVersion        = "3.0"
-	ext.fileuploadVersion    = "1.3.1"
-	ext.freemarkerVersion    = "2.3.23"
-	ext.groovyVersion        = "2.4.5"
-	ext.gsonVersion          = "2.4"
-	ext.guavaVersion         = "18.0"
-	ext.hamcrestVersion      = "1.3"
+	ext.eclipseLinkVersion   = "2.4.2"
+	ext.ehcacheVersion       = "2.9.1"
+	ext.ehcacheJCacheVersion = "1.0.1"
+	ext.groovyVersion        = "2.3.11"
+	ext.gsonVersion          = "2.3.1"
 	ext.hibernate3Version    = "3.6.10.Final"
 	ext.hibernate4Version    = "4.3.11.Final"
-	ext.hibernate5Version    = "5.0.3.Final"
-	ext.hibval4Version       = "4.3.2.Final"
-	ext.hibval5Version       = "5.2.2.Final"
+	ext.hibVal4Version       = "4.3.2.Final"
+	ext.hibVal5Version       = "5.1.3.Final"
 	ext.hsqldbVersion        = "2.3.3"
-	ext.htmlunitVersion      = "2.19"
-	ext.httpasyncVersion     = "4.1.1"
-	ext.httpclientVersion    = "4.5.1"
-	ext.jackson2Version      = "2.6.3"
-	ext.jasperreportsVersion = "6.2.0"
-	ext.javamailVersion      = "1.5.4"
-	ext.jettyVersion         = "9.3.6.v20151106"
-	ext.jodaVersion          = "2.9.1"
-	ext.jrubyVersion         = "1.7.22"  // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
-	ext.jsonassertVersion    = "1.2.3"
-	ext.jsonpathVersion      = "2.0.0"
-	ext.jtaVersion           = "1.2"
+	ext.jackson2Version      = "2.4.6"
+	ext.jasperReportsVersion = "6.0.4"
+	ext.jettyVersion         = "9.2.14.v20151106"
+	ext.jodaVersion          = "2.8.2"
 	ext.junitVersion         = "4.12"
 	ext.nettyVersion         = "4.0.33.Final"
-	ext.okhttpVersion        = "2.5.0"
-	ext.openjpaVersion       = "2.4.0"
-	ext.poiVersion           = "3.13"
+	ext.openJpaVersion       = "2.2.2"  // 2.3.0 not Java 8 compatible (based on ASM 4)
 	ext.protobufVersion      = "2.6.1"
-	ext.reactorVersion       = "2.0.7.RELEASE"
-	ext.romeVersion          = "1.5.1"
-	ext.seleniumVersion      = "2.48.2"
+	ext.reactorVersion       = "1.1.6.RELEASE"
 	ext.slf4jVersion         = "1.7.13"
-	ext.snakeyamlVersion     = "1.16"
-	ext.snifferVersion       = "1.14"
-	ext.testngVersion        = "6.9.9"
+	ext.snakeYamlVersion     = "1.16"
+	ext.snifferVersion       = "1.11"
 	ext.tiles2Version        = "2.2.2"
 	ext.tiles3Version        = "3.0.5"
-	ext.tomcatVersion        = "8.0.28"
+	ext.tomcatVersion        = "8.0.30"
 	ext.tyrusVersion         = "1.3.5"  // constrained by WebLogic 12.1.3 support
-	ext.undertowVersion      = "1.3.5.Final"
-	ext.woodstoxVersion      = "5.0.1"
-	ext.xmlunitVersion       = "1.6"
-	ext.xstreamVersion       = "1.4.8"
+	ext.undertowVersion      = "1.1.9.Final"
+	ext.woodstoxVersion      = "4.4.1"
+	ext.xstreamVersion       = "1.4.7"

 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"

@@ -100,7 +79,7 @@ configure(allprojects) { project ->
 	]

 	compileTestJava.options*.compilerArgs = [
-		"-Xlint:serial", "-Xlint:-varargs", "-Xlint:cast", "-Xlint:classfile",
+		"-Xlint:serial", "-Xlint:varargs", "-Xlint:cast", "-Xlint:classfile",
 		"-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally",
 		"-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static",
 		"-Xlint:try", "-Xlint:-fallthrough", "-Xlint:-rawtypes", "-Xlint:-deprecation",
@@ -117,6 +96,8 @@ configure(allprojects) { project ->
 		options.compilerArgs += "-parameters"
 	}

+	sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
+
 	test {
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
@@ -130,18 +111,16 @@ configure(allprojects) { project ->

 	repositories {
 		maven { url "https://repo.spring.io/libs-release" }
-		maven { url "https://repo.spring.io/milestone" }
-		maven { url "https://repo.spring.io/snapshot" }   // reactor 2.0.6 snapshot
 	}

 	dependencies {
 		testCompile("junit:junit:${junitVersion}") {
 			exclude group:'org.hamcrest', module:'hamcrest-core'
 		}
-		testCompile("org.mockito:mockito-core:1.10.19") {
+		testCompile("org.mockito:mockito-core:1.9.5") {
 			exclude group:'org.hamcrest', module:'hamcrest-core'
 		}
-		testCompile("org.hamcrest:hamcrest-all:${hamcrestVersion}")
+		testCompile("org.hamcrest:hamcrest-all:1.3")

 		sniffer("org.codehaus.mojo:animal-sniffer-ant-tasks:${snifferVersion}")
 		javaApiSignature("org.codehaus.mojo.signature:java16:1.1@signature")  // API level from JDK 6 update 18
@@ -184,27 +163,27 @@ configure(allprojects) { project ->
 	}

 	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://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
-		"http://commons.apache.org/proper/commons-codec/apidocs/",
-		"http://commons.apache.org/proper/commons-dbcp/apidocs/",
-		"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
-		"http://tiles.apache.org/tiles-request/apidocs/",
-		"http://tiles.apache.org/framework/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://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/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://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
+		"https://commons.apache.org/proper/commons-codec/apidocs/",
+		"https://commons.apache.org/proper/commons-dbcp/apidocs/",
+		"https://portals.apache.org/pluto/portlet-2.0-apidocs/",
+		"https://tiles.apache.org/tiles-request/apidocs/",
+		"https://tiles.apache.org/framework/apidocs/",
 		"http://aopalliance.sourceforge.net/doc/",
-		"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
-		"http://ehcache.org/apidocs/",
-		"http://quartz-scheduler.org/api/2.2.0/",
-		"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/",
-		"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/",
-		"http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/",
-		"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"
+		"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
+		"https://www.ehcache.org/apidocs/${ehcacheVersion}/",
+		"https://www.quartz-scheduler.org/api/2.2.2/",
+		"https://fasterxml.github.io/jackson-core/javadoc/2.3.0/",
+		"https://fasterxml.github.io/jackson-databind/javadoc/2.3.0/",
+		"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/",
+		"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"
 	] as String[]
 }

@@ -287,12 +266,12 @@ project("spring-build-src") {
 project("spring-core") {
 	description = "Spring Core"

-	// As of Spring 4.0.3, spring-core includes asm 5.0 and repackages cglib 3.2, inlining
-	// both into the spring-core jar. cglib 3.2 itself depends on asm 5.0 and is therefore
+	// As of Spring 4.0.3, spring-core includes asm 5.0 and repackages cglib 3.1, inlining
+	// both into the spring-core jar. cglib 3.1 itself depends on asm 4+, and is therefore
 	// further transformed by the JarJar task to depend on org.springframework.asm; this
 	// avoids including two different copies of asm unnecessarily.
-	def cglibVersion = "3.2.0"
-	def objenesisVersion = "2.2"
+	def cglibVersion = "3.1"
+	def objenesisVersion = "2.1"

 	configurations {
 		jarjar
@@ -348,15 +327,14 @@ project("spring-core") {
 		jarjar("com.googlecode.jarjar:jarjar:1.3")

 		compile(files(cglibRepackJar))
-		compile(files(objenesisRepackJar))
 		compile("commons-logging:commons-logging:1.2")
 		optional("commons-codec:commons-codec:1.10")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("net.sf.jopt-simple:jopt-simple:4.9")
 		optional("log4j:log4j:1.2.17")
 		testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
-		testCompile("xmlunit:xmlunit:${xmlunitVersion}")
-		testCompile("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") {
+		testCompile("xmlunit:xmlunit:1.6")
+		testCompile("org.codehaus.woodstox:woodstox-core-asl:${woodstoxVersion}") {
 			exclude group: "stax", module: "stax-api"
 		}
 	}
@@ -383,7 +361,7 @@ project("spring-beans") {
 		compile(files(project(":spring-core").cglibRepackJar))
 		optional("javax.inject:javax.inject:1")
 		optional("javax.el:javax.el-api:2.2.5")
-		optional("org.yaml:snakeyaml:${snakeyamlVersion}")
+		optional("org.yaml:snakeyaml:${snakeYamlVersion}")
 		testCompile("log4j:log4j:1.2.17")
 		testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
    }
@@ -426,7 +404,6 @@ project("spring-aop") {
 		compile("aopalliance:aopalliance:1.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("commons-pool:commons-pool:1.6")
-		optional("org.apache.commons:commons-pool2:2.4.2")
 		optional("com.jamonapi:jamon:2.81")
 	}
 }
@@ -459,10 +436,6 @@ project("spring-instrument-tomcat") {
 	dependencies {
 		provided("org.apache.tomcat:catalina:6.0.16")
 	}
-
-	jar {
-		exclude("org/apache/**")  // exclude the mock used to bridge between pre-7.0.63 and 7.0.63+
-	}
 }

 project("spring-context") {
@@ -477,23 +450,23 @@ project("spring-context") {
 		compile(files(project(":spring-core").cglibRepackJar))
 		optional(project(":spring-instrument"))
 		optional("javax.inject:javax.inject:1")
-		optional("javax.ejb:ejb-api:${ejbApiVersion}")
+		optional("javax.ejb:ejb-api:3.0")
 		optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
-		optional("javax.money:money-api:1.0")
 		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 		optional("javax.validation:validation-api:1.0.0.GA")
-		optional("org.hibernate:hibernate-validator:${hibval4Version}")
+		optional("org.hibernate:hibernate-validator:${hibVal4Version}")
 		optional("joda-time:joda-time:${jodaVersion}")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 		optional("org.beanshell:bsh:2.0b4")
-		optional("org.jruby:jruby:${jrubyVersion}")
+		optional("org.jruby:jruby:1.7.22")
 		testCompile("javax.inject:javax.inject-tck:1")
-		testCompile("org.javamoney:moneta:1.0")
 		testCompile("commons-dbcp:commons-dbcp:1.4")
-		testCompile("org.apache.commons:commons-pool2:2.4.2")
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	}
+
+	// pick up RmiInvocationWrapperRTD.xml in src/main
+	sourceSets.main.resources.srcDirs += "src/main/java"
 }

 project("spring-messaging") {
@@ -503,17 +476,16 @@ project("spring-messaging") {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		compile(project(":spring-context"))
-		optional(project(":spring-oxm"))
-		optional("io.projectreactor:reactor-core:${reactorVersion}")
-		optional("io.projectreactor:reactor-net:${reactorVersion}") {
+		optional("org.projectreactor:reactor-core:${reactorVersion}")
+		optional("org.projectreactor:reactor-net:${reactorVersion}") {
 			exclude group: "io.netty", module: "netty-all"
 		}
-		optional("io.netty:netty-all:${nettyVersion}")
 		optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
 			exclude group: "javax.servlet", module: "javax.servlet-api"
 		}
 		optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
+		testCompile(project(":spring-test"))
 		testCompile("javax.inject:javax.inject-tck:1")
 		testCompile("javax.servlet:javax.servlet-api:3.1.0")
 		testCompile("javax.validation:validation-api:1.0.0.GA")
@@ -533,7 +505,6 @@ project("spring-messaging") {
 		testCompile("commons-dbcp:commons-dbcp:1.4")
 		testCompile("log4j:log4j:1.2.17")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("xmlunit:xmlunit:${xmlunitVersion}")
 	}
 }

@@ -546,9 +517,9 @@ project("spring-tx") {
 		optional(project(":spring-aop"))
 		optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
 		optional("aopalliance:aopalliance:1.0")
-		optional("javax.transaction:javax.transaction-api:${jtaVersion}")
+		optional("javax.transaction:javax.transaction-api:1.2")
 		optional("javax.resource:connector-api:1.5")
-		optional("javax.ejb:ejb-api:${ejbApiVersion}")
+		optional("javax.ejb:ejb-api:3.0")
 		optional("com.ibm.websphere:uow:6.0.2.17")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
@@ -561,16 +532,11 @@ project("spring-oxm") {

 	compileTestJava {
 		// necessary to avoid java.lang.VerifyError on jibx compilation
-		// see http://jira.codehaus.org/browse/JIBX-465
+		// see https://jira.codehaus.org/browse/JIBX-465
 		sourceCompatibility = 1.6
 		targetCompatibility = 1.6
 	}

-	if (!System.getProperty("java.version").contains("1.8.")) {
-		// necessary because castor and xjc tasks cannot find the JDK's compiler on JDK 9
-		compileTestJava.enabled = false
-	}
-
 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
@@ -587,16 +553,14 @@ project("spring-oxm") {
 		}
 		optional("org.jibx:jibx-run:1.2.6")
 		testCompile(project(":spring-context"))
-		testCompile("xmlunit:xmlunit:${xmlunitVersion}")
+		testCompile("xmlunit:xmlunit:1.6")
 		testCompile("xpp3:xpp3:1.1.4c")
 		testCompile("org.codehaus.jettison:jettison:1.3.7") {
 			exclude group: 'stax', module: 'stax-api'
 		}
-		if (compileTestJava.enabled) {
-			testCompile(files(genCastor.classesDir).builtBy(genCastor))
-			testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-			testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
-		}
+		testCompile(files(genCastor.classesDir).builtBy(genCastor))
+		testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
+		testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
 	}
 }

@@ -613,7 +577,7 @@ project("spring-jms") {
 		provided("javax.jms:jms-api:1.1-rev-1")
 		optional(project(":spring-oxm"))
 		optional("aopalliance:aopalliance:1.0")
-		optional("javax.transaction:javax.transaction-api:${jtaVersion}")
+		optional("javax.transaction:javax.transaction-api:1.2")
 		optional("javax.resource:connector-api:1.5")
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	}
@@ -627,12 +591,12 @@ project("spring-jdbc") {
 		compile(project(":spring-core"))
 		compile(project(":spring-tx"))
 		optional(project(":spring-context"))  // for JndiDataSourceLookup
-		optional("javax.transaction:javax.transaction-api:${jtaVersion}")
+		optional("javax.transaction:javax.transaction-api:1.2")
 		optional("com.mchange:c3p0:0.9.5.1")
 		optional("org.hsqldb:hsqldb:${hsqldbVersion}")
 		optional("com.h2database:h2:1.4.190")
-		optional("org.apache.derby:derby:10.12.1.1")
-		optional("org.apache.derby:derbyclient:10.12.1.1")
+		optional("org.apache.derby:derby:10.11.1.1")
+		optional("org.apache.derby:derbyclient:10.11.1.1")
 	}
 }

@@ -645,16 +609,16 @@ project("spring-context-support") {
 		compile(project(":spring-context"))
 		optional(project(":spring-jdbc"))  // for Quartz support
 		optional(project(":spring-tx"))  // for Quartz support
-		optional("javax.mail:javax.mail-api:${javamailVersion}")
+		optional("javax.mail:javax.mail-api:1.5.2")
 		optional("javax.cache:cache-api:1.0.0")
-		optional("com.google.guava:guava:${guavaVersion}")
+		optional("com.google.guava:guava:18.0")
 		optional("net.sf.ehcache:ehcache:${ehcacheVersion}")
 		optional("org.quartz-scheduler:quartz:2.2.1")
 		optional("org.codehaus.fabric3.api:commonj:1.1.0")
 		optional("org.apache.velocity:velocity:1.7")
-		optional("org.freemarker:freemarker:${freemarkerVersion}")
+		optional("org.freemarker:freemarker:2.3.22")
 		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:$jasperreportsVersion") {
+		optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {
 			exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
 			exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
 			exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -663,14 +627,17 @@ project("spring-context-support") {
 			exclude group: "org.springframework", module: "spring-context"
 		}
 		testCompile(project(":spring-context"))
-		testCompile("org.apache.poi:poi:${poiVersion}")
+		testCompile("org.apache.poi:poi:3.11")
 		testCompile("commons-beanutils:commons-beanutils:1.8.0")  // for Velocity/JasperReports
 		testCompile("commons-digester:commons-digester:1.8.1")  // for Velocity/JasperReports
 		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
-		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
-		testRuntime("org.ehcache:jcache:${ehcachejcacheVersion}")
+		testCompile("org.ehcache:jcache:${ehcacheJCacheVersion}")
+		testRuntime("com.sun.mail:javax.mail:1.5.2")
 	}
+
+	// pick up **/mime.types files in src/main
+	sourceSets.main.resources.srcDirs += "src/main/java"
 }

 project("spring-web") {
@@ -703,19 +670,17 @@ project("spring-web") {
 		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.5")
 		optional("javax.faces:javax.faces-api:2.2")
-		optional("javax.validation:validation-api:1.0.0.GA")
 		optional("aopalliance:aopalliance:1.0")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 		optional("com.caucho:hessian:4.0.38")
-		optional("commons-fileupload:commons-fileupload:${fileuploadVersion}")
-		optional("org.apache.httpcomponents:httpclient:${httpclientVersion}")
-		optional("org.apache.httpcomponents:httpasyncclient:${httpasyncVersion}")
+		optional("commons-fileupload:commons-fileupload:1.3.1")
+		optional("org.apache.httpcomponents:httpclient:4.3.6")
+		optional("org.apache.httpcomponents:httpasyncclient:4.0.2")
 		optional("io.netty:netty-all:${nettyVersion}")
-		optional("com.squareup.okhttp:okhttp:${okhttpVersion}")
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
 		optional("com.google.code.gson:gson:${gsonVersion}")
-		optional("com.rometools:rome:${romeVersion}")
+		optional("com.rometools:rome:1.5.1")
 		optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
 			exclude group: "javax.servlet", module: "javax.servlet-api"
 		}
@@ -725,18 +690,19 @@ project("spring-web") {
 		optional("log4j:log4j:1.2.17")
 		optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.2")
 		optional("com.google.protobuf:protobuf-java:${protobufVersion}")
-		optional("javax.mail:javax.mail-api:${javamailVersion}")
+		optional("javax.mail:javax.mail-api:1.5.2")
 		testCompile(project(":spring-context-support"))  // for JafMediaTypeFactory
-		testCompile("xmlunit:xmlunit:${xmlunitVersion}")
+		testCompile("xmlunit:xmlunit:1.6")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
 			exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
 		}
 		testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson2Version}")
-		testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk7:${jackson2Version}")
-		testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}")
-		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
+		testRuntime("com.sun.mail:javax.mail:1.5.2")
 	}
+
+	// pick up ContextLoader.properties in src/main
+	sourceSets.main.resources.srcDirs += "src/main/java"
 }

 project("spring-websocket") {
@@ -778,8 +744,8 @@ project("spring-websocket") {
 		testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 		testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
 		testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}")
-		testCompile("io.projectreactor:reactor-net:${reactorVersion}")
-		testCompile("io.netty:netty-all:${nettyVersion}")
+		testCompile("org.projectreactor:reactor-core:${reactorVersion}")
+		testCompile("org.projectreactor:reactor-net:${reactorVersion}")
 		testCompile("log4j:log4j:1.2.17")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
@@ -798,8 +764,8 @@ project("spring-orm") {
 		optional(project(":spring-web"))
 		optional("aopalliance:aopalliance:1.0")
 		optional("org.eclipse.persistence:javax.persistence:2.0.5")
-		optional("org.eclipse.persistence:org.eclipse.persistence.core:${eclipselinkVersion}")
-		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:${eclipselinkVersion}") {
+		optional("org.eclipse.persistence:org.eclipse.persistence.core:${eclipseLinkVersion}")
+		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:${eclipseLinkVersion}") {
 			exclude group: 'org.eclipse.persistence', module: 'javax.persistence'
 		}
 		optional("org.hibernate:hibernate-core:${hibernate3Version}") {
@@ -809,13 +775,13 @@ project("spring-orm") {
 		optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}") {
 			exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
 		}
-		optional("org.apache.openjpa:openjpa:${openjpaVersion}") {
+		optional("org.apache.openjpa:openjpa:${openJpaVersion}") {
 			exclude group: 'junit', module: 'junit'
 			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jpa_2.0_spec'
 			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
 			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
 		}
-		optional("javax.jdo:jdo-api:3.1") {
+		optional("javax.jdo:jdo-api:3.0.1") {
 			exclude group: 'javax.transaction', module: 'transaction-api'
 		}
 		optional("javax.servlet:javax.servlet-api:3.0.1")
@@ -839,27 +805,12 @@ project("spring-orm-hibernate4") {
 		optional("javax.servlet:javax.servlet-api:3.0.1")
        optional("aopalliance:aopalliance:1.0")
 		testCompile("javax.validation:validation-api:1.1.0.GA")
-		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
+		testCompile("org.hibernate:hibernate-validator:${hibVal5Version}")
 		testCompile("javax.el:javax.el-api:2.2.5")
 		testCompile("org.glassfish.web:javax.el:2.2.6")
 	}
 }

-project("spring-orm-hibernate5") {
-	description = "Spring Object/Relational Mapping - Hibernate 5 support"
-	merge.into = project(":spring-orm")
-
-	dependencies {
-		provided(project(":spring-jdbc"))
-		provided(project(":spring-tx"))
-		optional(project(":spring-web"))
-		optional("org.hibernate:hibernate-core:${hibernate5Version}")
-		optional("org.hibernate:hibernate-entitymanager:${hibernate5Version}")
-		optional("javax.servlet:javax.servlet-api:3.0.1")
-		optional("aopalliance:aopalliance:1.0")
-	}
-}
-
 project("spring-webmvc") {
 	description = "Spring Web MVC"

@@ -876,14 +827,13 @@ project("spring-webmvc") {
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
 		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
 		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
-		optional("org.apache.poi:poi:${poiVersion}")
-		optional("org.apache.poi:poi-ooxml:${poiVersion}")
+		optional("org.apache.poi:poi:3.11")
 		optional("org.apache.velocity:velocity:1.7")
 		optional("velocity-tools:velocity-tools-view:1.4")
-		optional("org.freemarker:freemarker:${freemarkerVersion}")
+		optional("org.freemarker:freemarker:2.3.22")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 		optional("com.lowagie:itext:2.1.7")
-		optional("net.sf.jasperreports:jasperreports:$jasperreportsVersion") {
+		optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {
 			exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
 			exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
 			exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -893,7 +843,7 @@ project("spring-webmvc") {
 		}
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
-		optional("com.rometools:rome:${romeVersion}")
+		optional("com.rometools:rome:1.5.1")
 		optional("javax.el:javax.el-api:2.2.5")
 		optional("org.apache.tiles:tiles-api:${tiles3Version}")
 		optional("org.apache.tiles:tiles-core:${tiles3Version}") {
@@ -912,10 +862,9 @@ project("spring-webmvc") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 			exclude group: "org.springframework", module: "spring-web"
 		}
-		optional('org.webjars:webjars-locator:0.28')
 		testCompile(project(":spring-aop"))
 		testCompile("rhino:js:1.7R1")
-		testCompile("xmlunit:xmlunit:${xmlunitVersion}")
+		testCompile("xmlunit:xmlunit:1.6")
 		testCompile("dom4j:dom4j:1.6.1") {
 			exclude group: "xml-apis", module: "xml-apis"
 		}
@@ -931,16 +880,16 @@ project("spring-webmvc") {
 			exclude group: "javax.servlet", module: "javax.servlet"
 		}
 		testCompile("javax.validation:validation-api:1.0.0.GA")
-		testCompile("org.hibernate:hibernate-validator:${hibval4Version}")
-		testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
-		testCompile("commons-fileupload:commons-fileupload:${fileuploadVersion}")
+		testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
+		testCompile("org.apache.httpcomponents:httpclient:4.3.6")
+		testCompile("commons-fileupload:commons-fileupload:1.3.1")
 		testCompile("commons-io:commons-io:1.3")
 		testCompile("joda-time:joda-time:${jodaVersion}")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("org.jruby:jruby:${jrubyVersion}")
-		testCompile("org.python:jython-standalone:2.5.3")
-		testCompile("org.webjars:underscorejs:1.8.3")
 	}
+
+	// pick up DispatcherServlet.properties in src/main
+	sourceSets.main.resources.srcDirs += "src/main/java"
 }

 project("spring-webmvc-tiles2") {
@@ -986,8 +935,11 @@ project("spring-webmvc-portlet") {
 		compile(project(":spring-webmvc"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		provided("javax.portlet:portlet-api:2.0")
-		optional("commons-fileupload:commons-fileupload:${fileuploadVersion}")
+		optional("commons-fileupload:commons-fileupload:1.3.1")
 	}
+
+	// pick up DispatcherPortlet.properties in src/main
+	sourceSets.main.resources.srcDirs += "src/main/java"
 }

 project("spring-test") {
@@ -1004,7 +956,7 @@ project("spring-test") {
 		optional(project(":spring-webmvc"))
 		optional(project(":spring-webmvc-portlet"))
 		optional("junit:junit:${junitVersion}")
-		optional("org.testng:testng:${testngVersion}")
+		optional("org.testng:testng:6.8.8")
 		optional("javax.inject:javax.inject:1")
 		optional("javax.servlet:javax.servlet-api:3.0.1")
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
@@ -1016,22 +968,20 @@ project("spring-test") {
 		optional("javax.el:javax.el-api:2.2.5")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
-		optional("org.hamcrest:hamcrest-core:${hamcrestVersion}")
-		optional("com.jayway.jsonpath:json-path:${jsonpathVersion}")
-		optional("org.skyscreamer:jsonassert:${jsonassertVersion}")
-		optional("xmlunit:xmlunit:${xmlunitVersion}")
-		optional("net.sourceforge.htmlunit:htmlunit:${htmlunitVersion}")
-		optional("org.seleniumhq.selenium:selenium-htmlunit-driver:${seleniumVersion}")
+		optional("org.hamcrest:hamcrest-core:1.3")
+		optional("com.jayway.jsonpath:json-path:1.2.0")
+		optional("org.skyscreamer:jsonassert:1.2.3")
+		optional("xmlunit:xmlunit:1.6")
 		testCompile(project(":spring-context-support"))
 		testCompile(project(":spring-oxm"))
-		testCompile("javax.mail:javax.mail-api:${javamailVersion}")
-		testCompile("javax.ejb:ejb-api:${ejbApiVersion}")
+		testCompile("javax.mail:javax.mail-api:1.5.2")
+		testCompile("javax.ejb:ejb-api:3.0")
 		testCompile("org.hibernate:hibernate-core:${hibernate4Version}")
 		testCompile("org.hibernate:hibernate-entitymanager:${hibernate4Version}")
-		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
+		testCompile("org.hibernate:hibernate-validator:${hibVal5Version}")
 		testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 		testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
-		testCompile("com.rometools:rome:${romeVersion}")
+		testCompile("com.rometools:rome:1.5.1")
 		testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
 		testCompile("org.apache.tiles:tiles-core:${tiles3Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
@@ -1040,10 +990,7 @@ project("spring-test") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
 		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
-		testCompile("javax.cache:cache-api:1.0.0")
-		testRuntime("org.ehcache:ehcache:${ehcache3Version}")
+		testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
 	}

 	task testNG(type: Test) {
@@ -1078,8 +1025,8 @@ project("spring-aspects") {

 	dependencies {
 		aspects(project(":spring-orm"))
-		ajc("org.aspectj:aspectjtools:1.9.0.BETA-2")  // for the ability to build on JDK 9, not exposed in the POMs yet
-		rt("org.aspectj:aspectjrt:${aspectjVersion}")  // regular AspectJ version here, to be exposed in the POMs
+		ajc("org.aspectj:aspectjtools:${aspectjVersion}")
+		rt("org.aspectj:aspectjrt:${aspectjVersion}")
 		compile("org.aspectj:aspectjweaver:${aspectjVersion}")
 		provided("org.eclipse.persistence:javax.persistence:2.0.0")
 		optional(project(":spring-aop"))  // for @Async support
@@ -1088,11 +1035,10 @@ project("spring-aspects") {
 		optional(project(":spring-context-support"))  // for JavaMail and JSR-107 support
 		optional(project(":spring-orm"))  // for JPA exception translation support
 		optional(project(":spring-tx"))  // for JPA, @Transactional support
-		optional("javax.transaction:javax.transaction-api:${jtaVersion}")  // for @javax.transaction.Transactional support
 		optional("javax.cache:cache-api:1.0.0")
 		testCompile(project(":spring-core"))  // for CodeStyleAspect
 		testCompile(project(":spring-test"))
-		testCompile("javax.mail:javax.mail-api:${javamailVersion}")
+		testCompile("javax.mail:javax.mail-api:1.5.2")
 	}

 	eclipse.project {
@@ -1156,7 +1102,7 @@ sonarRunner {
 configure(rootProject) {
 	description = "Spring Framework"

-	apply plugin: "org.asciidoctor.convert"
+	apply plugin: "asciidoctor"
 	apply plugin: "docbook-reference"
 	apply plugin: "groovy"

@@ -1164,13 +1110,17 @@ configure(rootProject) {
 	apply from: "${gradleScriptDir}/jdiff.gradle"

 	asciidoctor {
-		sourceDir project.file('src/asciidoc')
-		separateOutputDirs = false
-		backends = ['docbook']
-		options doctype: 'book', eruby: 'erubis'
-		attributes 	'spring-version': project.version,
-					'revnumber' : project.version,
-					'docinfo' : ""
+		baseDir = project.file('src/asciidoc')
+		backend = 'docbook5'
+		options = [
+			eruby: 'erubis',
+			attributes: [
+				doctype: 'book',
+				'spring-version' : project.version,
+				revnumber : project.version,
+				docinfo : ""
+			]
+		]
 	}

 	reference {
@@ -1258,7 +1208,7 @@ configure(rootProject) {
 		baseName = "spring-framework"
 		classifier = "docs"
 		description = "Builds -${classifier} archive containing api and reference " +
-			"for deployment at http://static.springframework.org/spring-framework/docs."
+			"for deployment at https://docs.spring.io/spring-framework/docs."

 		from("src/dist") {
 			include "changelog.txt"
@@ -1278,7 +1228,7 @@ configure(rootProject) {
 		baseName = "spring-framework"
 		classifier = "schema"
 		description = "Builds -${classifier} archive containing all " +
-			"XSDs for deployment at http://springframework.org/schema."
+			"XSDs for deployment at https://springframework.org/schema."
 		duplicatesStrategy 'exclude'
 		moduleProjects.each { subproject ->
 			def Properties schemas = new Properties();
@@ -1379,7 +1329,7 @@ configure(rootProject) {

 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = "2.5"
+		gradleVersion = "1.12"

 		doLast() {
 			def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -132,9 +132,8 @@ class MergePlugin implements Plugin<Project> {
 						intoConfiguration.dependencies.add(it)
 					}
 				}
-				def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project}
 				project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping(
-					mapping.priority + 100 + index, intoConfiguration, mapping.scope)
+					mapping.priority + 100, intoConfiguration, mapping.scope)
 			}
 		}
 	}
@@ -1 +1 @@
-version=4.2.3.RELEASE
+version=4.1.10.BUILD-SNAPSHOT
@@ -11,7 +11,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 }
@@ -85,8 +85,8 @@ task eclipseJdtPrepare(type: Copy) {
 }

 task cleanEclipseJdtUi(type: Delete) {
-	delete project.file(".settings/org.eclipse.jdt.core.prefs")
 	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
+	delete project.file("org.eclipse.jdt.core.prefs")
 	delete project.file(".settings/org.eclipse.wst.common.component")
 	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
 }
@@ -25,12 +25,12 @@ def customizePom(pom, gradleProject) {
 			url = "https://github.com/spring-projects/spring-framework"
 			organization {
 				name = "Spring IO"
-				url = "http://projects.spring.io/spring-framework"
+				url = "https://projects.spring.io/spring-framework"
 			}
 			licenses {
 				license {
 					name "The Apache Software License, Version 2.0"
-					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
+					url "https://www.apache.org/licenses/LICENSE-2.0.txt"
 					distribution "repo"
 				}
 			}
@@ -1,6 +1,6 @@
-#Thu Jul 09 16:54:55 EEST 2015
+#Wed Apr 30 13:06:57 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
@@ -17,7 +17,7 @@ echo been tested against STS %STS_TEST_VERSION%), but at the minimum you will
 echo need Eclipse + AJDT.
 echo.
 echo If you need to download and install STS, please do that now by
-echo visiting http://spring.io/tools/sts/all 
+echo visiting https://spring.io/tools/sts/all 
 echo.
 echo Otherwise, press enter and we'll begin.

@@ -19,9 +19,9 @@ This script has been tested against:
 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
+- Eclipse downloads: https://download.eclipse.org/eclipse/downloads
+- STS downloads: https://spring.io/tools/sts/all
+- STS nightly builds: https://dist.springsource.com/snapshot/STS/nightly-distributions.html

 If you need to install a recent CI build for AJDT (i.e., so that the
 spring-aspects module properly compiles in Eclipse/STS), click on the
@@ -15,7 +15,6 @@ include "spring-jms"
 include "spring-messaging"
 include "spring-orm"
 include "spring-orm-hibernate4"
-include "spring-orm-hibernate5"
 include "spring-oxm"
 include "spring-test"
 include "spring-tx"
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -57,14 +57,14 @@ public interface ProxyMethodInvocation extends MethodInvocation {
 	 * @return an invocable clone of this invocation.
 	 * {@code proceed()} can be called once per clone.
 	 */
-	MethodInvocation invocableClone(Object... arguments);
+	MethodInvocation invocableClone(Object[] arguments);

 	/**
 	 * Set the arguments to be used on subsequent invocations in the any advice
 	 * in this chain.
 	 * @param arguments the argument array
 	 */
-	void setArguments(Object... arguments);
+	void setArguments(Object[] arguments);

 	/**
 	 * Add the specified user attribute with the given value to this invocation.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ package org.springframework.aop;
 * Minimal interface for exposing the target class behind a proxy.
 *
 * <p>Implemented by AOP proxy objects and proxy factories
- * (via {@link org.springframework.aop.framework.Advised})
+ * (via {@link org.springframework.aop.framework.Advised}}
 * as well as by {@link TargetSource TargetSources}.
 *
 * @author Juergen Hoeller
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -381,7 +381,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}

 	private boolean maybeBindJoinPoint(Class<?> candidateParameterType) {
-		if (JoinPoint.class == candidateParameterType) {
+		if (candidateParameterType.equals(JoinPoint.class)) {
 			this.joinPointArgumentIndex = 0;
 			return true;
 		}
@@ -391,7 +391,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}

 	private boolean maybeBindProceedingJoinPoint(Class<?> candidateParameterType) {
-		if (ProceedingJoinPoint.class == candidateParameterType) {
+		if (candidateParameterType.equals(ProceedingJoinPoint.class)) {
 			if (!supportsProceedingJoinPoint()) {
 				throw new IllegalArgumentException("ProceedingJoinPoint is only supported for around advice");
 			}
@@ -408,7 +408,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}

 	private boolean maybeBindJoinPointStaticPart(Class<?> candidateParameterType) {
-		if (JoinPoint.StaticPart.class == candidateParameterType) {
+		if (candidateParameterType.equals(JoinPoint.StaticPart.class)) {
 			this.joinPointStaticPartArgumentIndex = 0;
 			return true;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -93,7 +93,7 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		if (returnValue != null) {
 			return ClassUtils.isAssignableValue(type, returnValue);
 		}
-		else if (Object.class == type && void.class == method.getReturnType()) {
+		else if (type.equals(Object.class) && method.getReturnType().equals(void.class)) {
 			return true;
 		}
 		else{
@@ -27,7 +27,7 @@ import org.springframework.aop.aspectj.AspectJProxyUtils;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.framework.ProxyCreatorSupport;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

@@ -121,7 +121,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport {
 		List<Advisor> advisors = this.aspectFactory.getAdvisors(instanceFactory);
 		advisors = AopUtils.findAdvisorsThatCanApply(advisors, getTargetClass());
 		AspectJProxyUtils.makeAdvisorChainAspectJCapableIfNecessary(advisors);
-		AnnotationAwareOrderComparator.sort(advisors);
+		OrderComparator.sort(advisors);
 		addAdvisors(advisors);
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -72,7 +72,7 @@ public class AspectMetadata {

 		Class<?> currClass = aspectClass;
 		AjType<?> ajType = null;
-		while (currClass != Object.class) {
+		while (!currClass.equals(Object.class)) {
 			AjType<?> ajTypeToCheck = AjTypeSystem.getAjType(currClass);
 			if (ajTypeToCheck.isAspect()) {
 				ajType = ajTypeToCheck;
@@ -157,7 +157,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 			return null;
 		}

-		if (DeclareParents.class == declareParents.defaultImpl()) {
+		if (DeclareParents.class.equals(declareParents.defaultImpl())) {
 			// This is what comes back if it wasn't set. This seems bizarre...
 			// TODO this restriction possibly should be relaxed
 			throw new IllegalStateException("defaultImpl must be set on DeclareParents");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -21,7 +21,7 @@ import java.util.Comparator;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.aspectj.AspectJAopUtils;
 import org.springframework.aop.aspectj.AspectJPrecedenceInformation;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.Assert;

 /**
@@ -62,7 +62,7 @@ class AspectJPrecedenceComparator implements Comparator<Advisor> {
 	 * Create a default AspectJPrecedenceComparator.
 	 */
 	public AspectJPrecedenceComparator() {
-		this.advisorComparator = AnnotationAwareOrderComparator.INSTANCE;
+		this.advisorComparator = OrderComparator.INSTANCE;
 	}

 	/**
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 /**
 * {@link org.springframework.beans.factory.parsing.ComponentDefinition}
 * that bridges the gap between the advisor bean definition configured
- * by the {@code <aop:advisor>} tag and the component definition
+ * by the {@code &lt;aop:advisor&gt;} tag and the component definition
 * infrastructure.
 *
 * @author Rob Harrop
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 * {@code NamespaceHandler} for the {@code aop} namespace.
 *
 * <p>Provides a {@link org.springframework.beans.factory.xml.BeanDefinitionParser} for the
- * {@code <aop:config>} tag. A {@code config} tag can include nested
+ * {@code &lt;aop:config&gt;} tag. A {@code config} tag can include nested
 * {@code pointcut}, {@code advisor} and {@code aspect} tags.
 *
 * <p>The {@code pointcut} tag allows for creation of named
@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;

 /**
- * {@link BeanDefinitionParser} for the {@code <aop:config>} tag.
+ * {@link BeanDefinitionParser} for the {@code &lt;aop:config&gt;} tag.
 *
 * @author Rob Harrop
 * @author Juergen Hoeller
@@ -123,7 +123,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {

 	/**
 	 * Configures the auto proxy creator needed to support the {@link BeanDefinition BeanDefinitions}
-	 * created by the '{@code <aop:config/>}' tag. Will force class proxying if the
+	 * created by the '{@code &lt;aop:config/&gt;}' tag. Will force class proxying if the
 	 * '{@code proxy-target-class}' attribute is set to '{@code true}'.
 	 * @see AopNamespaceUtils
 	 */
@@ -132,7 +132,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}

 	/**
-	 * Parses the supplied {@code <advisor>} element and registers the resulting
+	 * Parses the supplied {@code &lt;advisor&gt;} element and registers the resulting
 	 * {@link org.springframework.aop.Advisor} and any resulting {@link org.springframework.aop.Pointcut}
 	 * with the supplied {@link BeanDefinitionRegistry}.
 	 */
@@ -428,7 +428,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}

 	/**
-	 * Parses the supplied {@code <pointcut>} and registers the resulting
+	 * Parses the supplied {@code &lt;pointcut&gt;} and registers the resulting
 	 * Pointcut with the BeanDefinitionRegistry.
 	 */
 	private AbstractBeanDefinition parsePointcut(Element pointcutElement, ParserContext parserContext) {
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.ParserContext;

 /**
 * {@link BeanDefinitionDecorator} responsible for parsing the
- * {@code <aop:scoped-proxy/>} tag.
+ * {@code &lt;aop:scoped-proxy/&gt;} tag.
 *
 * @author Rob Harrop
 * @author Juergen Hoeller
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -37,7 +37,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu

 	protected boolean beforeExistingAdvisors = false;

-	private final Map<Class<?>, Boolean> eligibleBeans = new ConcurrentHashMap<Class<?>, Boolean>(256);
+	private final Map<Class<?>, Boolean> eligibleBeans = new ConcurrentHashMap<Class<?>, Boolean>(64);


 	/**
@@ -81,12 +81,13 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu
 		}

 		if (isEligible(bean, beanName)) {
-			ProxyFactory proxyFactory = prepareProxyFactory(bean, beanName);
+			ProxyFactory proxyFactory = new ProxyFactory();
+			proxyFactory.copyFrom(this);
+			proxyFactory.setTarget(bean);
 			if (!proxyFactory.isProxyTargetClass()) {
 				evaluateProxyInterfaces(bean.getClass(), proxyFactory);
 			}
 			proxyFactory.addAdvisor(this.advisor);
-			customizeProxyFactory(proxyFactory);
 			return proxyFactory.getProxy(getProxyClassLoader());
 		}

@@ -130,38 +131,4 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu
 		return eligible;
 	}

-	/**
-	 * Prepare a {@link ProxyFactory} for the given bean.
-	 * <p>Subclasses may customize the handling of the target instance and in
-	 * particular the exposure of the target class. The default introspection
-	 * of interfaces for non-target-class proxies and the configured advisor
-	 * will be applied afterwards; {@link #customizeProxyFactory} allows for
-	 * late customizations of those parts right before proxy creation.
-	 * @param bean the bean instance to create a proxy for
-	 * @param beanName the corresponding bean name
-	 * @return the ProxyFactory, initialized with this processor's
-	 * {@link ProxyConfig} settings and the specified bean
-	 * @since 4.2.3
-	 * @see #customizeProxyFactory
-	 */
-	protected ProxyFactory prepareProxyFactory(Object bean, String beanName) {
-		ProxyFactory proxyFactory = new ProxyFactory();
-		proxyFactory.copyFrom(this);
-		proxyFactory.setTarget(bean);
-		return proxyFactory;
-	}
-
-	/**
-	 * Subclasses may choose to implement this: for example,
-	 * to change the interfaces exposed.
-	 * <p>The default implementation is empty.
-	 * @param proxyFactory ProxyFactory that is already configured with
-	 * target, advisor and interfaces and will be used to create the proxy
-	 * immediately after this method returns
-	 * @since 4.2.3
-	 * @see #prepareProxyFactory
-	 */
-	protected void customizeProxyFactory(ProxyFactory proxyFactory) {
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -66,7 +66,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	 * @see org.springframework.aop.target.SingletonTargetSource
 	 * @see org.springframework.aop.target.LazyInitTargetSource
 	 * @see org.springframework.aop.target.PrototypeTargetSource
-	 * @see org.springframework.aop.target.CommonsPool2TargetSource
+	 * @see org.springframework.aop.target.CommonsPoolTargetSource
 	 */
 	public void setTarget(Object target) {
 		this.target = target;
@@ -173,8 +173,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 					ClassUtils.getAllInterfacesForClass(targetSource.getTargetClass(), this.proxyClassLoader));
 		}

-		postProcessProxyFactory(proxyFactory);
-
 		this.proxy = proxyFactory.getProxy(this.proxyClassLoader);
 	}

@@ -193,15 +191,6 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		}
 	}

-	/**
-	 * A hook for subclasses to post-process the {@link ProxyFactory}
-	 * before creating the proxy instance with it.
-	 * @param proxyFactory the AOP ProxyFactory about to be used
-	 * @since 4.2
-	 */
-	protected void postProcessProxyFactory(ProxyFactory proxyFactory) {
-	}
-

 	@Override
 	public Object getObject() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -25,7 +25,7 @@ import org.springframework.aop.TargetSource;
 /**
 * Interface to be implemented by classes that hold the configuration
 * of a factory of AOP proxies. This configuration includes the
- * Interceptors and other advice, Advisors, and the proxied interfaces.
+ * Interceptors and other advice, and Advisors, and the proxied interfaces.
 *
 * <p>Any AOP proxy obtained from Spring can be cast to this interface to
 * allow manipulation of its AOP advice.
@@ -49,8 +49,8 @@ public interface Advised extends TargetClassAware {
 	boolean isProxyTargetClass();

 	/**
-	 * Return the interfaces proxied by the AOP proxy.
-	 * <p>Will not include the target class, which may also be proxied.
+	 * Return the interfaces proxied by the AOP proxy. Will not
+	 * include the target class, which may also be proxied.
 	 */
 	Class<?>[] getProxiedInterfaces();

@@ -60,34 +60,33 @@ public interface Advised extends TargetClassAware {
 	 */
 	boolean isInterfaceProxied(Class<?> intf);

+
 	/**
-	 * Change the {@code TargetSource} used by this {@code Advised} object.
-	 * <p>Only works if the configuration isn't {@linkplain #isFrozen frozen}.
+	 * Change the TargetSource used by this Advised object.
+	 * Only works if the configuration isn't frozen.
 	 * @param targetSource new TargetSource to use
 	 */
 	void setTargetSource(TargetSource targetSource);

 	/**
-	 * Return the {@code TargetSource} used by this {@code Advised} object.
+	 * Return the TargetSource used by this Advised object.
 	 */
 	TargetSource getTargetSource();

 	/**
 	 * Set whether the proxy should be exposed by the AOP framework as a
-	 * {@link ThreadLocal} for retrieval via the {@link AopContext} class.
-	 * <p>It can be necessary to expose the proxy if an advised object needs
-	 * to invoke a method on itself with advice applied. Otherwise, if an
-	 * advised object invokes a method on {@code this}, no advice will be applied.
-	 * <p>Default is {@code false}, for optimal performance.
+	 * ThreadLocal for retrieval via the AopContext class. This is useful
+	 * if an advised object needs to call another advised method on itself.
+	 * (If it uses {@code this}, the invocation will not be advised).
+	 * <p>Default is "false", for optimal performance.
 	 */
 	void setExposeProxy(boolean exposeProxy);

 	/**
-	 * Return whether the factory should expose the proxy as a {@link ThreadLocal}.
-	 * <p>It can be necessary to expose the proxy if an advised object needs
-	 * to invoke a method on itself with advice applied. Otherwise, if an
-	 * advised object invokes a method on {@code this}, no advice will be applied.
-	 * <p>Getting the proxy is analogous to an EJB calling {@code getEJBObject()}.
+	 * Return whether the factory should expose the proxy as a ThreadLocal.
+	 * This can be necessary if a target object needs to invoke a method on itself
+	 * benefitting from advice. (If it invokes a method on {@code this} no advice
+	 * will apply.) Getting the proxy is analogous to an EJB calling getEJBObject().
 	 * @see AopContext
 	 */
 	boolean isExposeProxy();
@@ -108,6 +107,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	boolean isPreFiltered();

+
 	/**
 	 * Return the advisors applying to this proxy.
 	 * @return a list of Advisors applying to this proxy (never {@code null})
@@ -170,6 +170,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	boolean replaceAdvisor(Advisor a, Advisor b) throws AopConfigException;

+
 	/**
 	 * Add the given AOP Alliance advice to the tail of the advice (interceptor) chain.
 	 * <p>This will be wrapped in a DefaultPointcutAdvisor with a pointcut that always
@@ -216,6 +217,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	int indexOf(Advice advice);

+
 	/**
 	 * As {@code toString()} will normally be delegated to the target,
 	 * this returns the equivalent for the AOP proxy.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -16,9 +16,6 @@

 package org.springframework.aop.framework;

-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.util.Arrays;

 import org.springframework.aop.SpringProxy;
@@ -27,7 +24,6 @@ import org.springframework.aop.TargetSource;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.SingletonTargetSource;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;

 /**
 * Utility methods for AOP proxy factories.
@@ -44,11 +40,11 @@ public abstract class AopProxyUtils {

 	/**
 	 * Determine the ultimate target class of the given bean instance, traversing
-	 * not only a top-level proxy but any number of nested proxies as well &mdash;
+	 * not only a top-level proxy but any number of nested proxies as well -
 	 * as long as possible without side effects, that is, just for singleton targets.
 	 * @param candidate the instance to check (might be an AOP proxy)
-	 * @return the ultimate target class (or the plain class of the given
-	 * object as fallback; never {@code null})
+	 * @return the target class (or the plain class of the given object as fallback;
+	 * never {@code null})
 	 * @see org.springframework.aop.TargetClassAware#getTargetClass()
 	 * @see Advised#getTargetSource()
 	 */
@@ -87,14 +83,8 @@ public abstract class AopProxyUtils {
 		if (specifiedInterfaces.length == 0) {
 			// No user-specified interfaces: check whether target class is an interface.
 			Class<?> targetClass = advised.getTargetClass();
-			if (targetClass != null) {
-				if (targetClass.isInterface()) {
-					advised.setInterfaces(targetClass);
-				}
-				else if (Proxy.isProxyClass(targetClass)) {
-					advised.setInterfaces(targetClass.getInterfaces());
-				}
-				specifiedInterfaces = advised.getProxiedInterfaces();
+			if (targetClass != null && targetClass.isInterface()) {
+				specifiedInterfaces = new Class<?>[] {targetClass};
 			}
 		}
 		boolean addSpringProxy = !advised.isInterfaceProxied(SpringProxy.class);
@@ -164,38 +154,4 @@ public abstract class AopProxyUtils {
 		return Arrays.equals(a.getAdvisors(), b.getAdvisors());
 	}

-
-	/**
-	 * Adapt the given arguments to the target signature in the given method,
-	 * if necessary: in particular, if a given vararg argument array does not
-	 * match the array type of the declared vararg parameter in the method.
-	 * @param method the target method
-	 * @param arguments the given arguments
-	 * @return a cloned argument array, or the original if no adaptation is needed
-	 * @since 4.2.3
-	 */
-	static Object[] adaptArgumentsIfNecessary(Method method, Object... arguments) {
-		if (method.isVarArgs() && !ObjectUtils.isEmpty(arguments)) {
-			Class<?>[] paramTypes = method.getParameterTypes();
-			if (paramTypes.length == arguments.length) {
-				int varargIndex = paramTypes.length - 1;
-				Class<?> varargType = paramTypes[varargIndex];
-				if (varargType.isArray()) {
-					Object varargArray = arguments[varargIndex];
-					if (varargArray instanceof Object[] && !varargType.isInstance(varargArray)) {
-						Object[] newArguments = new Object[arguments.length];
-						System.arraycopy(arguments, 0, newArguments, 0, varargIndex);
-						Class<?> targetElementType = varargType.getComponentType();
-						int varargLength = Array.getLength(varargArray);
-						Object newVarargArray = Array.newInstance(targetElementType, varargLength);
-						System.arraycopy(varargArray, 0, newVarargArray, 0, varargLength);
-						newArguments[varargIndex] = newVarargArray;
-						return newArguments;
-					}
-				}
-			}
-		}
-		return arguments;
-	}
-
 }
@@ -93,7 +93,7 @@ class CglibAopProxy implements AopProxy, Serializable {


 	/** Logger available to subclasses; static to optimize serialization */
-	protected final static Log logger = LogFactory.getLog(CglibAopProxy.class);
+	protected static final Log logger = LogFactory.getLog(CglibAopProxy.class);

 	/** Keeps track of the Classes that we have validated for final methods */
 	private static final Map<Class<?>, Boolean> validatedClasses = new WeakHashMap<Class<?>, Boolean>();
@@ -255,7 +255,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 	 * methods across ClassLoaders, and writes warnings to the log for each one found.
 	 */
 	private void doValidateClass(Class<?> proxySuperClass, ClassLoader proxyClassLoader) {
-		if (Object.class != proxySuperClass) {
+		if (!Object.class.equals(proxySuperClass)) {
 			Method[] methods = proxySuperClass.getDeclaredMethods();
 			for (Method method : methods) {
 				int mod = method.getModifiers();
@@ -646,8 +646,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 					// Note that the final invoker must be an InvokerInterceptor, so we know
 					// it does nothing but a reflective operation on the target, and no hot
 					// swapping or fancy proxying.
-					Object[] argsToUse = AopProxyUtils.adaptArgumentsIfNecessary(method, args);
-					retVal = methodProxy.invoke(target, argsToUse);
+					retVal = methodProxy.invoke(target, args);
 				}
 				else {
 					// We need to create a method invocation...
@@ -703,6 +702,7 @@ class CglibAopProxy implements AopProxy, Serializable {

 		public CglibMethodInvocation(Object proxy, Object target, Method method, Object[] arguments,
 				Class<?> targetClass, List<Object> interceptorsAndDynamicMethodMatchers, MethodProxy methodProxy) {
+
 			super(proxy, target, method, arguments, targetClass, interceptorsAndDynamicMethodMatchers);
 			this.methodProxy = methodProxy;
 			this.publicMethod = Modifier.isPublic(method.getModifiers());
@@ -822,8 +822,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Method has advice and optimisations are enabled: " + method);
 					}
-					// We know that we are optimising so we can use the
-					// FixedStaticChainInterceptors.
+					// We know that we are optimising so we can use the FixedStaticChainInterceptors.
 					int index = this.fixedInterceptorMap.get(key);
 					return (index + this.fixedInterceptorOffset);
 				}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -17,7 +17,6 @@
 package org.springframework.aop.framework;

 import java.io.Serializable;
-import java.lang.reflect.Proxy;

 import org.springframework.aop.SpringProxy;

@@ -54,7 +53,7 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 				throw new AopConfigException("TargetSource cannot determine target class: " +
 						"Either an interface or a target is required for proxy creation.");
 			}
-			if (targetClass.isInterface() || Proxy.isProxyClass(targetClass)) {
+			if (targetClass.isInterface()) {
 				return new JdkDynamicAopProxy(config);
 			}
 			return new ObjenesisCglibAopProxy(config);
@@ -70,8 +69,7 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 	 * (or no proxy interfaces specified at all).
 	 */
 	private boolean hasNoUserSuppliedProxyInterfaces(AdvisedSupport config) {
-		Class<?>[] ifcs = config.getProxiedInterfaces();
-		return (ifcs.length == 0 || (ifcs.length == 1 && SpringProxy.class.isAssignableFrom(ifcs[0])));
+		Class<?>[] interfaces = config.getProxiedInterfaces();
+		return (interfaces.length == 0 || (interfaces.length == 1 && SpringProxy.class.equals(interfaces[0])));
 	}
-
 }
@@ -198,8 +198,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 				// We can skip creating a MethodInvocation: just invoke the target directly
 				// Note that the final invoker must be an InvokerInterceptor so we know it does
 				// nothing but a reflective operation on the target, and no hot swapping or fancy proxying.
-				Object[] argsToUse = AopProxyUtils.adaptArgumentsIfNecessary(method, args);
-				retVal = AopUtils.invokeJoinpointUsingReflection(target, method, argsToUse);
+				retVal = AopUtils.invokeJoinpointUsingReflection(target, method, args);
 			}
 			else {
 				// We need to create a method invocation...
@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
-import org.springframework.objenesis.SpringObjenesis;
+import org.springframework.objenesis.ObjenesisStd;

 /**
 * Objenesis-based extension of {@link CglibAopProxy} to create proxy instances
@@ -37,7 +37,7 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {

 	private static final Log logger = LogFactory.getLog(ObjenesisCglibAopProxy.class);

-	private static final SpringObjenesis objenesis = new SpringObjenesis();
+	private final ObjenesisStd objenesis;


 	/**
@@ -46,6 +46,7 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {
 	 */
 	public ObjenesisCglibAopProxy(AdvisedSupport config) {
 		super(config);
+		this.objenesis = new ObjenesisStd(true);
 	}


@@ -55,14 +56,12 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {
 		Class<?> proxyClass = enhancer.createClass();
 		Object proxyInstance = null;

-		if (objenesis.isWorthTrying()) {
-			try {
-				proxyInstance = objenesis.newInstance(proxyClass, enhancer.getUseCache());
-			}
-			catch (Throwable ex) {
-				logger.debug("Unable to instantiate proxy using Objenesis, " +
-						"falling back to regular proxy construction", ex);
-			}
+		try {
+			proxyInstance = this.objenesis.newInstance(proxyClass);
+		}
+		catch (Throwable ex) {
+			logger.debug("Unable to instantiate proxy using Objenesis, " +
+					"falling back to regular proxy construction", ex);
 		}

 		if (proxyInstance == null) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -44,7 +44,7 @@ import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.FactoryBeanNotInitializedException;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;

@@ -414,7 +414,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	}

 	/**
-	 * Create the advisor (interceptor) chain. Advisors that are sourced
+	 * Create the advisor (interceptor) chain. Aadvisors that are sourced
 	 * from a BeanFactory will be refreshed each time a new prototype instance
 	 * is added. Interceptors added programmatically through the factory API
 	 * are unaffected by such changes.
@@ -525,7 +525,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 			beans.add(bean);
 			names.put(bean, name);
 		}
-		AnnotationAwareOrderComparator.sort(beans);
+		OrderComparator.sort(beans);
 		for (Object bean : beans) {
 			String name = names.get(bean);
 			if (name.startsWith(prefix)) {
@@ -126,7 +126,7 @@ public class ProxyProcessorSupport extends ProxyConfig implements Ordered, BeanC
 	 * @return whether the given interface is just a container callback
 	 */
 	protected boolean isConfigurationCallbackInterface(Class<?> ifc) {
-		return (InitializingBean.class == ifc || DisposableBean.class == ifc ||
+		return (ifc.equals(InitializingBean.class) || ifc.equals(DisposableBean.class) ||
 				ObjectUtils.containsElement(ifc.getInterfaces(), Aware.class));
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -109,7 +109,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 		this.target = target;
 		this.targetClass = targetClass;
 		this.method = BridgeMethodResolver.findBridgedMethod(method);
-		this.arguments = AopProxyUtils.adaptArgumentsIfNecessary(method, arguments);
+		this.arguments = arguments;
 		this.interceptorsAndDynamicMethodMatchers = interceptorsAndDynamicMethodMatchers;
 	}

@@ -145,7 +145,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	}

 	@Override
-	public void setArguments(Object... arguments) {
+	public void setArguments(Object[] arguments) {
 		this.arguments = arguments;
 	}

@@ -219,7 +219,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * @see java.lang.Object#clone()
 	 */
 	@Override
-	public MethodInvocation invocableClone(Object... arguments) {
+	public MethodInvocation invocableClone(Object[] arguments) {
 		// Force initialization of the user attributes Map,
 		// for having a shared Map reference in the clone.
 		if (this.userAttributes == null) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -109,7 +109,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 			logger.trace("Trying to find handler for exception of type [" + exceptionClass.getName() + "]");
 		}
 		Method handler = this.exceptionHandlerMap.get(exceptionClass);
-		while (handler == null && exceptionClass != Throwable.class) {
+		while (handler == null && !exceptionClass.equals(Throwable.class)) {
 			exceptionClass = exceptionClass.getSuperclass();
 			handler = this.exceptionHandlerMap.get(exceptionClass);
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -23,7 +23,7 @@ import org.springframework.aop.TargetSource;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+import org.springframework.core.OrderComparator;

 /**
 * Generic auto proxy creator that builds AOP proxies for specific beans
@@ -138,11 +138,10 @@ public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyC
 	 * @param advisors the source List of Advisors
 	 * @return the sorted List of Advisors
 	 * @see org.springframework.core.Ordered
-	 * @see org.springframework.core.annotation.Order
-	 * @see org.springframework.core.annotation.AnnotationAwareOrderComparator
+	 * @see org.springframework.core.OrderComparator
 	 */
 	protected List<Advisor> sortAdvisors(List<Advisor> advisors) {
-		AnnotationAwareOrderComparator.sort(advisors);
+		OrderComparator.sort(advisors);
 		return advisors;
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -42,11 +42,9 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.util.StringUtils;

 /**
 * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
@@ -127,6 +125,8 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport

 	private BeanFactory beanFactory;

+	private final Map<Object, Boolean> advisedBeans = new ConcurrentHashMap<Object, Boolean>(64);
+
 	private final Set<String> targetSourcedBeans =
 			Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>(16));

@@ -135,8 +135,6 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport

 	private final Map<Object, Class<?>> proxyTypes = new ConcurrentHashMap<Object, Class<?>>(16);

-	private final Map<Object, Boolean> advisedBeans = new ConcurrentHashMap<Object, Boolean>(256);
-

 	/**
 	 * Set whether or not the proxy should be frozen, preventing advice
@@ -216,9 +214,6 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport

 	@Override
 	public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
-		if (this.proxyTypes.isEmpty()) {
-			return null;
-		}
 		Object cacheKey = getCacheKey(beanClass, beanName);
 		return this.proxyTypes.get(cacheKey);
 	}
@@ -304,23 +299,12 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport

 	/**
 	 * Build a cache key for the given bean class and bean name.
-	 * <p>Note: As of 4.2.3, this implementation does not return a concatenated
-	 * class/name String anymore but rather the most efficient cache key possible:
-	 * a plain bean name, prepended with {@link BeanFactory#FACTORY_BEAN_PREFIX}
-	 * in case of a {@code FactoryBean}; or if no bean name specified, then the
-	 * given bean {@code Class} as-is.
 	 * @param beanClass the bean class
 	 * @param beanName the bean name
 	 * @return the cache key for the given class and name
 	 */
 	protected Object getCacheKey(Class<?> beanClass, String beanName) {
-		if (StringUtils.hasLength(beanName)) {
-			return (FactoryBean.class.isAssignableFrom(beanClass) ?
-					BeanFactory.FACTORY_BEAN_PREFIX + beanName : beanName);
-		}
-		else {
-			return beanClass;
-		}
+		return beanClass.getName() + "_" + beanName;
 	}

 	/**
@@ -346,8 +330,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		Object[] specificInterceptors = getAdvicesAndAdvisorsForBean(bean.getClass(), beanName, null);
 		if (specificInterceptors != DO_NOT_PROXY) {
 			this.advisedBeans.put(cacheKey, Boolean.TRUE);
-			Object proxy = createProxy(
-					bean.getClass(), beanName, specificInterceptors, new SingletonTargetSource(bean));
+			Object proxy = createProxy(bean.getClass(), beanName, specificInterceptors, new SingletonTargetSource(bean));
 			this.proxyTypes.put(cacheKey, proxy.getClass());
 			return proxy;
 		}
@@ -436,10 +419,6 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	protected Object createProxy(
 			Class<?> beanClass, String beanName, Object[] specificInterceptors, TargetSource targetSource) {

-		if (this.beanFactory instanceof ConfigurableListableBeanFactory) {
-			AutoProxyUtils.exposeTargetClass((ConfigurableListableBeanFactory) this.beanFactory, beanName, beanClass);
-		}
-
 		ProxyFactory proxyFactory = new ProxyFactory();
 		proxyFactory.copyFrom(this);

@@ -511,7 +490,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		List<Object> allInterceptors = new ArrayList<Object>();
 		if (specificInterceptors != null) {
 			allInterceptors.addAll(Arrays.asList(specificInterceptors));
-			if (commonInterceptors.length > 0) {
+			if (commonInterceptors != null) {
 				if (this.applyCommonInterceptorsFirst) {
 					allInterceptors.addAll(0, Arrays.asList(commonInterceptors));
 				}
@@ -521,7 +500,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 			}
 		}
 		if (logger.isDebugEnabled()) {
-			int nrOfCommonInterceptors = commonInterceptors.length;
+			int nrOfCommonInterceptors = (commonInterceptors != null ? commonInterceptors.length : 0);
 			int nrOfSpecificInterceptors = (specificInterceptors != null ? specificInterceptors.length : 0);
 			logger.debug("Creating implicit proxy for bean '" + beanName + "' with " + nrOfCommonInterceptors +
 					" common interceptors and " + nrOfSpecificInterceptors + " specific interceptors");
@@ -539,8 +518,8 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	 * @see #setInterceptorNames
 	 */
 	private Advisor[] resolveInterceptorNames() {
-		ConfigurableBeanFactory cbf = (this.beanFactory instanceof ConfigurableBeanFactory ?
-				(ConfigurableBeanFactory) this.beanFactory : null);
+		ConfigurableBeanFactory cbf = (this.beanFactory instanceof ConfigurableBeanFactory) ?
+				(ConfigurableBeanFactory) this.beanFactory : null;
 		List<Advisor> advisors = new ArrayList<Advisor>();
 		for (String beanName : this.interceptorNames) {
 			if (cbf == null || !cbf.isCurrentlyInCreation(beanName)) {
@@ -557,7 +536,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	 * <p>The default implementation is empty.
 	 * @param proxyFactory ProxyFactory that is already configured with
 	 * TargetSource and interfaces and will be used to create the proxy
-	 * immediately after this method returns
+	 * immediably after this method returns
 	 */
 	protected void customizeProxyFactory(ProxyFactory proxyFactory) {
 	}
@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.aop.framework.autoproxy;
-
-import org.springframework.aop.framework.AbstractAdvisingBeanPostProcessor;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-
-/**
- * Extension of {@link AbstractAutoProxyCreator} which implements {@link BeanFactoryAware},
- * adds exposure of the original target class for each proxied bean
- * ({@link AutoProxyUtils#ORIGINAL_TARGET_CLASS_ATTRIBUTE}),
- * and participates in an externally enforced target-class mode for any given bean
- * ({@link AutoProxyUtils#PRESERVE_TARGET_CLASS_ATTRIBUTE}).
- * This post-processor is therefore aligned with {@link AbstractAutoProxyCreator}.
- *
- * @author Juergen Hoeller
- * @since 4.2.3
- * @see AutoProxyUtils#shouldProxyTargetClass
- * @see AutoProxyUtils#determineTargetClass
- */
-@SuppressWarnings("serial")
-public abstract class AbstractBeanFactoryAwareAdvisingPostProcessor extends AbstractAdvisingBeanPostProcessor
-		implements BeanFactoryAware {
-
-	private ConfigurableListableBeanFactory beanFactory;
-
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = (beanFactory instanceof ConfigurableListableBeanFactory ?
-				(ConfigurableListableBeanFactory) beanFactory : null);
-	}
-
-	@Override
-	protected ProxyFactory prepareProxyFactory(Object bean, String beanName) {
-		if (this.beanFactory != null) {
-			AutoProxyUtils.exposeTargetClass(this.beanFactory, beanName, bean.getClass());
-		}
-
-		ProxyFactory proxyFactory = super.prepareProxyFactory(bean, beanName);
-		if (!proxyFactory.isProxyTargetClass() && this.beanFactory != null &&
-				AutoProxyUtils.shouldProxyTargetClass(this.beanFactory, beanName)) {
-			proxyFactory.setProxyTargetClass(true);
-		}
-		return proxyFactory;
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -37,21 +37,10 @@ public abstract class AutoProxyUtils {
 	 * <p>Proxy factories can set this attribute if they built a target class proxy
 	 * for a specific bean, and want to enforce that that bean can always be cast
 	 * to its target class (even if AOP advices get applied through auto-proxying).
-	 * @see #shouldProxyTargetClass
 	 */
 	public static final String PRESERVE_TARGET_CLASS_ATTRIBUTE =
 			Conventions.getQualifiedAttributeName(AutoProxyUtils.class, "preserveTargetClass");

-	/**
-	 * Bean definition attribute that indicates the original target class of an
-	 * auto-proxied bean, e.g. to be used for the introspection of annotations
-	 * on the target class behind an interface-based proxy.
-	 * @since 4.2.3
-	 * @see #determineTargetClass
-	 */
-	public static final String ORIGINAL_TARGET_CLASS_ATTRIBUTE =
-			Conventions.getQualifiedAttributeName(AutoProxyUtils.class, "originalTargetClass");
-

 	/**
 	 * Determine whether the given bean should be proxied with its target
@@ -70,40 +59,4 @@ public abstract class AutoProxyUtils {
 		return false;
 	}

-	/**
-	 * Determine the original target class for the specified bean, if possible,
-	 * otherwise falling back to a regular {@code getType} lookup.
-	 * @param beanFactory the containing ConfigurableListableBeanFactory
-	 * @param beanName the name of the bean
-	 * @return the original target class as stored in the bean definition, if any
-	 * @since 4.2.3
-	 * @see org.springframework.beans.factory.BeanFactory#getType(String)
-	 */
-	public static Class<?> determineTargetClass(ConfigurableListableBeanFactory beanFactory, String beanName) {
-		if (beanName == null) {
-			return null;
-		}
-		if (beanFactory.containsBeanDefinition(beanName)) {
-			BeanDefinition bd = beanFactory.getMergedBeanDefinition(beanName);
-			Class<?> targetClass = (Class<?>) bd.getAttribute(ORIGINAL_TARGET_CLASS_ATTRIBUTE);
-			if (targetClass != null) {
-				return targetClass;
-			}
-		}
-		return beanFactory.getType(beanName);
-	}
-
-	/**
-	 * Expose the given target class for the specified bean, if possible.
-	 * @param beanFactory the containing ConfigurableListableBeanFactory
-	 * @param beanName the name of the bean
-	 * @param targetClass the corresponding target class
-	 * @since 4.2.3
-	 */
-	static void exposeTargetClass(ConfigurableListableBeanFactory beanFactory, String beanName, Class<?> targetClass) {
-		if (beanName != null && beanFactory.containsBeanDefinition(beanName)) {
-			beanFactory.getMergedBeanDefinition(beanName).setAttribute(ORIGINAL_TARGET_CLASS_ATTRIBUTE, targetClass);
-		}
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,20 +17,19 @@
 package org.springframework.aop.framework.autoproxy.target;

 import org.springframework.aop.target.AbstractBeanFactoryBasedTargetSource;
-import org.springframework.aop.target.CommonsPool2TargetSource;
+import org.springframework.aop.target.CommonsPoolTargetSource;
 import org.springframework.aop.target.PrototypeTargetSource;
 import org.springframework.aop.target.ThreadLocalTargetSource;

 /**
 * Convenient TargetSourceCreator using bean name prefixes to create one of three
 * well-known TargetSource types:
- * <li>: CommonsPool2TargetSource
+ * <li>: CommonsPoolTargetSource
 * <li>% ThreadLocalTargetSource
 * <li>! PrototypeTargetSource
 *
 * @author Rod Johnson
- * @author Stephane Nicoll
- * @see org.springframework.aop.target.CommonsPool2TargetSource
+ * @see org.springframework.aop.target.CommonsPoolTargetSource
 * @see org.springframework.aop.target.ThreadLocalTargetSource
 * @see org.springframework.aop.target.PrototypeTargetSource
 */
@@ -45,7 +44,7 @@ public class QuickTargetSourceCreator extends AbstractBeanFactoryBasedTargetSour
 			Class<?> beanClass, String beanName) {

 		if (beanName.startsWith(PREFIX_COMMONS_POOL)) {
-			CommonsPool2TargetSource cpts = new CommonsPool2TargetSource();
+			CommonsPoolTargetSource cpts = new CommonsPoolTargetSource();
 			cpts.setMaxSize(25);
 			return cpts;
 		}
@@ -18,13 +18,9 @@ package org.springframework.aop.interceptor;

 import java.lang.reflect.Method;
 import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
-import java.util.function.Supplier;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,11 +31,9 @@ import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
 import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.support.TaskExecutorAdapter;
-import org.springframework.lang.UsesJava8;
-import org.springframework.util.ClassUtils;
+import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.concurrent.ListenableFuture;

 /**
 * Base class for asynchronous method execution aspects, such as
@@ -58,11 +52,6 @@ import org.springframework.util.concurrent.ListenableFuture;
 */
 public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {

-	// Java 8's CompletableFuture type present?
-	private static final boolean completableFuturePresent = ClassUtils.isPresent(
-			"java.util.concurrent.CompletableFuture", AsyncExecutionInterceptor.class.getClassLoader());
-
-
 	protected final Log logger = LogFactory.getLog(getClass());

 	private final Map<Method, AsyncTaskExecutor> executors = new ConcurrentHashMap<Method, AsyncTaskExecutor>(16);
@@ -165,32 +154,6 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 	 */
 	protected abstract String getExecutorQualifier(Method method);

-	/**
-	 * Delegate for actually executing the given task with the chosen executor.
-	 * @param task the task to execute
-	 * @param executor the chosen executor
-	 * @param returnType the declared return type (potentially a {@link Future} variant)
-	 * @return the execution result (potentially a corresponding {@link Future} handle)
-	 */
-	protected Object doSubmit(Callable<Object> task, AsyncTaskExecutor executor, Class<?> returnType) {
-		if (completableFuturePresent) {
-			Future<Object> result = CompletableFutureDelegate.processCompletableFuture(returnType, task, executor);
-			if (result != null) {
-				return result;
-			}
-		}
-		if (ListenableFuture.class.isAssignableFrom(returnType)) {
-			return ((AsyncListenableTaskExecutor) executor).submitListenable(task);
-		}
-		else if (Future.class.isAssignableFrom(returnType)) {
-			return executor.submit(task);
-		}
-		else {
-			executor.submit(task);
-			return null;
-		}
-	}
-
 	/**
 	 * Handles a fatal error thrown while asynchronously invoking the specified
 	 * {@link Method}.
@@ -219,29 +182,4 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 		}
 	}

-
-	/**
-	 * Inner class to avoid a hard dependency on Java 8.
-	 */
-	@UsesJava8
-	private static class CompletableFutureDelegate {
-
-		public static <T> Future<T> processCompletableFuture(Class<?> returnType, final Callable<T> task, Executor executor) {
-			if (!CompletableFuture.class.isAssignableFrom(returnType)) {
-				return null;
-			}
-			return CompletableFuture.supplyAsync(new Supplier<T>() {
-				@Override
-				public T get() {
-					try {
-						return task.call();
-					}
-					catch (Throwable ex) {
-						throw new CompletionException(ex);
-					}
-				}
-			}, executor);
-		}
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -18,7 +18,6 @@ package org.springframework.aop.interceptor;

 import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;

@@ -28,8 +27,10 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.core.BridgeMethodResolver;
 import org.springframework.core.Ordered;
+import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.concurrent.ListenableFuture;

 /**
 * AOP Alliance {@code MethodInterceptor} that processes method invocations
@@ -63,7 +64,8 @@ import org.springframework.util.ClassUtils;
 * @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor
 * @see org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor
 */
-public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport implements MethodInterceptor, Ordered {
+public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
+		implements MethodInterceptor, Ordered {

 	/**
 	 * Create a new {@code AsyncExecutionInterceptor}.
@@ -110,9 +112,6 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
 						return ((Future<?>) result).get();
 					}
 				}
-				catch (ExecutionException ex) {
-					handleError(ex.getCause(), userDeclaredMethod, invocation.getArguments());
-				}
 				catch (Throwable ex) {
 					handleError(ex, userDeclaredMethod, invocation.getArguments());
 				}
@@ -120,7 +119,17 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
 			}
 		};

-		return doSubmit(task, executor, invocation.getMethod().getReturnType());
+		Class<?> returnType = invocation.getMethod().getReturnType();
+		if (ListenableFuture.class.isAssignableFrom(returnType)) {
+			return ((AsyncListenableTaskExecutor) executor).submitListenable(task);
+		}
+		else if (Future.class.isAssignableFrom(returnType)) {
+			return executor.submit(task);
+		}
+		else {
+			executor.submit(task);
+			return null;
+		}
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -40,8 +40,7 @@ import org.springframework.util.ReflectionUtils;

 /**
 * Utility methods for AOP support code.
- *
- * <p>Mainly for internal use within Spring's AOP support.
+ * Mainly for internal use within Spring's AOP support.
 *
 * <p>See {@link org.springframework.aop.framework.AopProxyUtils} for a
 * collection of framework-specific AOP utility methods which depend
@@ -56,8 +55,6 @@ public abstract class AopUtils {

 	/**
 	 * Check whether the given object is a JDK dynamic proxy or a CGLIB proxy.
-	 * <p>This method additionally checks if the given object is an instance
-	 * of {@link SpringProxy}.
 	 * @param object the object to check
 	 * @see #isJdkDynamicProxy
 	 * @see #isCglibProxy
@@ -69,9 +66,6 @@ public abstract class AopUtils {

 	/**
 	 * Check whether the given object is a JDK dynamic proxy.
-	 * <p>This method goes beyond the implementation of
-	 * {@link Proxy#isProxyClass(Class)} by additionally checking if the
-	 * given object is an instance of {@link SpringProxy}.
 	 * @param object the object to check
 	 * @see java.lang.reflect.Proxy#isProxyClass
 	 */
@@ -80,10 +74,9 @@ public abstract class AopUtils {
 	}

 	/**
-	 * Check whether the given object is a CGLIB proxy.
-	 * <p>This method goes beyond the implementation of
-	 * {@link ClassUtils#isCglibProxy(Object)} by additionally checking if
-	 * the given object is an instance of {@link SpringProxy}.
+	 * Check whether the given object is a CGLIB proxy. Goes beyond the implementation
+	 * in {@link ClassUtils#isCglibProxy(Object)} by checking also to see if the given
+	 * object is an instance of {@link SpringProxy}.
 	 * @param object the object to check
 	 * @see ClassUtils#isCglibProxy(Object)
 	 */
@@ -91,9 +84,29 @@ public abstract class AopUtils {
 		return (object instanceof SpringProxy && ClassUtils.isCglibProxy(object));
 	}

+	/**
+	 * Check whether the specified class is a CGLIB-generated class.
+	 * @param clazz the class to check
+	 * @deprecated as of Spring 3.1 in favor of {@link ClassUtils#isCglibProxyClass(Class)}
+	 */
+	@Deprecated
+	public static boolean isCglibProxyClass(Class<?> clazz) {
+		return ClassUtils.isCglibProxyClass(clazz);
+	}
+
+	/**
+	 * Check whether the specified class name is a CGLIB-generated class.
+	 * @param className the class name to check
+	 * @deprecated as of Spring 3.1 in favor of {@link ClassUtils#isCglibProxyClassName(String)}
+	 */
+	@Deprecated
+	public static boolean isCglibProxyClassName(String className) {
+		return ClassUtils.isCglibProxyClassName(className);
+	}
+
 	/**
 	 * Determine the target class of the given bean instance which might be an AOP proxy.
-	 * <p>Returns the target class for an AOP proxy or the plain class otherwise.
+	 * <p>Returns the target class for an AOP proxy and the plain class else.
 	 * @param candidate the instance to check (might be an AOP proxy)
 	 * @return the target class (or the plain class of the given object as fallback;
 	 * never {@code null})
@@ -167,6 +180,7 @@ public abstract class AopUtils {
 		return BridgeMethodResolver.findBridgedMethod(resolvedMethod);
 	}

+
 	/**
 	 * Can the given pointcut apply at all on the given class?
 	 * <p>This is an important test as it can be used to optimize
@@ -284,6 +298,7 @@ public abstract class AopUtils {
 		return eligibleAdvisors;
 	}

+
 	/**
 	 * Invoke the given target via reflection, as part of an AOP method invocation.
 	 * @param target the target object
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -45,7 +45,7 @@ import org.springframework.util.ObjectUtils;
 * @see LazyInitTargetSource
 * @see PrototypeTargetSource
 * @see ThreadLocalTargetSource
- * @see CommonsPool2TargetSource
+ * @see CommonsPoolTargetSource
 */
 public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSource, BeanFactoryAware, Serializable {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.DisposableBean;
 * implementations which maintain a pool of target instances, acquiring and
 * releasing a target object from the pool for each method invocation.
 * This abstract base class is independent of concrete pooling technology;
- * see the subclass {@link CommonsPool2TargetSource} for a concrete example.
+ * see the subclass {@link CommonsPoolTargetSource} for a concrete example.
 *
 * <p>Subclasses must implement the {@link #getTarget} and
 * {@link #releaseTarget} methods based on their chosen object pool.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -41,7 +41,7 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 * @see org.springframework.beans.factory.BeanFactory#getBean
 * @see PrototypeTargetSource
 * @see ThreadLocalTargetSource
- * @see CommonsPool2TargetSource
+ * @see CommonsPoolTargetSource
 */
@SuppressWarnings("serial")
 public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFactoryBasedTargetSource {
@@ -1,289 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.aop.target;
-
-import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.PooledObjectFactory;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-
-/**
- * {@link org.springframework.aop.TargetSource} implementation that holds
- * objects in a configurable Apache Commons2 Pool.
- *
- * <p>By default, an instance of {@code GenericObjectPool} is created.
- * Subclasses may change the type of {@code ObjectPool} used by
- * overriding the {@code createObjectPool()} method.
- *
- * <p>Provides many configuration properties mirroring those of the Commons Pool
- * {@code GenericObjectPool} class; these properties are passed to the
- * {@code GenericObjectPool} during construction. If creating a subclass of this
- * class to change the {@code ObjectPool} implementation type, pass in the values
- * of configuration properties that are relevant to your chosen implementation.
- *
- * <p>The {@code testOnBorrow}, {@code testOnReturn} and {@code testWhileIdle}
- * properties are explicitly not mirrored because the implementation of
- * {@code PoolableObjectFactory} used by this class does not implement
- * meaningful validation. All exposed Commons Pool properties use the
- * corresponding Commons Pool defaults.
- *
- * <p>Compatible with Apache Commons Pool 2.4, as of Spring 4.2.
- *
- * @author Rod Johnson
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- * @author Kazuki Shimizu
- * @since 4.2
- * @see GenericObjectPool
- * @see #createObjectPool()
- * @see #setMaxSize
- * @see #setMaxIdle
- * @see #setMinIdle
- * @see #setMaxWait
- * @see #setTimeBetweenEvictionRunsMillis
- * @see #setMinEvictableIdleTimeMillis
- */
-@SuppressWarnings({"rawtypes", "unchecked", "serial"})
-public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implements PooledObjectFactory<Object> {
-
-	private int maxIdle = GenericObjectPoolConfig.DEFAULT_MAX_IDLE;
-
-	private int minIdle = GenericObjectPoolConfig.DEFAULT_MIN_IDLE;
-
-	private long maxWait = GenericObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS;
-
-	private long timeBetweenEvictionRunsMillis = GenericObjectPoolConfig.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
-
-	private long minEvictableIdleTimeMillis = GenericObjectPoolConfig.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
-
-	private boolean blockWhenExhausted = GenericObjectPoolConfig.DEFAULT_BLOCK_WHEN_EXHAUSTED;
-
-	/**
-	 * The Apache Commons {@code ObjectPool} used to pool target objects
-	 */
-	private ObjectPool pool;
-
-
-	/**
-	 * Create a CommonsPoolTargetSource with default settings.
-	 * Default maximum size of the pool is 8.
-	 * @see #setMaxSize
-	 * @see GenericObjectPoolConfig#setMaxTotal
-	 */
-	public CommonsPool2TargetSource() {
-		setMaxSize(GenericObjectPoolConfig.DEFAULT_MAX_TOTAL);
-	}
-
-
-	/**
-	 * Set the maximum number of idle objects in the pool.
-	 * Default is 8.
-	 * @see GenericObjectPool#setMaxIdle
-	 */
-	public void setMaxIdle(int maxIdle) {
-		this.maxIdle = maxIdle;
-	}
-
-	/**
-	 * Return the maximum number of idle objects in the pool.
-	 */
-	public int getMaxIdle() {
-		return this.maxIdle;
-	}
-
-	/**
-	 * Set the minimum number of idle objects in the pool.
-	 * Default is 0.
-	 * @see GenericObjectPool#setMinIdle
-	 */
-	public void setMinIdle(int minIdle) {
-		this.minIdle = minIdle;
-	}
-
-	/**
-	 * Return the minimum number of idle objects in the pool.
-	 */
-	public int getMinIdle() {
-		return this.minIdle;
-	}
-
-	/**
-	 * Set the maximum waiting time for fetching an object from the pool.
-	 * Default is -1, waiting forever.
-	 * @see GenericObjectPool#setMaxWaitMillis
-	 */
-	public void setMaxWait(long maxWait) {
-		this.maxWait = maxWait;
-	}
-
-	/**
-	 * Return the maximum waiting time for fetching an object from the pool.
-	 */
-	public long getMaxWait() {
-		return this.maxWait;
-	}
-
-	/**
-	 * Set the time between eviction runs that check idle objects whether
-	 * they have been idle for too long or have become invalid.
-	 * Default is -1, not performing any eviction.
-	 * @see GenericObjectPool#setTimeBetweenEvictionRunsMillis
-	 */
-	public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
-		this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
-	}
-
-	/**
-	 * Return the time between eviction runs that check idle objects.
-	 */
-	public long getTimeBetweenEvictionRunsMillis() {
-		return this.timeBetweenEvictionRunsMillis;
-	}
-
-	/**
-	 * Set the minimum time that an idle object can sit in the pool before
-	 * it becomes subject to eviction. Default is 1800000 (30 minutes).
-	 * <p>Note that eviction runs need to be performed to take this
-	 * setting into effect.
-	 * @see #setTimeBetweenEvictionRunsMillis
-	 * @see GenericObjectPool#setMinEvictableIdleTimeMillis
-	 */
-	public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
-		this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
-	}
-
-	/**
-	 * Return the minimum time that an idle object can sit in the pool.
-	 */
-	public long getMinEvictableIdleTimeMillis() {
-		return this.minEvictableIdleTimeMillis;
-	}
-
-	/**
-	 * Set whether the call should bock when the pool is exhausted.
-	 */
-	public void setBlockWhenExhausted(boolean blockWhenExhausted) {
-		this.blockWhenExhausted = blockWhenExhausted;
-	}
-
-	/**
-	 * Specify if the call should block when the pool is exhausted.
-	 */
-	public boolean isBlockWhenExhausted() {
-		return this.blockWhenExhausted;
-	}
-
-
-	/**
-	 * Creates and holds an ObjectPool instance.
-	 * @see #createObjectPool()
-	 */
-	@Override
-	protected final void createPool() {
-		logger.debug("Creating Commons object pool");
-		this.pool = createObjectPool();
-	}
-
-	/**
-	 * Subclasses can override this if they want to return a specific Commons pool.
-	 * They should apply any configuration properties to the pool here.
-	 * <p>Default is a GenericObjectPool instance with the given pool size.
-	 * @return an empty Commons {@code ObjectPool}.
-	 * @see GenericObjectPool
-	 * @see #setMaxSize
-	 */
-	protected ObjectPool createObjectPool() {
-		GenericObjectPoolConfig config = new GenericObjectPoolConfig();
-		config.setMaxTotal(getMaxSize());
-		config.setMaxIdle(getMaxIdle());
-		config.setMinIdle(getMinIdle());
-		config.setMaxWaitMillis(getMaxWait());
-		config.setTimeBetweenEvictionRunsMillis(getTimeBetweenEvictionRunsMillis());
-		config.setMinEvictableIdleTimeMillis(getMinEvictableIdleTimeMillis());
-		config.setBlockWhenExhausted(isBlockWhenExhausted());
-		return new GenericObjectPool(this, config);
-	}
-
-
-	/**
-	 * Borrows an object from the {@code ObjectPool}.
-	 */
-	@Override
-	public Object getTarget() throws Exception {
-		return this.pool.borrowObject();
-	}
-
-	/**
-	 * Returns the specified object to the underlying {@code ObjectPool}.
-	 */
-	@Override
-	public void releaseTarget(Object target) throws Exception {
-		this.pool.returnObject(target);
-	}
-
-	@Override
-	public int getActiveCount() throws UnsupportedOperationException {
-		return this.pool.getNumActive();
-	}
-
-	@Override
-	public int getIdleCount() throws UnsupportedOperationException {
-		return this.pool.getNumIdle();
-	}
-
-
-	/**
-	 * Closes the underlying {@code ObjectPool} when destroying this object.
-	 */
-	@Override
-	public void destroy() throws Exception {
-		logger.debug("Closing Commons ObjectPool");
-		this.pool.close();
-	}
-
-
-	//----------------------------------------------------------------------------
-	// Implementation of org.apache.commons.pool2.PooledObjectFactory interface
-	//----------------------------------------------------------------------------
-
-	@Override
-	public PooledObject<Object> makeObject() throws Exception {
-		return new DefaultPooledObject<Object>(newPrototypeInstance());
-	}
-
-	@Override
-	public void destroyObject(PooledObject<Object> p) throws Exception {
-		destroyPrototypeInstance(p.getObject());
-	}
-
-	@Override
-	public boolean validateObject(PooledObject<Object> p) {
-		return true;
-	}
-
-	@Override
-	public void activateObject(PooledObject<Object> p) throws Exception {
-	}
-
-	@Override
-	public void passivateObject(PooledObject<Object> p) throws Exception {
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -58,10 +58,8 @@ import org.springframework.core.Constants;
 * @see #setMaxWait
 * @see #setTimeBetweenEvictionRunsMillis
 * @see #setMinEvictableIdleTimeMillis
- * @deprecated as of Spring 4.2, in favor of {@link CommonsPool2TargetSource}
 */
@SuppressWarnings({"rawtypes", "unchecked", "serial"})
-@Deprecated
 public class CommonsPoolTargetSource extends AbstractPoolingTargetSource implements PoolableObjectFactory {

 	private static final Constants constants = new Constants(GenericObjectPool.class);
@@ -5,5 +5,4 @@ http\://www.springframework.org/schema/aop/spring-aop-3.1.xsd=org/springframewor
 http\://www.springframework.org/schema/aop/spring-aop-3.2.xsd=org/springframework/aop/config/spring-aop-3.2.xsd
 http\://www.springframework.org/schema/aop/spring-aop-4.0.xsd=org/springframework/aop/config/spring-aop-4.0.xsd
 http\://www.springframework.org/schema/aop/spring-aop-4.1.xsd=org/springframework/aop/config/spring-aop-4.1.xsd
-http\://www.springframework.org/schema/aop/spring-aop-4.2.xsd=org/springframework/aop/config/spring-aop-4.2.xsd
-http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-4.2.xsd
+http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-4.1.xsd
@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<xsd:schema xmlns="http://www.springframework.org/schema/aop"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:tool="http://www.springframework.org/schema/tool"
-			targetNamespace="http://www.springframework.org/schema/aop"
-			elementFormDefault="qualified"
-			attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.2.xsd"/>
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-	Defines the configuration elements for the Spring Framework's AOP support.
-		]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="config">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	A section (compartmentalization) of AOP-specific configuration (including
-	aspects, pointcuts, etc).
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	A named pointcut definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element name="advisor" type="advisorType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation source="java:org.springframework.aop.Advisor"><![CDATA[
-	A named advisor definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element name="aspect" type="aspectType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	A named aspect definition.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? By default, standard
-	Java interface-based proxies are created.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expose-proxy" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Indicate that the proxy should be exposed by the AOP framework as a
-	ThreadLocal for retrieval via the AopContext class. Off by default,
-	i.e. no guarantees that AopContext access will work.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="aspectj-autoproxy">
-		<xsd:annotation>
-			<xsd:documentation source="java:org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator"><![CDATA[
-	Enables the use of the @AspectJ style of Spring AOP.
-
-	See org.springframework.context.annotation.EnableAspectJAutoProxy Javadoc
-	for information on code-based alternatives to this XML element.
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="include" type="includeType" minOccurs="0" maxOccurs="unbounded">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	Indicates that only @AspectJ beans with names matched by the (regex)
-	pattern will be considered as defining aspects to use for Spring autoproxying.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? By default, standard
-	Java interface-based proxies are created.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="expose-proxy" type="xsd:boolean" default="false">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Indicate that the proxy should be exposed by the AOP framework as a
-	ThreadLocal for retrieval via the AopContext class. Off by default,
-	i.e. no guarantees that AopContext access will work.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="scoped-proxy">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.aop.scope.ScopedProxyFactoryBean"><![CDATA[
-	Marks a bean definition as being a scoped proxy.
-
-	A bean marked as such will be exposed via a proxy, with the 'real'
-	bean instance being retrieved from some other source (such as a
-	HttpSession) as and when required.
-				]]></xsd:documentation>
-			</xsd:annotation>
-			<xsd:attribute name="proxy-target-class" type="xsd:boolean" default="true">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Are class-based (CGLIB) proxies to be created? This is the default; in order to
-	switch to standard Java interface-based proxies, turn this flag to "false".
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="aspectType">
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="pointcut" type="pointcutType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	A named pointcut definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="declare-parents" type="declareParentsType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Allows this aspect to introduce additional interfaces that the advised
-	object will transparently implement.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="before" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	A before advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after-returning" type="afterReturningAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after-returning advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="after-throwing" type="afterThrowingAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An after-throwing advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="around" type="basicAdviceType">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	An around advice definition.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:choice>
-		<xsd:attribute name="id" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The unique identifier for an aspect.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="ref" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of the (backing) bean that encapsulates the aspect.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:token">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
-	Controls the ordering of the execution of this aspect when multiple
-	advice executes at a specific joinpoint.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="includeType">
-		<xsd:attribute name="name" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.util.regex.Pattern"><![CDATA[
-	The regular expression defining which beans are to be included in the
-	list of @AspectJ beans; beans with names matched by the pattern will
-	be included.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="pointcutType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.aop.Pointcut"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The unique identifier for a pointcut.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="expression" use="required" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The pointcut expression.
-
-	For example : 'execution(* com.xyz.myapp.service.*.*(..))'
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="declareParentsType">
-		<xsd:attribute name="types-matching" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.aop.aspectj.TypePatternClassFilter"><![CDATA[
-	The AspectJ type expression that defines what types (classes) the
-	introduction is restricted to.
-
-	An example would be 'org.springframework.beans.ITestBean+'.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="implement-interface" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The fully qualified name of the interface that will be introduced.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="default-impl" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The fully qualified name of the class that will be instantiated to serve
-	as the default implementation of the introduced interface.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="delegate-ref" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to the bean that will serve
-	as the default implementation of the introduced interface.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref"/>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="basicAdviceType">
-		<xsd:attribute name="pointcut" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The associated pointcut expression.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of an associated pointcut definition.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.aop.Pointcut"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="method" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The name of the method that defines the logic of the advice.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="arg-names" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	The comma-delimited list of advice method argument (parameter) names
-	that will be matched from pointcut parameters.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="afterReturningAdviceType">
-		<xsd:complexContent>
-			<xsd:extension base="basicAdviceType">
-				<xsd:attribute name="returning" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The name of the method parameter to which the return value must
-	be passed.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="afterThrowingAdviceType">
-		<xsd:complexContent>
-			<xsd:extension base="basicAdviceType">
-				<xsd:attribute name="throwing" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The name of the method parameter to which the thrown exception must
-	be passed.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="advisorType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.aop.Advisor"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:string"/>
-		<xsd:attribute name="advice-ref" type="xsd:string" use="required">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to an advice bean.
-				]]></xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.aopalliance.aop.Advice"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A pointcut expression.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-	A reference to a pointcut definition.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:token">
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
-	Controls the ordering of the execution of this advice when multiple
-	advice executes at a specific joinpoint.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:simpleType name="pointcutRefType">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:expected-type type="org.springframework.aop.Pointcut"/>
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string"/>
-	</xsd:simpleType>
-
-</xsd:schema>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -211,7 +211,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 		itb.setName("foo");
 		itb.getDoctor();
 		itb.getStringArray();
-		itb.getSpouse();
+		itb.getSpouses();
 		itb.setSpouse(new TestBean());
 		try {
 			itb.unreliableFileOperation();
@@ -16,9 +16,6 @@

 package org.springframework.aop.aspectj.annotation;

-import java.util.Arrays;
-
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -105,28 +102,10 @@ public class AspectProxyFactoryTests {
 		pf.addAspect(new PerThisAspect());
 	}

-	@Test  // SPR-13328
-	public void testProxiedVarargsWithEnumArray() throws Exception {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
-		proxyFactory.addAspect(LoggingAspectOnVarargs.class);
-		ITestBean proxy = proxyFactory.getProxy();
-		assertTrue(proxy.doWithVarargs(MyEnum.A, MyOtherEnum.C));
-	}
-
-	@Test  // SPR-13328
-	public void testUnproxiedVarargsWithEnumArray() throws Exception {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
-		proxyFactory.addAspect(LoggingAspectOnSetter.class);
-		ITestBean proxy = proxyFactory.getProxy();
-		assertTrue(proxy.doWithVarargs(MyEnum.A, MyOtherEnum.C));
-	}
-

 	public interface ITestBean {

 		int getAge();
-
-		<V extends MyInterface> boolean doWithVarargs(V... args);
 	}


@@ -142,51 +121,8 @@ public class AspectProxyFactoryTests {
 		public void setAge(int age) {
 			this.age = age;
 		}
-
-		@SuppressWarnings("unchecked")
-		@Override
-		public <V extends MyInterface> boolean doWithVarargs(V... args) {
-			return true;
-		}
 	}

-
-	public interface MyInterface {
-	}
-
-
-	public enum MyEnum implements MyInterface {
-
-		A, B;
-	}
-
-
-	public enum MyOtherEnum implements MyInterface {
-
-		C, D;
-	}
-
-
-	@Aspect
-	public static class LoggingAspectOnVarargs {
-
-		@Around("execution(* doWithVarargs(*))")
-		public Object doLog(ProceedingJoinPoint pjp) throws Throwable {
-			LogFactory.getLog(LoggingAspectOnVarargs.class).debug(Arrays.asList(pjp.getArgs()));
-			return pjp.proceed();
-		}
-	}
-
-
-	@Aspect
-	public static class LoggingAspectOnSetter {
-
-		@Around("execution(* setAge(*))")
-		public Object doLog(ProceedingJoinPoint pjp) throws Throwable {
-			LogFactory.getLog(LoggingAspectOnSetter.class).debug(Arrays.asList(pjp.getArgs()));
-			return pjp.proceed();
-		}
-	}
 }


@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -15,24 +15,21 @@
 */
 package org.springframework.aop.support;

-import org.junit.Test;
+import junit.framework.TestCase;

 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ClassUtils;

-import static org.junit.Assert.*;
-
 /**
 * @author Colin Sampaleanu
 * @author Juergen Hoeller
 * @author Rob Harrop
 * @author Rick Evans
 */
-public class ClassUtilsTests {
+public class ClassUtilsTests extends TestCase {

-	@Test
-	public void getShortNameForCglibClass() {
+	public void testGetShortNameForCglibClass() {
 		TestBean tb = new TestBean();
 		ProxyFactory pf = new ProxyFactory();
 		pf.setTarget(tb);
@@ -1,47 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.aop.target;
-
-import org.junit.Test;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.core.io.Resource;
-import org.springframework.tests.sample.beans.ITestBean;
-
-import static org.junit.Assert.*;
-import static org.springframework.tests.TestResourceUtils.*;
-
-/**
- * @author Stephane Nicoll
- */
-public final class CommonsPool2TargetSourceProxyTests {
-
-	private static final Resource CONTEXT =
-		qualifiedResource(CommonsPool2TargetSourceProxyTests.class, "context.xml");
-
-	@Test
-	public void testProxy() throws Exception {
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
-		reader.loadBeanDefinitions(CONTEXT);
-		beanFactory.preInstantiateSingletons();
-		ITestBean bean = (ITestBean)beanFactory.getBean("testBean");
-		assertTrue(AopUtils.isAopProxy(bean));
-	}
-}
@@ -1,16 +0,0 @@
-<?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">
-
-<beans>
-
-	<bean id="testBeanTarget" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/>
-
-	<bean id="targetSource" class="org.springframework.aop.target.CommonsPool2TargetSource">
-		<property name="targetBeanName" value="testBeanTarget"/>
-	</bean>
-
-	<bean id="testBean" class="org.springframework.aop.framework.ProxyFactoryBean">
-		<property name="targetSource" ref="targetSource"/>
-	</bean>
-
-</beans>
@@ -25,9 +25,6 @@ compileJava  {
 	ext.targetCompatibility = project(":spring-core").compileJava.targetCompatibility

 	doLast{
-		// Assemble runtime classpath from folders and JARs that actually exist
-		def runtimeClasspath = project.files(sourceSets.main.runtimeClasspath.files.findAll({ it.exists() }))
-
 		ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
 				classpath: configurations.ajc.asPath)

@@ -37,7 +34,7 @@ compileJava  {
 				aspectPath: configurations.aspects.asPath,
 				inpath: configurations.ajInpath.asPath,
 				sourceRootCopyFilter: "**/*.java,**/*.aj",
-				classpath: (runtimeClasspath + configurations.rt).asPath) {
+				classpath: (sourceSets.main.runtimeClasspath + configurations.rt).asPath) {
 			sourceroots {
 				sourceSets.main.java.srcDirs.each {
 					pathelement(location:it.absolutePath)
@@ -61,9 +58,6 @@ compileTestJava  {
 	ext.targetCompatibility = project(":spring-core").compileTestJava.targetCompatibility

 	doLast{
-		// Assemble runtime classpath from folders and JARs that actually exist
-		def runtimeClasspath = project.files(sourceSets.test.runtimeClasspath.files.findAll({ it.exists() }))
-
 		ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
 				classpath: configurations.ajc.asPath)

@@ -72,7 +66,8 @@ compileTestJava  {
 				destDir: outputDir.absolutePath,
 				aspectPath: jar.archivePath,
 				inpath: configurations.ajInpath.asPath,
-				classpath: (runtimeClasspath + project.files(jar.archivePath) + configurations.rt).asPath) {
+				classpath: sourceSets.test.runtimeClasspath.asPath + jar.archivePath +
+				           System.getProperty("path.separator") + configurations.rt.asPath) {
 			sourceroots {
 				sourceSets.test.java.srcDirs.each {
 					pathelement(location:it.absolutePath)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -62,13 +62,11 @@ public abstract aspect AbstractAsyncExecutionAspect extends AsyncExecutionAspect
 	@SuppressAjWarnings("adviceDidNotMatch")
 	Object around() : asyncMethod() {
 		final MethodSignature methodSignature = (MethodSignature) thisJoinPointStaticPart.getSignature();
-
 		AsyncTaskExecutor executor = determineAsyncExecutor(methodSignature.getMethod());
 		if (executor == null) {
 			return proceed();
 		}
-
-		Callable<Object> task = new Callable<Object>() {
+		Callable<Object> callable = new Callable<Object>() {
 			public Object call() throws Exception {
 				try {
 					Object result = proceed();
@@ -82,7 +80,17 @@ public abstract aspect AbstractAsyncExecutionAspect extends AsyncExecutionAspect
 				return null;
 			}};

-		return doSubmit(task, executor, methodSignature.getReturnType());
+		Class<?> returnType = methodSignature.getReturnType();
+		if (ListenableFuture.class.isAssignableFrom(returnType)) {
+			return ((AsyncListenableTaskExecutor) executor).submitListenable(callable);
+		}
+		else if (Future.class.isAssignableFrom(returnType)) {
+			return executor.submit(callable);
+		}
+		else {
+			executor.submit(callable);
+			return null;
+		}
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,8 +20,7 @@ import org.springframework.transaction.annotation.AnnotationTransactionAttribute
 import org.springframework.transaction.annotation.Transactional;

 /**
- * Concrete AspectJ transaction aspect using Spring's
- * {@link org.springframework.transaction.annotation.Transactional} annotation.
+ * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.
 *
 * <p>When using this aspect, you <i>must</i> annotate the implementation class
 * (and/or methods within that class), <i>not</i> the interface (if any) that
@@ -67,6 +66,8 @@ public aspect AnnotationTransactionAspect extends AbstractTransactionAspect {
 	 * will have Spring transaction management applied.
 	 */
 	protected pointcut transactionalMethodExecution(Object txObject) :
-		(executionOfAnyPublicMethodInAtTransactionalType() || executionOfTransactionalMethod() ) && this(txObject);
+		(executionOfAnyPublicMethodInAtTransactionalType()
+		 || executionOfTransactionalMethod() )
+		 && this(txObject);

 }
@@ -1,75 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.transaction.aspectj;
-
-import javax.transaction.Transactional;
-
-import org.aspectj.lang.annotation.RequiredTypes;
-
-import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
-
-/**
- * Concrete AspectJ transaction aspect using the JTA 1.2
- * {@link javax.transaction.Transactional} annotation.
- *
- * <p>When using this aspect, you <i>must</i> annotate the implementation class
- * (and/or methods within that class), <i>not</i> the interface (if any) that
- * the class implements. AspectJ follows Java's rule that annotations on
- * interfaces are <i>not</i> inherited.
- *
- * <p>An @Transactional annotation on a class specifies the default transaction
- * semantics for the execution of any <b>public</b> operation in the class.
- *
- * <p>An @Transactional annotation on a method within the class overrides the
- * default transaction semantics given by the class annotation (if present).
- * Any method may be annotated (regardless of visibility). Annotating
- * non-public methods directly is the only way to get transaction demarcation
- * for the execution of such operations.
- *
- * @author Stephane Nicoll
- * @since 4.2
- * @see javax.transaction.Transactional
- * @see AnnotationTransactionAspect
- */
-@RequiredTypes({"javax.transaction.Transactional"})
-public aspect JtaAnnotationTransactionAspect extends AbstractTransactionAspect {
-
-	public JtaAnnotationTransactionAspect() {
-		super(new AnnotationTransactionAttributeSource(false));
-	}
-
-	/**
-	 * Matches the execution of any public method in a type with the Transactional
-	 * annotation, or any subtype of a type with the Transactional annotation.
-	 */
-	private pointcut executionOfAnyPublicMethodInAtTransactionalType() :
-		execution(public * ((@Transactional *)+).*(..)) && within(@Transactional *);
-
-	/**
-	 * Matches the execution of any method with the Transactional annotation.
-	 */
-	private pointcut executionOfTransactionalMethod() :
-		execution(@Transactional * *(..));
-
-	/**
-	 * Definition of pointcut from super aspect - matched join points
-	 * will have Spring transaction management applied.
-	 */
-	protected pointcut transactionalMethodExecution(Object txObject) :
-		(executionOfAnyPublicMethodInAtTransactionalType() || executionOfTransactionalMethod() ) && this(txObject);
-
-}
@@ -13,7 +13,6 @@
 		<aspect name="org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect"/>
 		<aspect name="org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect"/>
 		<aspect name="org.springframework.transaction.aspectj.AnnotationTransactionAspect"/>
-		<aspect name="org.springframework.transaction.aspectj.JtaAnnotationTransactionAspect"/>
 		<aspect name="org.springframework.cache.aspectj.AnnotationCacheAspect"/>
 		<aspect name="org.springframework.cache.aspectj.JCacheCacheAspect"/>
 	</aspects>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -16,18 +16,16 @@

 package org.springframework.aop.aspectj.autoproxy;

-import org.junit.Test;
+import junit.framework.TestCase;

 import org.springframework.context.support.ClassPathXmlApplicationContext;

 /**
 * @author Adrian Colyer
 */
-public class AutoProxyWithCodeStyleAspectsTests {
+public class AutoProxyWithCodeStyleAspectsTests extends TestCase {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -16,17 +16,18 @@

 package org.springframework.beans.factory.aspectj;

-import org.junit.Test;
+import junit.framework.TestCase;

 import org.springframework.context.support.ClassPathXmlApplicationContext;

-public class SpringConfiguredWithAutoProxyingTests {
+public class SpringConfiguredWithAutoProxyingTests extends TestCase {

-	@Test
-	@SuppressWarnings("resource")
-	public void springConfiguredAndAutoProxyUsedTogether() {
-		// instantiation is sufficient to trigger failure if this is going to fail...
+	@Override
+	protected void setUp() throws Exception {
 		new ClassPathXmlApplicationContext("org/springframework/beans/factory/aspectj/springConfigured.xml");
 	}

+	public void testSpringConfiguredAndAutoProxyUsedTogether() {
+		; // set up is sufficient to trigger failure if this is going to fail...
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -38,11 +38,6 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 		return counter.getAndIncrement();
 	}

-	@Override
-	public Object cacheNull(Object arg1) {
-		return null;
-	}
-
 	@Override
 	public Object conditional(int field) {
 		return null;
@@ -65,71 +60,71 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", allEntries = true)
+	@CacheEvict(value = "testCache", allEntries = true)
 	public void evictAll(Object arg1) {
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", beforeInvocation = true)
+	@CacheEvict(value = "testCache", beforeInvocation = true)
 	public void evictEarly(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", key = "#p0")
+	@CacheEvict(value = "testCache", key = "#p0")
 	public void evict(Object arg1, Object arg2) {
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", key = "#p0", beforeInvocation = true)
+	@CacheEvict(value = "testCache", key = "#p0", beforeInvocation = true)
 	public void invalidateEarly(Object arg1, Object arg2) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", key = "#p0")
+	@Cacheable(value = "testCache", key = "#p0")
 	public Object key(Object arg1, Object arg2) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable("testCache")
+	@Cacheable(value = "testCache")
 	public Object varArgsKey(Object... args) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", key = "#root.methodName + #root.caches[0].name")
+	@Cacheable(value = "testCache", key = "#root.methodName + #root.caches[0].name")
 	public Object name(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
+	@Cacheable(value = "testCache", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
 	public Object rootVars(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", keyGenerator = "customKyeGenerator")
+	@Cacheable(value = "testCache", keyGenerator = "customKyeGenerator")
 	public Object customKeyGenerator(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", keyGenerator = "unknownBeanName")
+	@Cacheable(value = "testCache", keyGenerator = "unknownBeanName")
 	public Object unknownCustomKeyGenerator(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", cacheManager = "customCacheManager")
+	@Cacheable(value = "testCache", cacheManager = "customCacheManager")
 	public Object customCacheManager(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", cacheManager = "unknownBeanName")
+	@Cacheable(value = "testCache", cacheManager = "unknownBeanName")
 	public Object unknownCustomCacheManager(Object arg1) {
 		return counter.getAndIncrement();
 	}
@@ -141,7 +136,7 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 	}

 	@Override
-	@CachePut(cacheNames = "testCache", condition = "#arg.equals(3)")
+	@CachePut(value = "testCache", condition = "#arg.equals(3)")
 	public Object conditionalUpdate(Object arg) {
 		return arg;
 	}
@@ -176,19 +171,19 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 	}

 	@Override
-	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#p0") })
+	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0") })
 	public Object multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Caching(cacheable = { @Cacheable(cacheNames = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
+	@Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
 	public Object multiCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Caching(cacheable = { @Cacheable(cacheNames = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
+	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Object multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
@@ -200,7 +195,7 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 	}

 	@Override
-	@CachePut(cacheNames = "primary", key = "#result.id")
+	@CachePut(value="primary", key="#result.id")
 	public TestEntity putRefersToResult(TestEntity arg1) {
 		arg1.setId(Long.MIN_VALUE);
 		return arg1;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -58,12 +58,6 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
 		return counter.getAndIncrement();
 	}

-	@Override
-	@CacheResult
-	public Long cacheNull(String id) {
-		return null;
-	}
-
 	@Override
 	@CacheResult(exceptionCacheName = "exception", nonCachedExceptions = NullPointerException.class)
 	public Long cacheWithException(@CacheKey String id, boolean matchFilter) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -26,8 +26,6 @@ public interface CacheableService<T> {

 	T cache(Object arg1);

-	T cacheNull(Object arg1);
-
 	void invalidate(Object arg1);

 	void evictEarly(Object arg1);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -40,12 +40,6 @@ public class DefaultCacheableService implements CacheableService<Long> {
 		return counter.getAndIncrement();
 	}

-	@Override
-	@Cacheable("testCache")
-	public Long cacheNull(Object arg1) {
-		return null;
-	}
-
 	@Override
 	@CacheEvict("testCache")
 	public void invalidate(Object arg1) {
@@ -58,83 +52,83 @@ public class DefaultCacheableService implements CacheableService<Long> {
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", allEntries = true)
+	@CacheEvict(value = "testCache", allEntries = true)
 	public void evictAll(Object arg1) {
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", beforeInvocation = true)
+	@CacheEvict(value = "testCache", beforeInvocation = true)
 	public void evictEarly(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", key = "#p0")
+	@CacheEvict(value = "testCache", key = "#p0")
 	public void evict(Object arg1, Object arg2) {
 	}

 	@Override
-	@CacheEvict(cacheNames = "testCache", key = "#p0", beforeInvocation = true)
+	@CacheEvict(value = "testCache", key = "#p0", beforeInvocation = true)
 	public void invalidateEarly(Object arg1, Object arg2) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", condition = "#classField == 3")
+	@Cacheable(value = "testCache", condition = "#classField == 3")
 	public Long conditional(int classField) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", unless = "#result > 10")
+	@Cacheable(value = "testCache", unless = "#result > 10")
 	public Long unless(int arg) {
 		return (long) arg;
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", key = "#p0")
+	@Cacheable(value = "testCache", key = "#p0")
 	public Long key(Object arg1, Object arg2) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable("testCache")
+	@Cacheable(value = "testCache")
 	public Long varArgsKey(Object... args) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", key = "#root.methodName")
+	@Cacheable(value = "testCache", key = "#root.methodName")
 	public Long name(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
+	@Cacheable(value = "testCache", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
 	public Long rootVars(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", keyGenerator = "customKeyGenerator")
+	@Cacheable(value = "testCache", keyGenerator = "customKeyGenerator")
 	public Long customKeyGenerator(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", keyGenerator = "unknownBeanName")
+	@Cacheable(value = "testCache", keyGenerator = "unknownBeanName")
 	public Long unknownCustomKeyGenerator(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", cacheManager = "customCacheManager")
+	@Cacheable(value = "testCache", cacheManager = "customCacheManager")
 	public Long customCacheManager(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Cacheable(cacheNames = "testCache", cacheManager = "unknownBeanName")
+	@Cacheable(value = "testCache", cacheManager = "unknownBeanName")
 	public Long unknownCustomCacheManager(Object arg1) {
 		return counter.getAndIncrement();
 	}
@@ -146,7 +140,7 @@ public class DefaultCacheableService implements CacheableService<Long> {
 	}

 	@Override
-	@CachePut(cacheNames = "testCache", condition = "#arg.equals(3)")
+	@CachePut(value = "testCache", condition = "#arg.equals(3)")
 	public Long conditionalUpdate(Object arg) {
 		return Long.valueOf(arg.toString());
 	}
@@ -184,20 +178,20 @@ public class DefaultCacheableService implements CacheableService<Long> {
 	}

 	@Override
-//FIXME	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#p0"), @CacheEvict(cacheNames = "primary", key = "#p0 + 'A'") })
-	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#p0") })
+//FIXME	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") })
+	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0") })
 	public Long multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Caching(cacheable = { @Cacheable(cacheNames = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
+	@Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
 	public Long multiCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}

 	@Override
-	@Caching(cacheable = { @Cacheable(cacheNames = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
+	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Long multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
@@ -209,7 +203,7 @@ public class DefaultCacheableService implements CacheableService<Long> {
 	}

 	@Override
-	@CachePut(cacheNames = "primary", key = "#result.id")
+	@CachePut(value="primary", key="#result.id")
 	public TestEntity putRefersToResult(TestEntity arg1) {
 		arg1.setId(Long.MIN_VALUE);
 		return arg1;
@@ -18,7 +18,6 @@ package org.springframework.scheduling.aspectj;

 import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

@@ -141,11 +140,8 @@ public class AnnotationAsyncExecutionAspectTests {
 		assertThat(defaultThread.get(), not(Thread.currentThread()));
 		assertThat(defaultThread.get().getName(), not(startsWith("e1-")));

-		ListenableFuture<Thread> e1Thread = obj.e1Work();
+		Future<Thread> e1Thread = obj.e1Work();
 		assertThat(e1Thread.get().getName(), startsWith("e1-"));
-
-		CompletableFuture<Thread> e1OtherThread = obj.e1OtherWork();
-		assertThat(e1OtherThread.get().getName(), startsWith("e1-"));
 	}

 	@Test
@@ -282,11 +278,6 @@ public class AnnotationAsyncExecutionAspectTests {
 		public ListenableFuture<Thread> e1Work() {
 			return new AsyncResult<Thread>(Thread.currentThread());
 		}
-
-		@Async("e1")
-		public CompletableFuture<Thread> e1OtherWork() {
-			return CompletableFuture.completedFuture(Thread.currentThread());
-		}
 	}


@@ -1,69 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.scheduling.aspectj;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.beans.DirectFieldAccessor;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.scheduling.config.TaskManagementConfigUtils;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Stephane Nicoll
- */
-public class AnnotationDrivenBeanDefinitionParserTests {
-
-	private ConfigurableApplicationContext context;
-
-	@Before
-	public void setup() {
-		this.context = new ClassPathXmlApplicationContext(
-				"annotationDrivenContext.xml", AnnotationDrivenBeanDefinitionParserTests.class);
-	}
-
-	@After
-	public void after() {
-		if (this.context != null) {
-			this.context.close();
-		}
-	}
-
-	@Test
-	public void asyncAspectRegistered() {
-		assertTrue(context.containsBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME));
-	}
-
-	@Test
-	public void asyncPostProcessorExecutorReference() {
-		Object executor = context.getBean("testExecutor");
-		Object aspect = context.getBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME);
-		assertSame(executor, new DirectFieldAccessor(aspect).getPropertyValue("defaultExecutor"));
-	}
-
-	@Test
-	public void asyncPostProcessorExceptionHandlerReference() {
-		Object exceptionHandler = context.getBean("testExceptionHandler");
-		Object aspect = context.getBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME);
-		assertSame(exceptionHandler, new DirectFieldAccessor(aspect).getPropertyValue("exceptionHandler"));
-	}
-
-}
@@ -1,175 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.transaction.aspectj;
-
-import java.io.IOException;
-import javax.transaction.Transactional;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.tests.transaction.CallCountingTransactionManager;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Stephane Nicoll
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = JtaTransactionAspectsTests.Config.class)
-public class JtaTransactionAspectsTests {
-
-	@Autowired
-	private CallCountingTransactionManager txManager;
-
-	@Before
-	public void setUp() {
-		this.txManager.clear();
-	}
-
-	@Test
-	public void commitOnAnnotatedPublicMethod() throws Throwable {
-		assertEquals(0, this.txManager.begun);
-		new JtaAnnotationPublicAnnotatedMember().echo(null);
-		assertEquals(1, this.txManager.commits);
-	}
-
-	@Test
-	public void matchingRollbackOnApplied() throws Throwable {
-		assertEquals(0, this.txManager.begun);
-		InterruptedException test = new InterruptedException();
-		try {
-			new JtaAnnotationPublicAnnotatedMember().echo(test);
-			fail("Should have thrown an exception");
-		}
-		catch (Throwable throwable) {
-			assertEquals("wrong exception", test, throwable);
-		}
-		assertEquals(1, this.txManager.rollbacks);
-		assertEquals(0, this.txManager.commits);
-	}
-
-	@Test
-	public void nonMatchingRollbackOnApplied() throws Throwable {
-		assertEquals(0, this.txManager.begun);
-		IOException test = new IOException();
-		try {
-			new JtaAnnotationPublicAnnotatedMember().echo(test);
-			fail("Should have thrown an exception");
-		}
-		catch (Throwable throwable) {
-			assertEquals("wrong exception", test, throwable);
-		}
-		assertEquals(1, this.txManager.commits);
-		assertEquals(0, this.txManager.rollbacks);
-	}
-
-	@Test
-	public void commitOnAnnotatedProtectedMethod() {
-		assertEquals(0, this.txManager.begun);
-		new JtaAnnotationProtectedAnnotatedMember().doInTransaction();
-		assertEquals(1, this.txManager.commits);
-	}
-
-	@Test
-	public void nonAnnotatedMethodCallingProtectedMethod() {
-		assertEquals(0, this.txManager.begun);
-		new JtaAnnotationProtectedAnnotatedMember().doSomething();
-		assertEquals(1, this.txManager.commits);
-	}
-
-	@Test
-	public void commitOnAnnotatedPrivateMethod() {
-		assertEquals(0, this.txManager.begun);
-		new JtaAnnotationPrivateAnnotatedMember().doInTransaction();
-		assertEquals(1, this.txManager.commits);
-	}
-
-	@Test
-	public void nonAnnotatedMethodCallingPrivateMethod() {
-		assertEquals(0, this.txManager.begun);
-		new JtaAnnotationPrivateAnnotatedMember().doSomething();
-		assertEquals(1, this.txManager.commits);
-	}
-
-	@Test
-	public void notTransactional() {
-		assertEquals(0, this.txManager.begun);
-		new TransactionAspectTests.NotTransactional().noop();
-		assertEquals(0, this.txManager.begun);
-	}
-
-
-	public static class JtaAnnotationPublicAnnotatedMember {
-
-		@Transactional(rollbackOn = InterruptedException.class)
-		public void echo(Throwable t) throws Throwable {
-			if (t != null) {
-				throw t;
-			}
-		}
-
-	}
-
-
-	protected static class JtaAnnotationProtectedAnnotatedMember {
-
-		public void doSomething() {
-			doInTransaction();
-		}
-
-		@Transactional
-		protected void doInTransaction() {
-		}
-	}
-
-
-	protected static class JtaAnnotationPrivateAnnotatedMember {
-
-		public void doSomething() {
-			doInTransaction();
-		}
-
-		@Transactional
-		private void doInTransaction() {
-		}
-	}
-
-
-	@Configuration
-	protected static class Config {
-
-		@Bean
-		public CallCountingTransactionManager transactionManager() {
-			return new CallCountingTransactionManager();
-		}
-
-		@Bean
-		public JtaAnnotationTransactionAspect transactionAspect() {
-			JtaAnnotationTransactionAspect aspect = JtaAnnotationTransactionAspect.aspectOf();
-			aspect.setTransactionManager(transactionManager());
-			return aspect;
-		}
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.transaction.aspectj;

 import java.lang.reflect.Method;

+import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -27,10 +28,10 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
 * @author Rod Johnson
 * @author Ramnivas Laddad
 * @author Juergen Hoeller
- * @author Sam Brannen
 */
-@SuppressWarnings("deprecation")
-public class TransactionAspectTests extends org.springframework.test.AbstractDependencyInjectionSpringContextTests {
+public class TransactionAspectTests extends AbstractDependencyInjectionSpringContextTests {
+
+	private TransactionAspectSupport transactionAspect;

 	private CallCountingTransactionManager txManager;

@@ -57,13 +58,17 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 	}

 	public void setTransactionAspect(TransactionAspectSupport transactionAspect) {
+		this.transactionAspect = transactionAspect;
 		this.txManager = (CallCountingTransactionManager) transactionAspect.getTransactionManager();
 	}

+	public TransactionAspectSupport getTransactionAspect() {
+		return this.transactionAspect;
+	}

 	@Override
-	protected String[] getConfigPaths() {
-		return new String[] { "TransactionAspectTests-context.xml" };
+	protected String getConfigPath() {
+		return "TransactionAspectTests-context.xml";
 	}


@@ -102,6 +107,12 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 		assertEquals(1, txManager.commits);
 	}

+
+	public static class NotTransactional {
+		public void noop() {
+		}
+	}
+
 	public void testNotTransactional() throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
@@ -109,6 +120,7 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 		assertEquals(0, txManager.begun);
 	}

+
 	public void testDefaultCommitOnAnnotatedClass() throws Throwable {
 		final Exception ex = new Exception();
 		try {
@@ -141,6 +153,7 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 		}
 	}

+
 	public void testDefaultCommitOnSubclassOfAnnotatedClass() throws Throwable {
 		final Exception ex = new Exception();
 		try {
@@ -174,6 +187,12 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 	}

 	public void testDefaultCommitOnImplementationOfAnnotatedInterface() throws Throwable {
+//		testRollback(new TransactionOperationCallback() {
+//			public Object performTransactionalOperation() throws Throwable {
+//				return new ImplementsAnnotatedInterface().echo(new Exception());
+//			}
+//		}, false);
+
 		final Exception ex = new Exception();
 		testNotTransactional(new TransactionOperationCallback() {
 			@Override
@@ -187,15 +206,24 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 	 * Note: resolution does not occur. Thus we can't make a class transactional if
 	 * it implements a transactionally annotated interface. This behaviour could only
 	 * be changed in AbstractFallbackTransactionAttributeSource in Spring proper.
+	 * @throws SecurityException
+	 * @throws NoSuchMethodException
 	 */
-	public void testDoesNotResolveTxAnnotationOnMethodFromClassImplementingAnnotatedInterface() throws Exception {
+	public void testDoesNotResolveTxAnnotationOnMethodFromClassImplementingAnnotatedInterface() throws SecurityException, NoSuchMethodException {
 		AnnotationTransactionAttributeSource atas = new AnnotationTransactionAttributeSource();
 		Method m = ImplementsAnnotatedInterface.class.getMethod("echo", Throwable.class);
 		TransactionAttribute ta = atas.getTransactionAttribute(m, ImplementsAnnotatedInterface.class);
 		assertNull(ta);
 	}

+
 	public void testDefaultRollbackOnImplementationOfAnnotatedInterface() throws Throwable {
+//		testRollback(new TransactionOperationCallback() {
+//			public Object performTransactionalOperation() throws Throwable {
+//				return new ImplementsAnnotatedInterface().echo(new RuntimeException());
+//			}
+//		}, true);
+
 		final Exception rollbackProvokingException = new RuntimeException();
 		testNotTransactional(new TransactionOperationCallback() {
 			@Override
@@ -205,6 +233,7 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 		}, rollbackProvokingException);
 	}

+
 	protected void testRollback(TransactionOperationCallback toc, boolean rollback) throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
@@ -237,15 +266,19 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep


 	private interface TransactionOperationCallback {
+
 		Object performTransactionalOperation() throws Throwable;
 	}

+
 	public static class SubclassOfClassWithTransactionalAnnotation extends TransactionalAnnotationOnlyOnClassWithNoInterface {
 	}

+
 	public static class SubclassOfClassWithTransactionalMethodAnnotation extends MethodAnnotationOnClassWithNoInterface {
 	}

+
 	public static class ImplementsAnnotatedInterface implements ITransactional {

 		@Override
@@ -257,10 +290,4 @@ public class TransactionAspectTests extends org.springframework.test.AbstractDep
 		}
 	}

-	public static class NotTransactional {
-
-		public void noop() {
-		}
-	}
-
 }
@@ -1,18 +0,0 @@
-<?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:task="http://www.springframework.org/schema/task"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
-	   			http://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/task
-				http://www.springframework.org/schema/task/spring-task.xsd">
-
-	<task:annotation-driven mode="aspectj" executor="testExecutor"
-							exception-handler="testExceptionHandler"/>
-
-	<task:executor id="testExecutor"/>
-
-	<bean id="testExceptionHandler"
-		  class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
-
-</beans>
@@ -156,8 +156,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp


 	/**
-	 * Create a new {@code GroovyBeanDefinitionReader} for the given
-	 * {@link BeanDefinitionRegistry}.
+	 * Create a new {@code GroovyBeanDefinitionReader} for the given {@link BeanDefinitionRegistry}.
 	 * @param registry the {@code BeanDefinitionRegistry} to load bean definitions into
 	 */
 	public GroovyBeanDefinitionReader(BeanDefinitionRegistry registry) {
@@ -168,13 +167,10 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
 	}

 	/**
-	 * Create a new {@code GroovyBeanDefinitionReader} based on the given
-	 * {@link XmlBeanDefinitionReader}, loading bean definitions into its
-	 * {@code BeanDefinitionRegistry} and delegating Groovy DSL loading to it.
-	 * <p>The supplied {@code XmlBeanDefinitionReader} should typically
-	 * be pre-configured with XML validation disabled.
-	 * @param xmlBeanDefinitionReader the {@code XmlBeanDefinitionReader} to
-	 * derive the registry from and to delegate Groovy DSL loading to
+	 * Create a new {@code GroovyBeanDefinitionReader} based on the given {@link XmlBeanDefinitionReader},
+	 * using its {@code BeanDefinitionRegistry} and delegating Groovy DSL loading to it.
+	 * @param xmlBeanDefinitionReader the {@code XmlBeanDefinitionReader} to derive the registry
+	 * from and to delegate XML loading to
 	 */
 	public GroovyBeanDefinitionReader(XmlBeanDefinitionReader xmlBeanDefinitionReader) {
 		super(xmlBeanDefinitionReader.getRegistry());
@@ -619,7 +615,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
 			try {
 				Closure callable = (Closure) value;
 				Class<?> parameterType = callable.getParameterTypes()[0];
-				if (Object.class == parameterType) {
+				if (parameterType.equals(Object.class)) {
 					this.currentBeanDefinition = new GroovyBeanDefinitionWrapper("");
 					callable.call(this.currentBeanDefinition);
 				}
--- a/Show More
+++ b/Show More