Merge branch '2.3.x' into 2.4.x

spring-projects · Feb 2, 2021 · 230b4ab · 230b4ab
2 parents 331c7b7 + 630d216
commit 230b4ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java b/.../spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.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/...src/main/java/org/springframework/boot/context/properties/bind/IndexedElementsBinder.java b/...src/main/java/org/springframework/boot/context/properties/bind/IndexedElementsBinder.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.