root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Consistent use of 6.1 as generational version number

This commit is contained in:
Juergen Hoeller 2023-06-14 21:58:45 +02:00
parent f00a8cb3a3
commit c276e5b679
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ import org.springframework.lang.Nullable;
* Note that the value of "foo" in the first document is not simply replaced * 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. * with the value in the second, but its nested values are merged.
* *
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.0. * <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.
* *
* @author Dave Syer * @author Dave Syer
* @author Juergen Hoeller * @author Juergen Hoeller

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

@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
/** /**
* Base class for YAML factories. * Base class for YAML factories.
* *
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.0. * <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.
* *
* @author Dave Syer * @author Dave Syer
* @author Juergen Hoeller * @author Juergen Hoeller

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

@ -74,7 +74,7 @@ import org.springframework.lang.Nullable;
* servers[1]=foo.bar.com * servers[1]=foo.bar.com
* </pre> * </pre>
* *
* <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.0. * <p>Requires SnakeYAML 2.0 or higher, as of Spring Framework 6.1.
* *
* @author Dave Syer * @author Dave Syer
* @author Stephane Nicoll * @author Stephane Nicoll

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

@ -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. * or assert the events from a separate thread, in conjunction with JUnit 4.
* *
* @author Simon Baslé * @author Simon Baslé
* @since 6.1.0 * @since 6.1
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@RecordApplicationEvents @RecordApplicationEvents

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

@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* or assert the events from a separate thread, in conjunction with TestNG. * or assert the events from a separate thread, in conjunction with TestNG.
* *
* @author Simon Baslé * @author Simon Baslé
* @since 6.1.0 * @since 6.1
*/ */
@RecordApplicationEvents @RecordApplicationEvents
class TestNGApplicationEventsAsyncIntegrationTests extends AbstractTestNGSpringContextTests { class TestNGApplicationEventsAsyncIntegrationTests extends AbstractTestNGSpringContextTests {

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

@ -48,9 +48,9 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
* *
* @author Brian Clozel * @author Brian Clozel
* @since 6.0 * @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 { public class ServerHttpObservationFilter implements WebFilter {
/** /**