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 1d9732a043..ea482766d7 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 @@ -64,7 +64,7 @@ import org.springframework.lang.Nullable; * 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.0. + *

Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1. * * @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 8c858d8a7b..ddfb781f4a 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 @@ import org.springframework.util.StringUtils; /** * Base class for YAML factories. * - *

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

Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1. * * @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 48d0e2a4f6..0c70f097d7 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 @@ -74,7 +74,7 @@ import org.springframework.lang.Nullable; * servers[1]=foo.bar.com * * - *

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

Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1. * * @author Dave Syer * @author Stephane Nicoll diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/event/JUnit4ApplicationEventsAsyncIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/event/JUnit4ApplicationEventsAsyncIntegrationTests.java index 1fc6564167..2922671e2f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/event/JUnit4ApplicationEventsAsyncIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/event/JUnit4ApplicationEventsAsyncIntegrationTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; * or assert the events from a separate thread, in conjunction with JUnit 4. * * @author Simon Baslé - * @since 6.1.0 + * @since 6.1 */ @RunWith(SpringRunner.class) @RecordApplicationEvents diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsAsyncIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsAsyncIntegrationTests.java index 67a75c3229..3d2eb0171e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsAsyncIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsAsyncIntegrationTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * or assert the events from a separate thread, in conjunction with TestNG. * * @author Simon Baslé - * @since 6.1.0 + * @since 6.1 */ @RecordApplicationEvents class TestNGApplicationEventsAsyncIntegrationTests extends AbstractTestNGSpringContextTests { diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java index 8e0bb6d22d..b53457e8a2 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java @@ -48,9 +48,9 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder; * * @author Brian Clozel * @since 6.0 - * @deprecated since 6.1.0 in favor of {@link WebHttpHandlerBuilder}. + * @deprecated since 6.1 in favor of {@link WebHttpHandlerBuilder}. */ -@Deprecated(since = "6.1.0", forRemoval = true) +@Deprecated(since = "6.1", forRemoval = true) public class ServerHttpObservationFilter implements WebFilter { /**