From 6c3a3dc7d97108d2407d15be1d90d3aadbeb7212 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 10 Nov 2023 11:18:26 +0100 Subject: [PATCH] Polishing --- .../testing/testcontext-framework/executing-sql.adoc | 2 +- .../java/org/springframework/test/context/jdbc/Sql.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/executing-sql.adoc b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/executing-sql.adoc index 282220954d..a942993b33 100644 --- a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/executing-sql.adoc +++ b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/executing-sql.adoc @@ -387,7 +387,7 @@ individual attributes in {api-spring-framework}/test/context/jdbc/Sql.html[`@Sql {api-spring-framework}/test/context/jdbc/SqlConfig.html[`@SqlConfig`] for details. [[testcontext-executing-sql-declaratively-tx]] -*Transaction management for `@Sql`* +==== Transaction management for `@Sql` By default, the `SqlScriptsTestExecutionListener` infers the desired transaction semantics for scripts configured by using `@Sql`. Specifically, SQL scripts are run diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java index c52810742a..7cddff0f63 100644 --- a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java +++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java @@ -55,13 +55,10 @@ import org.springframework.core.annotation.AliasFor; * annotation. Otherwise, {@link SqlGroup @SqlGroup} can be used as an explicit * container for declaring multiple instances of {@code @Sql}. * - *

This annotation may be used as a meta-annotation to create custom - * composed annotations with attribute overrides. - * - *

As of Spring Framework 5.3, this annotation will be inherited from an - * enclosing test class by default. See + *

This annotation will be inherited from an enclosing test class by default. See * {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration} - * for details. + * for details. This annotation may also be used as a meta-annotation to + * create custom composed annotations with attribute overrides. * *

Use of this annotation requires the {@code spring-jdbc} and {@code spring-tx} * modules as well as their transitive dependencies to be present on the classpath.