Merge branch '2.3.x' into 2.4.x

spring-projects · Jan 12, 2021 · a6a7c06 · a6a7c06
2 parents b6cb9c0 + 9da0bd8
commit a6a7c06
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/...t/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/...t/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.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/...radle-plugin/src/test/java/com/example/bootjar/classpath/BootJarClasspathApplication.java b/...radle-plugin/src/test/java/com/example/bootjar/classpath/BootJarClasspathApplication.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/...radle-plugin/src/test/java/com/example/bootrun/classpath/BootRunClasspathApplication.java b/...radle-plugin/src/test/java/com/example/bootrun/classpath/BootRunClasspathApplication.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/...ot-gradle-plugin/src/test/java/com/example/bootrun/jvmargs/BootRunJvmArgsApplication.java b/...ot-gradle-plugin/src/test/java/com/example/bootrun/jvmargs/BootRunJvmArgsApplication.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/...src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java b/...src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.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/...ugin/src/test/java/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests.java b/...ugin/src/test/java/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests.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/...main/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessor.java b/...main/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessor.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/main/java/org/springframework/boot/env/ConfigTreePropertySource.java b/...ject/spring-boot/src/main/java/org/springframework/boot/env/ConfigTreePropertySource.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/...spring-boot/src/test/java/org/springframework/boot/env/ConfigTreePropertySourceTests.java b/...spring-boot/src/test/java/org/springframework/boot/env/ConfigTreePropertySourceTests.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.