Merge branch '3.3.x' into 3.4.x

spring-projects · Jan 8, 2025 · d44f4b5 · d44f4b5
2 parents 8829cac + c2d8218
commit d44f4b5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCli.java b/...-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCli.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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/...-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java b/...-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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/...ose/src/test/java/org/springframework/boot/docker/compose/core/DockerCliCommandTests.java b/...ose/src/test/java/org/springframework/boot/docker/compose/core/DockerCliCommandTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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/...n/java/org/springframework/boot/testsupport/logging/ConfigureClasspathToPreferLog4j2.java b/...n/java/org/springframework/boot/testsupport/logging/ConfigureClasspathToPreferLog4j2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 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/...c/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java b/...c/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.