diff --git a/framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc b/framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc index 4a01901853c1..b69cac9f570a 100644 --- a/framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc +++ b/framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc @@ -87,14 +87,12 @@ A crucial difference between Spring pooling and SLSB pooling is that Spring pool be applied to any POJO. As with Spring in general, this service can be applied in a non-invasive way. -Spring provides support for Commons Pool 2.2, which provides a +Spring provides support for Commons Pool 2, which provides a fairly efficient pooling implementation. You need the `commons-pool` Jar on your application's classpath to use this feature. You can also subclass `org.springframework.aop.target.AbstractPoolingTargetSource` to support any other pooling API. -NOTE: Commons Pool 1.5+ is also supported but is deprecated as of Spring Framework 4.2. - The following listing shows an example configuration: [source,xml,indent=0,subs="verbatim,quotes"] diff --git a/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc b/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc index 612a3c23229c..e4e546684489 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc @@ -1045,10 +1045,10 @@ methods anywhere. However, regular `@Bean` methods in `@Configuration` classes n to be overridable -- that is, they must not be declared as `private` or `final`. `@Bean` methods are also discovered on base classes of a given component or -configuration class, as well as on Java 8 default methods declared in interfaces +configuration class, as well as on Java default methods declared in interfaces implemented by the component or configuration class. This allows for a lot of flexibility in composing complex configuration arrangements, with even multiple -inheritance being possible through Java 8 default methods as of Spring 4.2. +inheritance being possible through Java default methods. Finally, a single class may hold multiple `@Bean` methods for the same bean, as an arrangement of multiple factory methods to use depending on available diff --git a/framework-docs/modules/ROOT/pages/core/beans/definition.adoc b/framework-docs/modules/ROOT/pages/core/beans/definition.adoc index ed7df447d09f..c010f46148c2 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/definition.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/definition.adoc @@ -99,7 +99,7 @@ the `@Bean` factory method in favor of any pre-declared constructor on the bean **** NOTE: We acknowledge that overriding beans in test scenarios is convenient, and there is -explicit support for this as of Spring Framework 6.2. Please refer to +explicit support for this. Please refer to xref:testing/testcontext-framework/bean-overriding.adoc[this section] for more details. diff --git a/framework-docs/modules/ROOT/pages/core/beans/java/composing-configuration-classes.adoc b/framework-docs/modules/ROOT/pages/core/beans/java/composing-configuration-classes.adoc index 6b99094ad0ea..f00c8711a6a4 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/java/composing-configuration-classes.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/java/composing-configuration-classes.adoc @@ -327,9 +327,8 @@ Kotlin:: ---- ====== -TIP: Constructor injection in `@Configuration` classes is only supported as of Spring -Framework 4.3. Note also that there is no need to specify `@Autowired` if the target -bean defines only one constructor. +TIP: Note that there is no need to specify `@Autowired` if the target bean defines +only one constructor. [discrete] [[beans-java-injecting-imported-beans-fq]] diff --git a/framework-docs/modules/ROOT/pages/languages/dynamic.adoc b/framework-docs/modules/ROOT/pages/languages/dynamic.adoc index 7afe1d3d0558..fd43782cea0b 100644 --- a/framework-docs/modules/ROOT/pages/languages/dynamic.adoc +++ b/framework-docs/modules/ROOT/pages/languages/dynamic.adoc @@ -9,8 +9,7 @@ objects. Spring's scripting support primarily targets Groovy and BeanShell. Beyond those specifically supported languages, the JSR-223 scripting mechanism is supported -for integration with any JSR-223 capable language provider (as of Spring 4.2), -for example, JRuby. +for integration with any JSR-223 capable language provider, for example, JRuby. You can find fully working examples of where this dynamic language support can be immediately useful in xref:languages/dynamic.adoc#dynamic-language-scenarios[Scenarios]. diff --git a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/tx.adoc b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/tx.adoc index e1e03b504644..935da475f255 100644 --- a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/tx.adoc +++ b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/tx.adoc @@ -309,7 +309,7 @@ before-transaction method or after-transaction method runs at the appropriate ti Generally speaking, `@BeforeTransaction` and `@AfterTransaction` methods must not accept any arguments. -However, as of Spring Framework 6.1, for tests using the +However, for tests using the xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-extension[`SpringExtension`] with JUnit Jupiter, `@BeforeTransaction` and `@AfterTransaction` methods may optionally accept arguments which will be resolved by any registered JUnit `ParameterResolver` diff --git a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-servlet/multipart.adoc b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-servlet/multipart.adoc index 75dbbb1919b3..cdf564f281d8 100644 --- a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-servlet/multipart.adoc +++ b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-servlet/multipart.adoc @@ -6,8 +6,6 @@ `MultipartResolver` from the `org.springframework.web.multipart` package is a strategy for parsing multipart requests including file uploads. There is a container-based `StandardServletMultipartResolver` implementation for Servlet multipart request parsing. -Note that the outdated `CommonsMultipartResolver` based on Apache Commons FileUpload is -not available anymore, as of Spring Framework 6.0 with its new Servlet 5.0+ baseline. To enable multipart handling, you need to declare a `MultipartResolver` bean in your `DispatcherServlet` Spring configuration with a name of `multipartResolver`. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java index 0ff9bbc732f8..c516dac616ef 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java @@ -29,7 +29,7 @@ /** * Objenesis-based extension of {@link CglibAopProxy} to create proxy instances - * without invoking the constructor of the class. Used by default as of Spring 4. + * without invoking the constructor of the class. Used by default. * * @author Oliver Gierke * @author Juergen Hoeller diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java index 002418c4fba1..426c37dd77a5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java @@ -57,9 +57,8 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator { * A name can specify a prefix to match by ending with "*", for example, "myBean,tx*" * will match the bean named "myBean" and all beans whose name start with "tx". *

NOTE: In case of a FactoryBean, only the objects created by the - * FactoryBean will get proxied. This default behavior applies as of Spring 2.0. - * If you intend to proxy a FactoryBean instance itself (a rare use case, but - * Spring 1.2's default behavior), specify the bean name of the FactoryBean + * FactoryBean will get proxied. If you intend to proxy a FactoryBean instance + * itself (a rare use case), specify the bean name of the FactoryBean * including the factory-bean prefix "&": for example, "&myFactoryBean". * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX diff --git a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java index 6d4b8b0d93e1..6654b080f9bf 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java @@ -46,8 +46,6 @@ * meaningful validation. All exposed Commons Pool properties use the * corresponding Commons Pool defaults. * - *

Compatible with Apache Commons Pool 2.4, as of Spring 4.2. - * * @author Rod Johnson * @author Rob Harrop * @author Juergen Hoeller diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java index 098ca8dd802a..36ac6c02b606 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java @@ -81,7 +81,7 @@ public interface BeanPostProcessor { * or a custom init-method). The bean will already be populated with property values. * The returned bean instance may be a wrapper around the original. *

In case of a FactoryBean, this callback will be invoked for both the FactoryBean - * instance and the objects created by the FactoryBean (as of Spring 2.0). The + * instance and the objects created by the FactoryBean. The * post-processor can decide whether to apply to either the FactoryBean or created * objects or both through corresponding {@code bean instanceof FactoryBean} checks. *

This callback will also be invoked after a short-circuiting triggered by a diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java index a156999802d9..f53577834ac9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java @@ -33,7 +33,7 @@ * registration of custom {@link PropertyEditor property editors}. * *

In case you want to register {@link PropertyEditor} instances, - * the recommended usage as of Spring 2.0 is to use custom + * the recommended usage is to use custom * {@link PropertyEditorRegistrar} implementations that in turn register any * desired editor instances on a given * {@link org.springframework.beans.PropertyEditorRegistry registry}. Each diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java index 882290de403b..f25ce93707e7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java @@ -65,7 +65,7 @@ * Note that the value of "foo" in the first document is not simply replaced * with the value in the second, but its nested values are merged. * - *

Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1. + *

Requires SnakeYAML 2.0 or higher. * * @author Dave Syer * @author Juergen Hoeller diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index 99c0d87ef9dc..13648d824aad 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -50,7 +50,7 @@ /** * Base class for YAML factories. * - *

Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1. + *

Requires SnakeYAML 2.0 or higher. * * @author Dave Syer * @author Juergen Hoeller diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.java index a0a4107c84f7..8eb30cce9da0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.java @@ -75,7 +75,7 @@ * servers[1]=foo.bar.com * * - *

Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1. + *

Requires SnakeYAML 2.0 or higher. * * @author Dave Syer * @author Stephane Nicoll diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 20510109a408..e010d1483f65 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -254,9 +254,8 @@ public boolean isAllowCircularReferences() { *

This will only be used as a last resort in case of a circular reference * that cannot be resolved otherwise: essentially, preferring a raw instance * getting injected over a failure of the entire bean wiring process. - *

Default is "false", as of Spring 2.0. Turn this on to allow for non-wrapped - * raw beans injected into some of your references, which was Spring 1.2's - * (arguably unclean) default behavior. + *

Default is "false". Turn this on to allow for non-wrapped + * raw beans injected into some of your references. *

NOTE: It is generally recommended to not rely on circular references * between your beans, in particular with auto-proxying involved. * @see #setAllowCircularReferences diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd index 27b7b3434714..3c3e00c14f24 100644 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd @@ -330,7 +330,7 @@ list or are supposed to be matched generically by type. Note: A single generic argument value will just be used once, rather than - potentially matched multiple times (as of Spring 1.1). + potentially matched multiple times. constructor-arg elements are also used in conjunction with the factory-method element to construct beans using static or instance factory methods. diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd index a27c3e9f80e2..a04ccbd5a670 100644 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd @@ -567,7 +567,7 @@ argument list or are supposed to be matched generically by type. Note: A single generic argument value will just be used once, rather - than potentially matched multiple times (as of Spring 1.1). + than potentially matched multiple times. constructor-arg elements are also used in conjunction with the factory-method element to construct beans using static or instance diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index aedbc4874190..4ab5ced5b1bc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java @@ -195,7 +195,7 @@ void testFindsBeansOfTypeWithDefaultFactory() { assertThat(beans.get("t2")).isEqualTo(t2); assertThat(beans.get("t3")).isEqualTo(t3.getObject()); assertThat(beans.get("t4")).isInstanceOf(TestBean.class); - // t3 and t4 are found here as of Spring 2.0, since they are pre-registered + // t3 and t4 are found here, since they are pre-registered // singleton instances, while testFactory1 and testFactory are *not* found // because they are FactoryBean definitions that haven't been initialized yet. diff --git a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java index f8190a73ac34..33f77e58ed5c 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java +++ b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCache.java @@ -36,7 +36,7 @@ * operations through Caffeine's {@link AsyncCache}, when provided via the * {@link #CaffeineCache(String, AsyncCache, boolean)} constructor. * - *

Requires Caffeine 3.0 or higher, as of Spring Framework 6.1. + *

Requires Caffeine 3.0 or higher. * * @author Ben Manes * @author Juergen Hoeller diff --git a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java index 2625f1a455b8..15cf8e9e7721 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java +++ b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java @@ -53,7 +53,7 @@ * {@link AsyncCache}, when configured via {@link #setAsyncCacheMode}, * with early-determined cache misses. * - *

Requires Caffeine 3.0 or higher, as of Spring Framework 6.1. + *

Requires Caffeine 3.0 or higher. * * @author Ben Manes * @author Juergen Hoeller diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java index 6074f23e7fe2..020649a2b239 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java @@ -34,8 +34,6 @@ * {@link org.springframework.cache.Cache} implementation on top of a * {@link Cache javax.cache.Cache} instance. * - *

Note: This class has been updated for JCache 1.0, as of Spring 4.0. - * * @author Juergen Hoeller * @author Stephane Nicoll * @since 3.2 diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java index f9f79c2bf80c..f5d0a9ee2ec9 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java @@ -32,8 +32,6 @@ * {@link org.springframework.cache.CacheManager} implementation * backed by a JCache {@link CacheManager javax.cache.CacheManager}. * - *

Note: This class has been updated for JCache 1.0, as of Spring 4.0. - * * @author Juergen Hoeller * @author Stephane Nicoll * @since 3.2 diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java index 7da84a54cb77..ffa2767e6f87 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java @@ -34,8 +34,6 @@ * obtaining a pre-defined {@code CacheManager} by name through the standard * JCache {@link Caching javax.cache.Caching} class. * - *

Note: This class has been updated for JCache 1.0, as of Spring 4.0. - * * @author Juergen Hoeller * @since 3.2 * @see javax.cache.Caching#getCachingProvider() diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java index b91db3658e82..1248b464e7a7 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java @@ -28,7 +28,7 @@ * {@link JobFactory} implementation that supports {@link java.lang.Runnable} * objects as well as standard Quartz {@link org.quartz.Job} instances. * - *

Compatible with Quartz 2.1.4 and higher, as of Spring 4.1. + *

Compatible with Quartz 2.1.4 and higher. * * @author Juergen Hoeller * @since 2.0 diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java index 05bb23e2c964..ee233e7425c1 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java @@ -65,7 +65,7 @@ * You need to implement your own Quartz Job as a thin wrapper for each case * where you want a persistent job to delegate to a specific service method. * - *

Compatible with Quartz 2.1.4 and higher, as of Spring 4.1. + *

Compatible with Quartz 2.1.4 and higher. * * @author Juergen Hoeller * @author Alef Arendsen diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java index dbf2627b631f..71c449b6048e 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java @@ -51,7 +51,7 @@ *

For concrete usage, check out the {@link SchedulerFactoryBean} and * {@link SchedulerAccessorBean} classes. * - *

Compatible with Quartz 2.1.4 and higher, as of Spring 4.1. + *

Compatible with Quartz 2.1.4 and higher. * * @author Juergen Hoeller * @author Stephane Nicoll diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java index 1286619df205..74b610569ee7 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java @@ -31,7 +31,7 @@ * Spring bean-style class for accessing a Quartz Scheduler, i.e. for registering jobs, * triggers and listeners on a given {@link org.quartz.Scheduler} instance. * - *

Compatible with Quartz 2.1.4 and higher, as of Spring 4.1. + *

Compatible with Quartz 2.1.4 and higher. * * @author Juergen Hoeller * @since 2.5.6 diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java index 69c19d04a6d5..b9168297859b 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java @@ -80,7 +80,7 @@ * automatically apply to Scheduler operations performed within those scopes. * Alternatively, you may add transactional advice for the Scheduler itself. * - *

Compatible with Quartz 2.1.4 and higher, as of Spring 4.1. + *

Compatible with Quartz 2.1.4 and higher. * * @author Juergen Hoeller * @since 18.02.2004 @@ -446,8 +446,7 @@ public void setStartupDelay(int startupDelay) { * Scheduler is usually exclusively intended for access within the Spring context. *

Switch this flag to "true" in order to expose the Scheduler globally. * This is not recommended unless you have an existing Spring application that - * relies on this behavior. Note that such global exposure was the accidental - * default in earlier Spring versions; this has been fixed as of Spring 2.5.6. + * relies on this behavior. */ public void setExposeSchedulerInRepository(boolean exposeSchedulerInRepository) { this.exposeSchedulerInRepository = exposeSchedulerInRepository; diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java index e0cf70708033..0a913734682c 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java @@ -36,7 +36,7 @@ * as bean property values. If no matching bean property is found, the entry * is by default simply ignored. This is analogous to QuartzJobBean's behavior. * - *

Compatible with Quartz 2.1.4 and higher, as of Spring 4.1. + *

Compatible with Quartz 2.1.4 and higher. * * @author Juergen Hoeller * @since 2.0 diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java index fbc1b285a5ff..03d4d2967897 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java @@ -151,9 +151,8 @@ public void setFileEncodings(Properties fileEncodings) { * locked in a refresh attempt for a specific cached properties file whereas * other threads keep returning the old properties for the time being, until * the refresh attempt has completed. - *

Default is "true": this behavior is new as of Spring Framework 4.1, - * minimizing contention between threads. If you prefer the old behavior, - * i.e. to fully block on refresh, switch this flag to "false". + *

Default is "true", minimizing contention between threads. If you prefer + * the old behavior, i.e. to fully block on refresh, switch this flag to "false". * @since 4.1 * @see #setCacheSeconds */ diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/InstantFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/InstantFormatter.java index 805670ecb83a..ba719512227c 100644 --- a/spring-context/src/main/java/org/springframework/format/datetime/standard/InstantFormatter.java +++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/InstantFormatter.java @@ -28,7 +28,7 @@ * following JSR-310's parsing rules for an Instant (that is, not using a * configurable {@link java.time.format.DateTimeFormatter}): accepting the * default {@code ISO_INSTANT} format as well as {@code RFC_1123_DATE_TIME} - * (which is commonly used for HTTP date header values), as of Spring 4.3. + * (which is commonly used for HTTP date header values). * * @author Juergen Hoeller * @author Andrei Nevedomskii diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java index 75483393e963..61f43dbedf16 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java @@ -35,7 +35,7 @@ * Thanks to Ales Justin and Marius Bogoevici for the initial prototype. * *

This weaver supports WildFly 13-23 (DelegatingClassFileTransformer) as well as - * WildFly 24+ (DelegatingClassTransformer), as of Spring Framework 6.1.15. + * WildFly 24+ (DelegatingClassTransformer). * * @author Costin Leau * @author Juergen Hoeller diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd index 9b8327ab4512..6e900e54a1a2 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd @@ -95,13 +95,6 @@ "local properties", if any, and against the Spring Environment's current set of PropertySources. - Note that as of Spring 3.1 the system-properties-mode attribute has been removed in - favor of the more flexible PropertySources mechanism. However, applications may - continue to use the 3.0 (and older) versions of the spring-context schema in order - to preserve system-properties-mode behavior. In this case, the traditional - PropertyPlaceholderConfigurer component will be registered instead of the newer - PropertySourcesPlaceholderConfigurer. - See ConfigurableEnvironment javadoc for more information on usage. ]]> diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd index 0660beec2583..50bf142fabcf 100644 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd +++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd @@ -35,9 +35,8 @@ Specifies the java.util.Executor instance to use when invoking asynchronous methods. If not provided, an instance of org.springframework.core.task.SimpleAsyncTaskExecutor will be used by default. - Note that as of Spring 3.1.2, individual @Async methods may qualify which executor to - use, meaning that the executor specified here acts as a default for all non-qualified - @Async methods. + Note that individual @Async methods may qualify which executor to use, meaning that + the executor specified here acts as a default for all non-qualified @Async methods. ]]> @@ -144,7 +143,7 @@ required even when defining the executor as an inner bean: The executor won't be directly accessible then but will nevertheless use the specified id as the thread name prefix of the threads that it manages. - In the case of multiple task:executors, as of Spring 3.1.2 this value may be used to + In the case of multiple task:executors, this value may be used to qualify which executor should handle a given @Async method, for example, @Async("executorId"). See the Javadoc for the #value attribute of Spring's @Async annotation for details. ]]> diff --git a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java index 40dc9ca1394f..8c6635a014c1 100644 --- a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java +++ b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java @@ -31,7 +31,7 @@ public final class SpringAsmInfo { /** * The ASM compatibility version for Spring's ASM visitor implementations: - * currently {@link Opcodes#ASM10_EXPERIMENTAL}, as of Spring Framework 5.3. + * currently {@link Opcodes#ASM10_EXPERIMENTAL}. */ public static final int ASM_VERSION = Opcodes.ASM10_EXPERIMENTAL; diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java b/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java index 1e0d67db875e..7f6c8bf07235 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java @@ -40,7 +40,7 @@ /** * Convenience methods for working with the StAX API. Partly historic due to JAXP 1.3 - * compatibility; as of Spring 4.0, relying on JAXP 1.4 as included in JDK 1.6 and higher. + * compatibility; relying on JAXP 1.4 as included in JDK 1.6 and higher. * *

In particular, methods for using StAX ({@code javax.xml.stream}) in combination with * the TrAX API ({@code javax.xml.transform}), and converting StAX readers/writers into SAX diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java index 2d375cc6dcd0..a4232b03a36e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java @@ -214,8 +214,8 @@ public boolean isPrimitivesDefaultedForNullValue() { /** * Set a {@link ConversionService} for binding JDBC values to bean properties, * or {@code null} for none. - *

Default is a {@link DefaultConversionService}, as of Spring 4.3. This - * provides support for {@code java.time} conversion and other special types. + *

Default is a {@link DefaultConversionService}. This provides support for + * {@code java.time} conversion and other special types. * @since 4.3 * @see #initBeanWrapper(BeanWrapper) */ diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index b76b07c7139c..fac97fb201d9 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -78,8 +78,8 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { public HibernateJpaVendorAdapter() { this.persistenceProvider = new SpringHibernateJpaPersistenceProvider(); - this.entityManagerFactoryInterface = SessionFactory.class; // as of Spring 5.3 - this.entityManagerInterface = Session.class; // as of Spring 5.3 + this.entityManagerFactoryInterface = SessionFactory.class; + this.entityManagerInterface = Session.class; } diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java index 4b055ccf835c..fb8ce7b8ff31 100644 --- a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java +++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java @@ -22,12 +22,11 @@ * Strategy interface for loading an {@link ApplicationContext} for an integration * test managed by the Spring TestContext Framework. * - *

NOTE: as of Spring Framework 6.0, {@code ContextLoader} is - * effectively a marker interface and should not be implemented directly. Implement - * {@link SmartContextLoader} instead of this interface in order to provide support - * for annotated classes, active bean definition profiles, application context - * initializers, and various other features not supported by methods defined in - * the {@code ContextLoader} SPI. + *

NOTE: {@code ContextLoader} is a marker interface and should + * not be implemented directly. Implement {@link SmartContextLoader} instead of this + * interface in order to provide support for annotated classes, active bean definition + * profiles, application context initializers, and various other features not supported + * by methods defined in the {@code ContextLoader} SPI. * *

Clients of a {@code ContextLoader} should call * {@link #processLocations(Class, String...) processLocations()} prior to diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java index 0550a93c1ae2..3283166d48ae 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java @@ -57,7 +57,7 @@ * {@link SpringRunner}, {@link ContextConfiguration @ContextConfiguration}, * {@link TestExecutionListeners @TestExecutionListeners}, etc. *

  • If you wish to extend this class and use a runner other than the - * {@link SpringRunner}, as of Spring Framework 4.2 you can use + * {@link SpringRunner}, you can use * {@link org.springframework.test.context.junit4.rules.SpringClassRule SpringClassRule} and * {@link org.springframework.test.context.junit4.rules.SpringMethodRule SpringMethodRule} * and specify your runner of choice via {@link org.junit.runner.RunWith @RunWith(...)}.
    • diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java index 2860afe184e3..a9bea6dd5bed 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java @@ -29,7 +29,7 @@ * annotation. * *

    Generally speaking, {@code @AfterTransaction} methods must not accept any - * arguments. However, as of Spring Framework 6.1, for tests using the + * arguments. However, for tests using the * {@link org.springframework.test.context.junit.jupiter.SpringExtension SpringExtension} * with JUnit Jupiter, {@code @AfterTransaction} methods may optionally accept * arguments which will be resolved by any registered JUnit diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java index 68cf1a8327f6..60ee8c66f5c2 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java @@ -29,7 +29,7 @@ * annotation. * *

    Generally speaking, {@code @BeforeTransaction} methods must not accept any - * arguments. However, as of Spring Framework 6.1, for tests using the + * arguments. However, for tests using the * {@link org.springframework.test.context.junit.jupiter.SpringExtension SpringExtension} * with JUnit Jupiter, {@code @BeforeTransaction} methods may optionally accept * arguments which will be resolved by any registered JUnit diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index b139b85f11ad..e239933cc790 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -303,7 +303,7 @@ public final boolean isGlobalRollbackOnParticipationFailure() { * outermost transaction boundary. Switch this flag on to cause an * UnexpectedRollbackException as early as the global rollback-only marker * has been first detected, even from within an inner transaction boundary. - *

    Note that, as of Spring 2.0, the fail-early behavior for global + *

    Note that the fail-early behavior for global * rollback-only markers has been unified: All transaction managers will by * default only cause UnexpectedRollbackException at the outermost transaction * boundary. This allows, for example, to continue unit tests even after an diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java index 0f5b8c4bf406..65e0b19144e9 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java @@ -54,7 +54,7 @@ *

    Allows to use a pre-configured {@link HttpClient} instance - * potentially with authentication, HTTP connection pooling, etc. * - *

    NOTE: Requires Apache HttpComponents 5.1 or higher, as of Spring 6.0. + *

    NOTE: Requires Apache HttpComponents 5.1 or higher. * * @author Oleg Kalnichevski * @author Arjen Poutsma diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java index d29d3a5c3be4..82e4b3abacdb 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java @@ -57,7 +57,7 @@ * The {@code "application/json"} format is also supported with the {@code "com.google.protobuf:protobuf-java-util"} * dependency. See {@link ProtobufJsonFormatHttpMessageConverter} for a configurable variant. * - *

    This converter requires Protobuf 3 or higher as of Spring Framework 6.1. + *

    This converter requires Protobuf 3 or higher. * * @author Alex Antonov * @author Brian Clozel diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java index d5bd2a621a0e..1a826b772b90 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java @@ -40,7 +40,7 @@ * callbacks, consider defining a Spring {@link RequestContextListener} in your * {@code web.xml}. * - *

    Requires JSF 2.0 or higher, as of Spring 4.0. + *

    Requires JSF 2.0 or higher. * * @author Juergen Hoeller * @since 2.5.2 diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java index 3333584690a3..b94855690898 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java @@ -30,7 +30,7 @@ /** * {@link WebRequest} adapter for a JSF {@link jakarta.faces.context.FacesContext}. * - *

    Requires JSF 2.0 or higher, as of Spring 4.0. + *

    Requires JSF 2.0 or higher. * * @author Juergen Hoeller * @since 2.5.2 diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java index e8e7eaf27e52..8cf8a3321e28 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -392,7 +392,7 @@ public boolean isDefaultHtmlEscape() { /** * Is HTML escaping using the response encoding by default? * If enabled, only XML markup significant characters will be escaped with UTF-* encodings. - *

    Falls back to {@code true} in case of no explicit default given, as of Spring 4.2. + *

    Falls back to {@code true} in case of no explicit default given. * @since 4.1.2 */ public boolean isResponseEncodedHtmlEscape() { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java index d1d6991bfadb..ef0be52e0e55 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java @@ -86,11 +86,11 @@ * {@code "text/html;charset=UTF-8"}. When using {@link FreeMarkerViewResolver} * to create the view for you, set the * {@linkplain FreeMarkerViewResolver#setContentType(String) content type} - * directly in the {@code FreeMarkerViewResolver}; however, as of Spring Framework - * 6.2, it is no longer necessary to explicitly set the content type in the - * {@code FreeMarkerViewResolver} if you have set an explicit encoding via either - * {@link #setEncoding(String)}, {@link FreeMarkerConfigurer#setDefaultEncoding(String)}, - * or {@link Configuration#setDefaultEncoding(String)}. + * directly in the {@code FreeMarkerViewResolver}; however, it is not necessary to + * explicitly set the content type in the {@code FreeMarkerViewResolver} if you have + * set an explicit encoding via either {@link #setEncoding(String)}, + * {@link FreeMarkerConfigurer#setDefaultEncoding(String)}, or + * {@link Configuration#setDefaultEncoding(String)}. * *

    Note: Spring's FreeMarker support requires FreeMarker 2.3.33 or higher. * diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java index 06fddec88be2..40a0b114da1e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java @@ -36,10 +36,9 @@ *

    Note: To ensure that the correct encoding is used when the rendering * the response, set the {@linkplain #setContentType(String) content type} with an * appropriate {@code charset} attribute — for example, - * {@code "text/html;charset=UTF-8"}; however, as of Spring Framework 6.2, it is - * no longer strictly necessary to explicitly set the content type in the - * {@code FreeMarkerViewResolver} if you have set an explicit encoding via either - * {@link FreeMarkerView#setEncoding(String)}, + * {@code "text/html;charset=UTF-8"}; however, it is not necessary to explicitly set + * the content type in the {@code FreeMarkerViewResolver} if you have set an explicit + * encoding via either {@link FreeMarkerView#setEncoding(String)}, * {@link FreeMarkerConfigurer#setDefaultEncoding(String)}, or * {@link Configuration#setDefaultEncoding(String)}. *