Browse Source

Merge branch '6.0.x'

pull/30593/head
Sam Brannen 3 years ago
parent
commit
75466fee8d
  1. 1
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
  2. 2
      spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java
  3. 2
      spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
  4. 2
      spring-test/src/main/java/org/springframework/test/context/util/TestContextFailureHandler.java

1
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@ -131,6 +131,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { @@ -131,6 +131,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
}
@Test
@SuppressWarnings("rawtypes")
void resourceInjectionWithNullBean() {
RootBeanDefinition bd = new RootBeanDefinition(NonPublicResourceInjectionBean.class);
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);

2
spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-test/src/main/java/org/springframework/test/context/util/TestContextFailureHandler.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

Loading…
Cancel
Save