Skip to content

Commit 694224f

Browse files
committed
Remove outdated Spring version mentions
Close gh-35696
1 parent f07873c commit 694224f

File tree

51 files changed

+65
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+65
-93
lines changed

framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,12 @@ A crucial difference between Spring pooling and SLSB pooling is that Spring pool
8787
be applied to any POJO. As with Spring in general, this service can be applied in a
8888
non-invasive way.
8989

90-
Spring provides support for Commons Pool 2.2, which provides a
90+
Spring provides support for Commons Pool 2, which provides a
9191
fairly efficient pooling implementation. You need the `commons-pool` Jar on your
9292
application's classpath to use this feature. You can also subclass
9393
`org.springframework.aop.target.AbstractPoolingTargetSource` to support any other
9494
pooling API.
9595

96-
NOTE: Commons Pool 1.5+ is also supported but is deprecated as of Spring Framework 4.2.
97-
9896
The following listing shows an example configuration:
9997

10098
[source,xml,indent=0,subs="verbatim,quotes"]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,10 +1045,10 @@ methods anywhere. However, regular `@Bean` methods in `@Configuration` classes n
10451045
to be overridable -- that is, they must not be declared as `private` or `final`.
10461046
10471047
`@Bean` methods are also discovered on base classes of a given component or
1048-
configuration class, as well as on Java 8 default methods declared in interfaces
1048+
configuration class, as well as on Java default methods declared in interfaces
10491049
implemented by the component or configuration class. This allows for a lot of
10501050
flexibility in composing complex configuration arrangements, with even multiple
1051-
inheritance being possible through Java 8 default methods as of Spring 4.2.
1051+
inheritance being possible through Java default methods.
10521052
10531053
Finally, a single class may hold multiple `@Bean` methods for the same
10541054
bean, as an arrangement of multiple factory methods to use depending on available

framework-docs/modules/ROOT/pages/core/beans/definition.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ the `@Bean` factory method in favor of any pre-declared constructor on the bean
9999
****
100100

101101
NOTE: We acknowledge that overriding beans in test scenarios is convenient, and there is
102-
explicit support for this as of Spring Framework 6.2. Please refer to
102+
explicit support for this. Please refer to
103103
xref:testing/testcontext-framework/bean-overriding.adoc[this section] for more details.
104104

105105

framework-docs/modules/ROOT/pages/core/beans/java/composing-configuration-classes.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,8 @@ Kotlin::
327327
----
328328
======
329329

330-
TIP: Constructor injection in `@Configuration` classes is only supported as of Spring
331-
Framework 4.3. Note also that there is no need to specify `@Autowired` if the target
332-
bean defines only one constructor.
330+
TIP: Note that there is no need to specify `@Autowired` if the target bean defines
331+
only one constructor.
333332

334333
[discrete]
335334
[[beans-java-injecting-imported-beans-fq]]

framework-docs/modules/ROOT/pages/languages/dynamic.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ objects.
99

1010
Spring's scripting support primarily targets Groovy and BeanShell. Beyond those
1111
specifically supported languages, the JSR-223 scripting mechanism is supported
12-
for integration with any JSR-223 capable language provider (as of Spring 4.2),
13-
for example, JRuby.
12+
for integration with any JSR-223 capable language provider, for example, JRuby.
1413

1514
You can find fully working examples of where this dynamic language support can be
1615
immediately useful in xref:languages/dynamic.adoc#dynamic-language-scenarios[Scenarios].

framework-docs/modules/ROOT/pages/testing/testcontext-framework/tx.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ before-transaction method or after-transaction method runs at the appropriate ti
309309
Generally speaking, `@BeforeTransaction` and `@AfterTransaction` methods must not accept
310310
any arguments.
311311
312-
However, as of Spring Framework 6.1, for tests using the
312+
However, for tests using the
313313
xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-extension[`SpringExtension`]
314314
with JUnit Jupiter, `@BeforeTransaction` and `@AfterTransaction` methods may optionally
315315
accept arguments which will be resolved by any registered JUnit `ParameterResolver`

framework-docs/modules/ROOT/pages/web/webmvc/mvc-servlet/multipart.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
`MultipartResolver` from the `org.springframework.web.multipart` package is a strategy
77
for parsing multipart requests including file uploads. There is a container-based
88
`StandardServletMultipartResolver` implementation for Servlet multipart request parsing.
9-
Note that the outdated `CommonsMultipartResolver` based on Apache Commons FileUpload is
10-
not available anymore, as of Spring Framework 6.0 with its new Servlet 5.0+ baseline.
119

1210
To enable multipart handling, you need to declare a `MultipartResolver` bean in your
1311
`DispatcherServlet` Spring configuration with a name of `multipartResolver`.

spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
/**
3131
* Objenesis-based extension of {@link CglibAopProxy} to create proxy instances
32-
* without invoking the constructor of the class. Used by default as of Spring 4.
32+
* without invoking the constructor of the class. Used by default.
3333
*
3434
* @author Oliver Gierke
3535
* @author Juergen Hoeller

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
5757
* A name can specify a prefix to match by ending with "*", for example, "myBean,tx*"
5858
* will match the bean named "myBean" and all beans whose name start with "tx".
5959
* <p><b>NOTE:</b> In case of a FactoryBean, only the objects created by the
60-
* FactoryBean will get proxied. This default behavior applies as of Spring 2.0.
61-
* If you intend to proxy a FactoryBean instance itself (a rare use case, but
62-
* Spring 1.2's default behavior), specify the bean name of the FactoryBean
60+
* FactoryBean will get proxied. If you intend to proxy a FactoryBean instance
61+
* itself (a rare use case), specify the bean name of the FactoryBean
6362
* including the factory-bean prefix "&amp;": for example, "&amp;myFactoryBean".
6463
* @see org.springframework.beans.factory.FactoryBean
6564
* @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX

spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
* meaningful validation. All exposed Commons Pool properties use the
4747
* corresponding Commons Pool defaults.
4848
*
49-
* <p>Compatible with Apache Commons Pool 2.4, as of Spring 4.2.
50-
*
5149
* @author Rod Johnson
5250
* @author Rob Harrop
5351
* @author Juergen Hoeller

0 commit comments

Comments
 (0)