Skip to content

Commit a8e8897

Browse files
committed
Stop referring to old Spring versions in the reference manual
1 parent e02cddd commit a8e8897

File tree

16 files changed

+34
-38
lines changed

16 files changed

+34
-38
lines changed

framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ Each of the distinct advice types of a particular aspect is conceptually meant t
923923
to the join point directly. As a consequence, an `@AfterThrowing` advice method is not
924924
supposed to receive an exception from an accompanying `@After`/`@AfterReturning` method.
925925
926-
As of Spring Framework 5.2.7, advice methods defined in the same `@Aspect` class that
926+
Advice methods defined in the same `@Aspect` class that
927927
need to run at the same join point are assigned precedence based on their advice type in
928928
the following order, from highest to lowest precedence: `@Around`, `@Before`, `@After`,
929929
`@AfterReturning`, `@AfterThrowing`. Note, however, that an `@After` advice method will

framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ through Java 8's `java.util.Optional`, as the following example shows:
421421
}
422422
----
423423

424-
As of Spring Framework 5.0, you can also use a `@Nullable` annotation (of any kind
425-
in any package -- for example, `javax.annotation.Nullable` from JSR-305) or just leverage
426-
Kotlin built-in null-safety support:
424+
You can also use a `@Nullable` annotation (of any kind in any package -- for example,
425+
`javax.annotation.Nullable` from JSR-305) or just leverage Kotlin built-in null-safety
426+
support:
427427

428428
[tabs]
429429
======

framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ and bean definition show.
751751
TIP: If you run into naming conflicts due to multiple autodetected components having the
752752
same non-qualified class name (i.e., classes with identical names but residing in
753753
different packages), you may need to configure a `BeanNameGenerator` that defaults to the
754-
fully qualified class name for the generated bean name. As of Spring Framework 5.2.3, the
754+
fully qualified class name for the generated bean name. The
755755
`FullyQualifiedAnnotationBeanNameGenerator` located in package
756756
`org.springframework.context.annotation` can be used for such purposes.
757757

framework-docs/modules/ROOT/pages/core/spring-jcl.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[spring-jcl]]
22
= Logging
33

4-
Since Spring Framework 5.0, Spring comes with its own Commons Logging bridge implemented
4+
Spring comes with its own Commons Logging bridge implemented
55
in the `spring-jcl` module. The implementation checks for the presence of the Log4j 2.x
66
API and the SLF4J 1.7 API in the classpath and uses the first one of those found as the
77
logging implementation, falling back to the Java platform's core logging facilities (also

framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ On `LocalSessionFactoryBean`, this is available through the `bootstrapExecutor`
8787
property. On the programmatic `LocalSessionFactoryBuilder`, there is an overloaded
8888
`buildSessionFactory` method that takes a bootstrap executor argument.
8989
90-
As of Spring Framework 5.1, such a native Hibernate setup can also expose a JPA
91-
`EntityManagerFactory` for standard JPA interaction next to native Hibernate access.
90+
Such a native Hibernate setup can also expose a JPA `EntityManagerFactory` for standard
91+
JPA interaction next to native Hibernate access.
9292
See xref:data-access/orm/jpa.adoc#orm-jpa-hibernate[Native Hibernate Setup for JPA] for details.
9393
====
9494

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/rolling-back.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ marks a transaction for rollback only in the case of runtime, unchecked exceptio
1919
That is, when the thrown exception is an instance or subclass of `RuntimeException`.
2020
(`Error` instances also, by default, result in a rollback).
2121

22-
As of Spring Framework 5.2, the default configuration also provides support for
23-
Vavr's `Try` method to trigger transaction rollbacks when it returns a 'Failure'.
22+
The default configuration also provides support for Vavr's `Try` method to trigger
23+
transaction rollbacks when it returns a 'Failure'.
2424
This allows you to handle functional-style errors using Try and have the transaction
2525
automatically rolled back in case of a failure. For more information on Vavr's Try,
2626
refer to the https://docs.vavr.io/#_try[official Vavr documentation].

framework-docs/modules/ROOT/pages/data-access/transaction/strategies.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ exists in the current call stack. The implication in this latter case is that, a
4545
Jakarta EE transaction contexts, a `TransactionStatus` is associated with a thread of
4646
execution.
4747

48-
As of Spring Framework 5.2, Spring also provides a transaction management abstraction for
49-
reactive applications that make use of reactive types or Kotlin Coroutines. The following
50-
listing shows the transaction strategy defined by
48+
Spring also provides a transaction management abstraction for reactive applications that
49+
make use of reactive types or Kotlin Coroutines. The following listing shows the
50+
transaction strategy defined by
5151
`org.springframework.transaction.ReactiveTransactionManager`:
5252

5353
[source,java,indent=0,subs="verbatim,quotes"]

framework-docs/modules/ROOT/pages/languages/kotlin/coroutines.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class UserHandler(builder: WebClient.Builder) {
209209
== Transactions
210210

211211
Transactions on Coroutines are supported via the programmatic variant of the Reactive
212-
transaction management provided as of Spring Framework 5.2.
212+
transaction management.
213213

214214
For suspending functions, a `TransactionalOperator.executeAndAwait` extension is provided.
215215

framework-docs/modules/ROOT/pages/testing/annotations/integration-junit-jupiter.adoc

+5-6
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,17 @@ The default _test constructor autowire mode_ can be changed by setting the
183183
default mode may be set via the
184184
xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism.
185185
186-
As of Spring Framework 5.3, the default mode may also be configured as a
186+
The default mode may also be configured as a
187187
https://junit.org/junit5/docs/current/user-guide/#running-tests-config-params[JUnit Platform configuration parameter].
188188
189189
If the `spring.test.constructor.autowire.mode` property is not set, test class
190190
constructors will not be automatically autowired.
191191
=====
192192

193-
NOTE: As of Spring Framework 5.2, `@TestConstructor` is only supported in conjunction
194-
with the `SpringExtension` for use with JUnit Jupiter. Note that the `SpringExtension` is
195-
often automatically registered for you – for example, when using annotations such as
196-
`@SpringJUnitConfig` and `@SpringJUnitWebConfig` or various test-related annotations from
197-
Spring Boot Test.
193+
NOTE: `@TestConstructor` is only supported in conjunction with the `SpringExtension` for
194+
use with JUnit Jupiter. Note that the `SpringExtension` is often automatically registered
195+
for you – for example, when using annotations such as `@SpringJUnitConfig` and
196+
`@SpringJUnitWebConfig` or various test-related annotations from Spring Boot Test.
198197

199198
[[integration-testing-annotations-nestedtestconfiguration]]
200199
== `@NestedTestConfiguration`

framework-docs/modules/ROOT/pages/testing/testcontext-framework/application-events.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[testcontext-application-events]]
22
= Application Events
33

4-
Since Spring Framework 5.3.3, the TestContext framework provides support for recording
4+
The TestContext framework provides support for recording
55
xref:core/beans/context-introduction.adoc#context-functionality-events[application events] published in the
66
`ApplicationContext` so that assertions can be performed against those events within
77
tests. All events published during the execution of a single test are made available via

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/env-profiles.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ automatically inherit the `@ActiveProfiles` configuration from the base class. I
366366
following example, the declaration of `@ActiveProfiles` (as well as other annotations)
367367
has been moved to an abstract superclass, `AbstractIntegrationTest`:
368368

369-
NOTE: As of Spring Framework 5.3, test configuration may also be inherited from enclosing
370-
classes. See xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] for details.
369+
NOTE: Test configuration may also be inherited from enclosing classes. See
370+
xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] for details.
371371

372372
[tabs]
373373
======

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/inheritance.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ is set to `false`, the resource locations or component classes and the context
1717
initializers, respectively, for the test class shadow and effectively replace the
1818
configuration defined by superclasses.
1919

20-
NOTE: As of Spring Framework 5.3, test configuration may also be inherited from enclosing
21-
classes. See xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] for details.
20+
NOTE: Test configuration may also be inherited from enclosing classes. See
21+
xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] for details.
2222

2323
In the next example, which uses XML resource locations, the `ApplicationContext` for
2424
`ExtendedTest` is loaded from `base-config.xml` and `extended-config.xml`, in that order.

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/property-sources.adoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ Kotlin::
168168

169169
[NOTE]
170170
====
171-
As of Spring Framework 5.2, `@TestPropertySource` can be used as _repeatable annotation_.
171+
`@TestPropertySource` can be used as _repeatable annotation_.
172+
172173
That means that you can have multiple declarations of `@TestPropertySource` on a single
173174
test class, with the `locations` and `properties` from later `@TestPropertySource`
174175
annotations overriding those from previous `@TestPropertySource` annotations.
@@ -261,8 +262,8 @@ If the `inheritLocations` or `inheritProperties` attribute in `@TestPropertySour
261262
set to `false`, the locations or inlined properties, respectively, for the test class
262263
shadow and effectively replace the configuration defined by superclasses.
263264

264-
NOTE: As of Spring Framework 5.3, test configuration may also be inherited from enclosing
265-
classes. See xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] for details.
265+
NOTE: Test configuration may also be inherited from enclosing classes. See
266+
xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] for details.
266267

267268
In the next example, the `ApplicationContext` for `BaseTest` is loaded by using only the
268269
`base.properties` file as a test property source. In contrast, the `ApplicationContext`

framework-docs/modules/ROOT/pages/testing/testcontext-framework/executing-sql.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ details).
495495
[[testcontext-executing-sql-declaratively-script-merging]]
496496
=== Merging and Overriding Configuration with `@SqlMergeMode`
497497

498-
As of Spring Framework 5.2, it is possible to merge method-level `@Sql` declarations with
498+
It is possible to merge method-level `@Sql` declarations with
499499
class-level declarations. For example, this allows you to provide the configuration for a
500500
database schema or some common test data once per test class and then provide additional,
501501
use case specific test data per test method. To enable `@Sql` merging, annotate either

framework-docs/modules/ROOT/pages/testing/testcontext-framework/support-classes.adoc

+2-6
Original file line numberDiff line numberDiff line change
@@ -531,12 +531,8 @@ to the `RepetitionInfo`.
531531
[[testcontext-junit-jupiter-nested-test-configuration]]
532532
=== `@Nested` test class configuration
533533

534-
The _Spring TestContext Framework_ has supported the use of test-related annotations on
535-
`@Nested` test classes in JUnit Jupiter since Spring Framework 5.0; however, until Spring
536-
Framework 5.3 class-level test configuration annotations were not _inherited_ from
537-
enclosing classes like they are from superclasses.
538-
539-
Spring Framework 5.3 introduced first-class support for inheriting test class
534+
The _Spring TestContext Framework_ supports the use of test-related annotations on `@Nested`
535+
test classes in JUnit Jupiter, including first-class support for inheriting test class
540536
configuration from enclosing classes, and such configuration will be inherited by
541537
default. To change from the default `INHERIT` mode to `OVERRIDE` mode, you may annotate
542538
an individual `@Nested` test class with

framework-docs/modules/ROOT/pages/testing/testcontext-framework/test-execution-events.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[[testcontext-test-execution-events]]
22
= Test Execution Events
33

4-
The `EventPublishingTestExecutionListener` introduced in Spring Framework 5.2 offers an
5-
alternative approach to implementing a custom `TestExecutionListener`. Components in the
6-
test's `ApplicationContext` can listen to the following events published by the
4+
The `EventPublishingTestExecutionListener` offers an alternative approach to implementing
5+
a custom `TestExecutionListener`. Components in the test's `ApplicationContext` can
6+
listen to the following events published by the
77
`EventPublishingTestExecutionListener`, each of which corresponds to a method in the
88
`TestExecutionListener` API.
99

0 commit comments

Comments
 (0)