.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

build.gradle

@@ -26,17 +26,17 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.10.3"
-			mavenBom "io.netty:netty-bom:4.1.49.Final"
-			mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR7"
-			mavenBom "io.rsocket:rsocket-bom:1.0.0-RC7"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.28.v20200408"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.10.4"
+			mavenBom "io.netty:netty-bom:4.1.50.Final"
+			mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR8"
+			mavenBom "io.rsocket:rsocket-bom:1.0.0"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.29.v20200521"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.72"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.5"
 			mavenBom "org.junit:junit-bom:5.6.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.13.2') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.13.3') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-slf4j-impl'
@@ -50,7 +50,7 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '2.5.11') {
+			dependencySet(group: 'org.codehaus.groovy', version: '2.5.12') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'
@@ -75,7 +75,7 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.4"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.6"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -87,11 +87,11 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.26"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.8.1"
-			dependency "com.github.librepdf:openpdf:1.3.14"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.8.4"
+			dependency "com.github.librepdf:openpdf:1.3.17"
 			dependency "com.rometools:rome:1.12.2"
 			dependency "commons-io:commons-io:2.5"
-			dependency "io.vavr:vavr:0.10.2"
+			dependency "io.vavr:vavr:0.10.3"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
 			dependencySet(group: 'org.apache.activemq', version: '5.8.0') {
 				entry 'activemq-broker'
@@ -115,19 +115,19 @@ configure(allprojects) { project ->
 			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.4.14.Final"
-			dependency "org.hibernate:hibernate-validator:6.1.4.Final"
-			dependency "org.webjars:webjars-locator-core:0.44"
+			dependency "org.hibernate:hibernate-core:5.4.17.Final"
+			dependency "org.hibernate:hibernate-validator:6.1.5.Final"
+			dependency "org.webjars:webjars-locator-core:0.45"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.34') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.36') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.34') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.36') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
@@ -142,7 +142,7 @@ configure(allprojects) { project ->
 				}
 			}
 
-			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.7') {
+			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
 				entry 'okhttp'
 				entry 'mockwebserver'
 			}
@@ -152,7 +152,7 @@ configure(allprojects) { project ->
 			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.2"
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.3"
 
 			dependency "org.jruby:jruby:9.2.11.1"
 			dependency "org.python:jython-standalone:2.7.1"
@@ -179,7 +179,7 @@ configure(allprojects) { project ->
 			dependency "org.testng:testng:6.14.3"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.15.0"
+			dependency "org.assertj:assertj-core:3.16.1"
 			dependencySet(group: 'org.xmlunit', version: '2.6.2') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
@@ -194,10 +194,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.10.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.39.1") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.40.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.39.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.40.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -223,8 +223,8 @@ configure(allprojects) { project ->
 			}
 
 			dependency "com.ibm.websphere:uow:6.0.2.17"
-			dependency "com.jamonapi:jamon:2.81"
-			dependency "joda-time:joda-time:2.10.5"
+			dependency "com.jamonapi:jamon:2.82"
+			dependency "joda-time:joda-time:2.10.6"
 			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.6"
 			dependency "org.javamoney:moneta:1.3"
 
@@ -325,7 +325,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.31"
+		toolVersion = "8.33"
 		configDir = rootProject.file("src/checkstyle")
 	}
 

gradle.properties

@@ -1,4 +1,4 @@
-version=5.2.6.BUILD-SNAPSHOT
+version=5.2.7.RELEASE
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceOrderIntegrationTests.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright 2002-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+/**
+ * Integration tests for advice invocation order for advice configured via the
+ * AOP namespace.
+ *
+ * @author Sam Brannen
+ * @since 5.2.7
+ * @see org.springframework.aop.framework.autoproxy.AspectJAutoProxyAdviceOrderIntegrationTests
+ */
+class AopNamespaceHandlerAdviceOrderIntegrationTests {
+
+	@Nested
+	@SpringJUnitConfig(locations = "AopNamespaceHandlerAdviceOrderIntegrationTests-afterFirst.xml")
+	@DirtiesContext
+	class AfterAdviceFirstTests {
+
+		@Test
+		void afterAdviceIsInvokedFirst(@Autowired Echo echo, @Autowired InvocationTrackingAspect aspect) throws Exception {
+			assertThat(aspect.invocations).isEmpty();
+			assertThat(echo.echo(42)).isEqualTo(42);
+			assertThat(aspect.invocations).containsExactly("around - start", "before", "around - end", "after", "after returning");
+
+			aspect.invocations.clear();
+			assertThatExceptionOfType(Exception.class).isThrownBy(() -> echo.echo(new Exception()));
+			assertThat(aspect.invocations).containsExactly("around - start", "before", "around - end", "after", "after throwing");
+		}
+	}
+
+	@Nested
+	@SpringJUnitConfig(locations = "AopNamespaceHandlerAdviceOrderIntegrationTests-afterLast.xml")
+	@DirtiesContext
+	class AfterAdviceLastTests {
+
+		@Test
+		void afterAdviceIsInvokedLast(@Autowired Echo echo, @Autowired InvocationTrackingAspect aspect) throws Exception {
+			assertThat(aspect.invocations).isEmpty();
+			assertThat(echo.echo(42)).isEqualTo(42);
+			assertThat(aspect.invocations).containsExactly("around - start", "before", "around - end", "after returning", "after");
+
+			aspect.invocations.clear();
+			assertThatExceptionOfType(Exception.class).isThrownBy(() -> echo.echo(new Exception()));
+			assertThat(aspect.invocations).containsExactly("around - start", "before", "around - end", "after throwing", "after");
+		}
+	}
+
+
+	static class Echo {
+
+		Object echo(Object obj) throws Exception {
+			if (obj instanceof Exception) {
+				throw (Exception) obj;
+			}
+			return obj;
+		}
+	}
+
+	static class InvocationTrackingAspect {
+
+		List<String> invocations = new ArrayList<>();
+
+		Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+			invocations.add("around - start");
+			try {
+				return joinPoint.proceed();
+			}
+			finally {
+				invocations.add("around - end");
+			}
+		}
+
+		void before() {
+			invocations.add("before");
+		}
+
+		void afterReturning() {
+			invocations.add("after returning");
+		}
+
+		void afterThrowing() {
+			invocations.add("after throwing");
+		}
+
+		void after() {
+			invocations.add("after");
+		}
+	}
+
+}