Merge branch '2.4.x'

spring-projects · Jun 9, 2021 · f798f26 · f798f26
2 parents 703eaa7 + 4d62e47
commit f798f26
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 27 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/DocumentPluginGoals.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/DocumentPluginGoals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...in/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java b/...in/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/.../springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java b/.../springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...amework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java b/...amework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...gframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java b/...gframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...res/testing/springbootapplications/additionalautoconfigurationandslicing/MyJdbcTests.java b/...res/testing/springbootapplications/additionalautoconfigurationandslicing/MyJdbcTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...ingbootapplications/autoconfiguredspringrestdocs/withmockmvc/MyRestDocsConfiguration.java b/...ingbootapplications/autoconfiguredspringrestdocs/withmockmvc/MyRestDocsConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...otapplications/autoconfiguredspringrestdocs/withmockmvc/MyResultHandlerConfiguration.java b/...otapplications/autoconfiguredspringrestdocs/withmockmvc/MyResultHandlerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...res/testing/springbootapplications/autoconfiguredwebservices/MyWebServiceClientTests.java b/...res/testing/springbootapplications/autoconfiguredwebservices/MyWebServiceClientTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/.../boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Request.java b/.../boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Response.java b/...boot/docs/features/testing/springbootapplications/autoconfiguredwebservices/Response.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...ocs/features/testing/springbootapplications/autoconfiguredwebservices/SomeWebService.java b/...ocs/features/testing/springbootapplications/autoconfiguredwebservices/SomeWebService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...cs/features/testing/springbootapplications/userconfigurationandslicing/MyApplication.java b/...cs/features/testing/springbootapplications/userconfigurationandslicing/MyApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...ures/testing/springbootapplications/userconfigurationandslicing/MyBatchConfiguration.java b/...ures/testing/springbootapplications/userconfigurationandslicing/MyBatchConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...atures/testing/springbootapplications/userconfigurationandslicing/MyWebConfiguration.java b/...atures/testing/springbootapplications/userconfigurationandslicing/MyWebConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...atures/testing/springbootapplications/userconfigurationandslicing/MyWebMvcConfigurer.java b/...atures/testing/springbootapplications/userconfigurationandslicing/MyWebMvcConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...atures/testing/springbootapplications/userconfigurationandslicing/scan/MyApplication.java b/...atures/testing/springbootapplications/userconfigurationandslicing/scan/MyApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/.../intTest/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java b/.../intTest/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...ot/src/main/java/org/springframework/boot/LazyInitializationBeanFactoryPostProcessor.java b/...ot/src/main/java/org/springframework/boot/LazyInitializationBeanFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLoader.java b/...-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...oot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java b/...oot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...rg/springframework/boot/context/config/ConfigFileApplicationListenerLegacyReproTests.java b/...rg/springframework/boot/context/config/ConfigFileApplicationListenerLegacyReproTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/...test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...ject/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java b/...ject/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...pring-boot/src/test/java/org/springframework/boot/env/RandomValuePropertySourceTests.java b/...pring-boot/src/test/java/org/springframework/boot/env/RandomValuePropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...ke-test-actuator/src/test/java/smoketest/actuator/CorsSampleActuatorApplicationTests.java b/...ke-test-actuator/src/test/java/smoketest/actuator/CorsSampleActuatorApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.

diff --git a/...g-boot-smoke-test-flyway/src/test/java/smoketest/flyway/SampleFlywayApplicationTests.java b/...g-boot-smoke-test-flyway/src/test/java/smoketest/flyway/SampleFlywayApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.