Sam Brannen b570f60560 Merge branch '5.3.x' ...

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
#	spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
#	spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
#	spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
#	spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
#	spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
#	spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
#	spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
#	spring-core/src/main/java/org/springframework/javapoet/support/package-info.java
#	spring-core/src/main/java/org/springframework/util/TypeUtils.java
#	spring-web/src/main/java/org/springframework/http/HttpMethod.java

2022-03-18 16:47:12 +01:00

..

core

Merge branch '5.3.x'

2022-03-18 16:47:12 +01:00

css

Remove the black border from code samples

2019-08-13 16:29:47 +02:00

data-access

Merge source and substitution configuration in reference docs

2020-12-28 20:49:36 +01:00

images

Move spring-framework.png to src/docs folder

2020-04-29 16:25:02 +02:00

integration

Update API version and package references for Jakarta EE 9

2021-11-17 12:39:23 +01:00

languages

Fix javax.servlet doc to jakarta.servlet (#27692)

2021-11-17 11:29:54 +01:00

testing

Polish soft assertion support for WebTestClient

2021-08-23 19:09:34 +02:00

web

Merge branch '5.3.x'

2022-03-05 14:54:19 +01:00

appendix.adoc

Define global Asciidoc attributes once

2021-06-22 18:39:33 +02:00

core.adoc

Define global Asciidoc attributes once

2021-06-22 18:39:33 +02:00

data-access.adoc

Support type-safe transaction rollback rules

2022-03-04 19:33:39 +01:00

docinfo-footer.html

Upgrade to Spring Asciidoctor Extensions 0.4.0.RELEASE

2020-02-07 12:16:02 +01:00

index-docinfo-header.html

Reintroduce left-hand side navigation in ref docs

2021-07-17 17:53:43 +03:00

index.adoc

Reintroduce left-hand side navigation in ref docs

2021-07-17 17:53:43 +03:00

integration.adoc

Merge branch '5.3.x'

2022-03-05 14:54:19 +01:00

languages.adoc

Define global Asciidoc attributes once

2021-06-22 18:39:33 +02:00

overview.adoc

Update API version and package references for Jakarta EE 9

2021-11-17 12:39:23 +01:00

rsocket.adoc

Upgrade to Coroutines 1.4.0-M1 and use awaitSingle()

2020-10-13 15:26:39 +02:00

testing.adoc

Merge branch '5.3.x'

2022-03-12 16:05:39 +01:00

web-reactive.adoc

Update API version and package references for Jakarta EE 9

2021-11-17 12:39:23 +01:00

web.adoc

Define global Asciidoc attributes once

2021-06-22 18:39:33 +02:00