Juergen Hoeller 21b1f30660 Merge branch '5.2.x' ...

# Conflicts:
#	build.gradle

2020-06-08 20:26:14 +02:00

..

main

Merge branch '5.2.x'

2020-06-08 20:26:14 +02:00

test

Merge branch '5.2.x'

2020-06-05 15:35:05 +02:00

testFixtures/java/org/springframework/aop/testfixture

Apply compiler conventions to test fixtures

2020-02-07 11:04:03 +01:00