Merge branch '2.4.x'

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@@ -6948,7 +6948,7 @@ You can use the `@DataJpaTest` annotation to test JPA applications.
 By default, it scans for `@Entity` classes and configures Spring Data JPA repositories.
 If an embedded database is available on the classpath, it configures one as well.
 SQL queries are logged by default by setting the `spring.jpa.show-sql` property to `true`.
-This can be disabled by using the `showSql()` attribute of the annotation.
+This can be disabled using the `showSql()` attribute of the annotation.
 
 Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataJpaTest` annotation is used.
 `@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans.

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,8 @@ import org.springframework.transaction.annotation.Transactional;
  * override these settings.
  * <p>
  * SQL queries are logged by default by setting the {@code spring.jpa.show-sql} property
- * to {@code true}. This can be disabled by using the {@link DataJpaTest#showSql()
- * showSql} attribute.
+ * to {@code true}. This can be disabled using the {@link DataJpaTest#showSql() showSql}
+ * attribute.
  * <p>
  * If you are looking to load your full application configuration, but use an embedded
  * database, you should consider {@link SpringBootTest @SpringBootTest} combined with