root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-06-17 13:36:57 +02:00
parent 5bf213948c 8bb4c167e4
commit 3568f6c61a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java
View File

@ -57,8 +57,8 @@ import org.springframework.core.annotation.AliasFor;
* {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration} * {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
* for details. * for details.
* *
* <p>Use of this annotation requires that that the {@code spring-jdbc} and * <p>Use of this annotation requires the {@code spring-jdbc} and {@code spring-tx}
* {@code spring-tx} modules be present in the classpath. * modules as well as their transitive dependencies to be present on the classpath.
* *
* @author Sam Brannen * @author Sam Brannen
* @since 4.1 * @since 4.1

4
spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
View File

@ -93,8 +93,8 @@ import static org.springframework.util.ResourceUtils.CLASSPATH_URL_PREFIX;
* locate these beans. * locate these beans.
* *
* <h3>Required Dependencies</h3> * <h3>Required Dependencies</h3>
* <p>Use of this listener requires that that the {@code spring-jdbc} and * <p>Use of this listener requires the {@code spring-jdbc} and {@code spring-tx}
* {@code spring-tx} modules be present in the classpath. * modules as well as their transitive dependencies to be present on the classpath.
* *
* @author Sam Brannen * @author Sam Brannen
* @author Dmitry Semukhin * @author Dmitry Semukhin