Skip to content

Commit 932ce04

Browse files
committed
Stop referring to old Spring versions in Javadoc
1 parent e427ac2 commit 932ce04

File tree

26 files changed

+100
-107
lines changed

26 files changed

+100
-107
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,18 +54,17 @@
5454
*
5555
* <h3>Autowired Parameters</h3>
5656
* <p>Although {@code @Autowired} can technically be declared on individual method
57-
* or constructor parameters since Spring Framework 5.0, most parts of the
58-
* framework ignore such declarations. The only part of the core Spring Framework
59-
* that actively supports autowired parameters is the JUnit Jupiter support in
60-
* the {@code spring-test} module (see the
57+
* or constructor parameters, most parts of the framework ignore such declarations.
58+
* The only part of the core Spring Framework that actively supports autowired
59+
* parameters is the JUnit Jupiter support in the {@code spring-test} module (see the
6160
* <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/testing.html#testcontext-junit-jupiter-di">TestContext framework</a>
6261
* reference documentation for details).
6362
*
6463
* <h3>Multiple Arguments and 'required' Semantics</h3>
6564
* <p>In the case of a multi-arg constructor or method, the {@link #required} attribute
6665
* is applicable to all arguments. Individual parameters may be declared as Java-8 style
67-
* {@link java.util.Optional} or, as of Spring Framework 5.0, also as {@code @Nullable}
68-
* or a not-null parameter type in Kotlin, overriding the base 'required' semantics.
66+
* {@link java.util.Optional} as well as {@code @Nullable} or a not-null parameter
67+
* type in Kotlin, overriding the base 'required' semantics.
6968
*
7069
* <h3>Autowiring Arrays, Collections, and Maps</h3>
7170
* <p>In case of an array, {@link java.util.Collection}, or {@link java.util.Map}

spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
224224
* on JVM shutdown unless it has already been closed at that time.
225225
* <p>This method can be called multiple times. Only one shutdown hook
226226
* (at max) will be registered for each context instance.
227-
* <p>As of Spring Framework 5.2, the {@linkplain Thread#getName() name} of
228-
* the shutdown hook thread should be {@link #SHUTDOWN_HOOK_THREAD_NAME}.
227+
* <p>The {@linkplain Thread#getName() name} of the shutdown hook thread
228+
* should be {@link #SHUTDOWN_HOOK_THREAD_NAME}.
229229
* @see java.lang.Runtime#addShutdownHook
230230
* @see #close()
231231
*/

spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
3030
* {@link LoadTimeWeaver} implementation for GlassFish's
3131
* {@code org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}.
3232
*
33-
* <p>As of Spring Framework 5.0, this weaver supports GlassFish 4+.
33+
* <p>This weaver supports GlassFish 4+.
3434
*
3535
* @author Costin Leau
3636
* @author Juergen Hoeller

spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@
3131
* {@link LoadTimeWeaver} implementation for JBoss's instrumentable ClassLoader.
3232
* Thanks to Ales Justin and Marius Bogoevici for the initial prototype.
3333
*
34-
* <p>As of Spring Framework 5.0, this weaver supports WildFly 8+.
35-
* As of Spring Framework 5.1.5, it also supports WildFly 13+.
34+
* <p>This weaver supports WildFly 13+.
3635
*
3736
* @author Costin Leau
3837
* @author Juergen Hoeller

spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -295,8 +295,8 @@ public void addTriggerTask(TriggerTask task) {
295295

296296
/**
297297
* Add a {@link Runnable} task to be triggered per the given cron {@code expression}.
298-
* <p>As of Spring Framework 5.2, this method will not register the task if the
299-
* {@code expression} is equal to {@link #CRON_DISABLED}.
298+
* <p>This method will not register the task if the {@code expression} is
299+
* equal to {@link #CRON_DISABLED}.
300300
*/
301301
public void addCronTask(Runnable task, String expression) {
302302
if (!CRON_DISABLED.equals(expression)) {

spring-context/src/main/java/org/springframework/validation/DataBinder.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,10 @@ public String[] getAllowedFields() {
549549
* well as direct equality.
550550
* <p>The default implementation of this method stores disallowed field patterns
551551
* in {@linkplain PropertyAccessorUtils#canonicalPropertyName(String) canonical}
552-
* form. As of Spring Framework 5.2.21, the default implementation also transforms
553-
* disallowed field patterns to {@linkplain String#toLowerCase() lowercase} to
554-
* support case-insensitive pattern matching in {@link #isAllowed}. Subclasses
555-
* which override this method must therefore take both of these transformations
556-
* into account.
552+
* form and also transforms disallowed field patterns to
553+
* {@linkplain String#toLowerCase() lowercase} to support case-insensitive
554+
* pattern matching in {@link #isAllowed}. Subclasses which override this
555+
* method must therefore take both of these transformations into account.
557556
* <p>More sophisticated matching can be implemented by overriding the
558557
* {@link #isAllowed} method.
559558
* <p>Alternatively, specify a list of <i>allowed</i> field patterns.

spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
* at the type level of the containing target class, applying to all public service methods
7070
* of that class. By default, JSR-303 will validate against its default group only.
7171
*
72-
* <p>As of Spring 5.0, this functionality requires a Bean Validation 1.1+ provider.
72+
* <p>This functionality requires a Bean Validation 1.1+ provider.
7373
*
7474
* @author Juergen Hoeller
7575
* @author Rossen Stoyanchev

spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@
6060
* inline constraint annotations. Validation groups can be specified through {@code @Validated}
6161
* as well. By default, JSR-303 will validate against its default group only.
6262
*
63-
* <p>As of Spring 5.0, this functionality requires a Bean Validation 1.1+ provider.
63+
* <p>This functionality requires a Bean Validation 1.1+ provider.
6464
*
6565
* @author Juergen Hoeller
6666
* @since 3.1

spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
* {@link CustomValidatorBean} and {@link LocalValidatorFactoryBean},
5656
* and as the primary implementation of the {@link SmartValidator} interface.
5757
*
58-
* <p>As of Spring Framework 5.0, this adapter is fully compatible with
59-
* Bean Validation 1.1 as well as 2.0.
58+
* <p>This adapter is fully compatible with Bean Validation 1.1 as well as 2.0.
6059
*
6160
* @author Juergen Hoeller
6261
* @author Sam Brannen

spring-core/src/main/java/org/springframework/core/SpringVersion.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
2525
* <p>Note that some ClassLoaders do not expose the package metadata,
2626
* hence this class might not be able to determine the Spring version
2727
* in all environments. Consider using a reflection-based check instead &mdash;
28-
* for example, checking for the presence of a specific Spring 5.2
29-
* method that you intend to call.
28+
* for example, checking for the presence of a specific Spring method that you
29+
* intend to call.
3030
*
3131
* @author Juergen Hoeller
3232
* @since 1.1

spring-core/src/main/java/org/springframework/core/env/Profiles.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -62,10 +62,9 @@ public interface Profiles {
6262
* without using parentheses. For example, {@code "a & b | c"} is not a valid
6363
* expression: it must be expressed as {@code "(a & b) | c"} or
6464
* {@code "a & (b | c)"}.
65-
* <p>As of Spring Framework 5.1.17, two {@code Profiles} instances returned
66-
* by this method are considered equivalent to each other (in terms of
67-
* {@code equals()} and {@code hashCode()} semantics) if they are created
68-
* with identical <em>profile expressions</em>.
65+
* <p>Two {@code Profiles} instances returned by this method are considered
66+
* equivalent to each other (in terms of {@code equals()} and {@code hashCode()}
67+
* semantics) if they are created with identical <em>profile expressions</em>.
6968
* @param profileExpressions the <em>profile expressions</em> to include
7069
* @return a new {@link Profiles} instance
7170
*/

spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,10 +45,10 @@
4545
* Supports resolution as a {@code File} and also as a {@code URL}.
4646
* Implements the extended {@link WritableResource} interface.
4747
*
48-
* <p>Note: As of Spring Framework 5.0, this {@link Resource} implementation uses
49-
* NIO.2 API for read/write interactions. As of 5.1, it may be constructed with a
50-
* {@link java.nio.file.Path} handle in which case it will perform all file system
51-
* interactions via NIO.2, only resorting to {@link File} on {@link #getFile()}.
48+
* <p>Note: This {@link Resource} implementation uses NIO.2 API for read/write
49+
* interactions and may be constructed with a {@link java.nio.file.Path} handle
50+
* in which case it will perform all file system interactions via NIO.2, only
51+
* resorting to {@link File} on {@link #getFile()}.
5252
*
5353
* @author Juergen Hoeller
5454
* @author Sam Brannen

spring-core/src/main/java/org/springframework/util/StopWatch.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,10 +37,10 @@
3737
* <p>This class is normally used to verify performance during proof-of-concept
3838
* work and in development, rather than as part of production applications.
3939
*
40-
* <p>As of Spring Framework 5.2, running time is tracked and reported in
41-
* nanoseconds. As of 6.1, the default time unit for String renderings is
42-
* seconds with decimal points in nanosecond precision. Custom renderings with
43-
* specific time units can be requested through {@link #prettyPrint(TimeUnit)}.
40+
* <p>Running time is tracked and reported in nanoseconds. As of Spring Framework
41+
* 6.1, the default time unit for String renderings is seconds with decimal points
42+
* in nanosecond precision. Custom renderings with specific time units can be
43+
* requested through {@link #prettyPrint(TimeUnit)}.
4444
*
4545
* @author Rod Johnson
4646
* @author Juergen Hoeller

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,10 +36,10 @@ public abstract class DatabasePopulatorUtils {
3636

3737
/**
3838
* Execute the given {@link DatabasePopulator} against the given {@link DataSource}.
39-
* <p>As of Spring Framework 5.3.11, the {@link Connection} for the supplied
40-
* {@code DataSource} will be {@linkplain Connection#commit() committed} if
41-
* it is not configured for {@link Connection#getAutoCommit() auto-commit} and
42-
* is not {@linkplain DataSourceUtils#isConnectionTransactional transactional}.
39+
* <p>The {@link Connection} for the supplied {@code DataSource} will be
40+
* {@linkplain Connection#commit() committed} if it is not configured for
41+
* {@link Connection#getAutoCommit() auto-commit} and is not
42+
* {@linkplain DataSourceUtils#isConnectionTransactional transactional}.
4343
* @param populator the {@code DatabasePopulator} to execute
4444
* @param dataSource the {@code DataSource} to execute against
4545
* @throws DataAccessException if an error occurs, specifically a {@link ScriptException}

spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@
5454
* "useNewConnection" property to false. In this case you <i>MUST</i> use a non-transactional
5555
* storage engine like MYISAM when defining the incrementer table.
5656
*
57-
* <p>As of Spring Framework 5.3.7, {@code MySQLMaxValueIncrementer} is compatible with
57+
* <p>Note that {@code MySQLMaxValueIncrementer} is compatible with
5858
* <a href="https://dev.mysql.com/doc/refman/8.0/en/mysql-tips.html#safe-updates">MySQL safe updates mode</a>.
5959
*
6060
* @author Jean-Pierre Pawlak
@@ -104,7 +104,7 @@ public MySQLMaxValueIncrementer(DataSource dataSource, String incrementerName, S
104104
* {@code false} is sufficient if the storage engine of the sequence table
105105
* is non-transactional (like MYISAM), avoiding the effort of acquiring an
106106
* extra {@code Connection} for the increment operation.
107-
* <p>Default is {@code true} since Spring Framework 5.0.
107+
* <p>Default is {@code true}.
108108
* @since 4.3.6
109109
* @see DataSource#getConnection()
110110
*/

spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -114,9 +114,9 @@
114114

115115
/**
116116
* The name for the durable subscription, if any.
117-
* <p>As of Spring Framework 5.3.26, if an explicit subscription name is not
118-
* specified, a default subscription name will be generated based on the fully
119-
* qualified name of the annotated listener method &mdash; for example,
117+
* <p>If an explicit subscription name is not specified, a default subscription
118+
* name will be generated based on the fully qualified name of the annotated
119+
* listener method &mdash; for example,
120120
* {@code "org.example.jms.ProductListener.processRequest"} for a
121121
* {@code processRequest(...)} listener method in the
122122
* {@code org.example.jms.ProductListener} class.

spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
4343
* are provided as additional arguments so that these can be injected as
4444
* method arguments if necessary.
4545
*
46-
* <p>As of Spring Framework 5.3.26, {@code MessagingMessageListenerAdapter} implements
46+
* <p>Note that {@code MessagingMessageListenerAdapter} implements
4747
* {@link SubscriptionNameProvider} in order to provide a meaningful default
4848
* subscription name. See {@link #getSubscriptionName()} for details.
4949
*

spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ protected final SessionFactory obtainSessionFactory() {
189189

190190
/**
191191
* Set the JDBC DataSource that this instance should manage transactions for.
192-
* The DataSource should match the one used by the Hibernate SessionFactory:
192+
* <p>The DataSource should match the one used by the Hibernate SessionFactory:
193193
* for example, you could specify the same JNDI DataSource for both.
194194
* <p>If the SessionFactory was configured with LocalDataSourceConnectionProvider,
195195
* i.e. by Spring's LocalSessionFactoryBean with a specified "dataSource",
196-
* the DataSource will be auto-detected: You can still explicitly specify the
196+
* the DataSource will be auto-detected. You can still explicitly specify the
197197
* DataSource, but you don't need to in this case.
198198
* <p>A transactional JDBC Connection for this DataSource will be provided to
199199
* application code accessing this DataSource directly via DataSourceUtils
@@ -210,7 +210,7 @@ protected final SessionFactory obtainSessionFactory() {
210210
* for the actual target DataSource. Alternatively, consider switching
211211
* {@link #setPrepareConnection "prepareConnection"} to {@code false}.</b>
212212
* In both cases, this transaction manager will not eagerly acquire a
213-
* JDBC Connection for each Hibernate Session anymore (as of Spring 5.1).
213+
* JDBC Connection for each Hibernate Session.
214214
* @see #setAutodetectDataSource
215215
* @see TransactionAwareDataSourceProxy
216216
* @see org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy

spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -109,9 +109,7 @@
109109
* Therefore, it has limited namespace support. As such, it is rather unsuitable for
110110
* usage within Web Services.
111111
*
112-
* <p>This marshaller requires XStream 1.4.7 or higher, as of Spring 5.2.17.
113-
* Note that {@link XStream} construction has been reworked in 4.0, with the
114-
* stream driver and the class loader getting passed into XStream itself now.
112+
* <p>This marshaller requires XStream 1.4.7 or higher.
115113
*
116114
* <p>As of Spring Framework 6.0, the default {@link HierarchicalStreamDriver} is
117115
* a {@link DomDriver} that uses the configured {@linkplain #setEncoding(String)
@@ -641,11 +639,10 @@ protected void customizeXStream(XStream xstream) {
641639

642640
/**
643641
* Return the native XStream delegate used by this marshaller.
644-
* <p><b>NOTE: This method has been marked as final as of Spring 4.0.</b>
645-
* It can be used to access the fully configured XStream for marshalling
646-
* but not configuration purposes anymore.
647-
* <p>As of Spring Framework 5.1.16, creation of the {@link XStream} instance
648-
* returned by this method is thread safe.
642+
* <p>The creation of the {@link XStream} instance returned by this method is
643+
* thread safe.
644+
* <p><b>NOTE: This method is marked as final.</b> It can be used to access
645+
* the fully configured XStream for marshalling but not configuration purposes.
649646
*/
650647
public final XStream getXStream() {
651648
return this.xstream.obtain();

spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* <em>Spring TestContext Framework</em>.
3030
*
3131
* <p>This annotation may also be used as a <em>meta-annotation</em> to create
32-
* custom <em>composed annotations</em>. As of Spring Framework 5.1, a locally
32+
* custom <em>composed annotations</em>. Note, however, that a locally
3333
* declared {@code @BootstrapWith} annotation (i.e., one that is <em>directly
3434
* present</em> on the current test class) will override any meta-present
3535
* declarations of {@code @BootstrapWith}.

spring-test/src/main/java/org/springframework/test/context/TestConstructor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
* <p>This annotation may be used as a <em>meta-annotation</em> to create custom
4747
* <em>composed annotations</em>.
4848
*
49-
* <p>As of Spring Framework 5.2, this annotation is only supported in conjunction
50-
* with the {@link org.springframework.test.context.junit.jupiter.SpringExtension
49+
* <p>This annotation is only supported in conjunction with the
50+
* {@link org.springframework.test.context.junit.jupiter.SpringExtension
5151
* SpringExtension} for use with JUnit Jupiter. Note that the {@code SpringExtension} is
5252
* often automatically registered for you &mdash; for example, when using annotations such as
5353
* {@link org.springframework.test.context.junit.jupiter.SpringJUnitConfig @SpringJUnitConfig} and

0 commit comments

Comments
 (0)