Juergen Hoeller dc6c96de0a Merge branch '6.1.x' ...

# Conflicts:
#	spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
#	spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
#	spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java

2024-03-04 22:50:22 +01:00

..

jmh/java/org/springframework

Add JMH benchmarks for Protobuf message converter

2023-10-20 16:35:21 +02:00

main

Merge branch '6.1.x'

2024-03-04 22:50:22 +01:00

test

Merge branch '6.1.x'

2024-03-04 14:43:18 +01:00

testFixtures

Polishing

2024-02-28 19:14:37 +01:00