Sam Brannen 9350091163 Merge branch '6.0.x' ...

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
#	spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java

2023-09-20 17:06:35 +02:00

..

aop

Consolidate AspectJ test fixtures

2023-09-20 16:47:05 +02:00

beans/factory/xml

Move common FactoryMethods to spring-beans test fixtures

2020-01-02 16:01:35 +01:00

cache/config

Polish "Evaluate key only if necessary"

2023-07-14 14:43:04 +02:00

context

Find all @ComponentScan and @PropertySource annotations

2023-08-13 11:33:32 +02:00

ejb/config

Jakarta EE 9 migration

2021-09-17 09:14:07 +02:00

instrument/classloading

Harmonize resources location

2015-02-28 10:32:40 +01:00

jmx

Polishing

2022-04-08 14:37:41 +02:00

scheduling

URL Cleanup

2019-03-27 19:05:08 +01:00

scripting

Remove obsolete Nashorn-based scripting tests

2022-03-15 16:33:52 +01:00

validation

Rename modules {org.springframework.*=>spring-*}

2012-01-31 14:37:10 +01:00