Skip to content

Commit c276e5b

Browse files
committed
Consistent use of 6.1 as generational version number
1 parent f00a8cb commit c276e5b

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* Note that the value of "foo" in the first document is not simply replaced
6565
* with the value in the second, but its nested values are merged.
6666
*
67-
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.0.
67+
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.
6868
*
6969
* @author Dave Syer
7070
* @author Juergen Hoeller

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
/**
5151
* Base class for YAML factories.
5252
*
53-
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.0.
53+
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.
5454
*
5555
* @author Dave Syer
5656
* @author Juergen Hoeller

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
* servers[1]=foo.bar.com
7575
* </pre>
7676
*
77-
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.0.
77+
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.
7878
*
7979
* @author Dave Syer
8080
* @author Stephane Nicoll

spring-test/src/test/java/org/springframework/test/context/junit4/event/JUnit4ApplicationEventsAsyncIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* or assert the events from a separate thread, in conjunction with JUnit 4.
4040
*
4141
* @author Simon Baslé
42-
* @since 6.1.0
42+
* @since 6.1
4343
*/
4444
@RunWith(SpringRunner.class)
4545
@RecordApplicationEvents

spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsAsyncIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* or assert the events from a separate thread, in conjunction with TestNG.
3737
*
3838
* @author Simon Baslé
39-
* @since 6.1.0
39+
* @since 6.1
4040
*/
4141
@RecordApplicationEvents
4242
class TestNGApplicationEventsAsyncIntegrationTests extends AbstractTestNGSpringContextTests {

spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
*
4949
* @author Brian Clozel
5050
* @since 6.0
51-
* @deprecated since 6.1.0 in favor of {@link WebHttpHandlerBuilder}.
51+
* @deprecated since 6.1 in favor of {@link WebHttpHandlerBuilder}.
5252
*/
53-
@Deprecated(since = "6.1.0", forRemoval = true)
53+
@Deprecated(since = "6.1", forRemoval = true)
5454
public class ServerHttpObservationFilter implements WebFilter {
5555

5656
/**

0 commit comments

Comments
 (0)