Merge branch '3.1.x' into 3.2.x

hyk001 · May 2, 2024 · 75dac14 · 75dac14
2 parents 516d3b1 + 68a63a7
commit 75dac14
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...est/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactorySupportTests.java b/...est/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactorySupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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/...-loader-tools/src/main/java/org/springframework/boot/loader/tools/NativeImageArgFile.java b/...-loader-tools/src/main/java/org/springframework/boot/loader/tools/NativeImageArgFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -27,7 +27,7 @@
  * Class to work with the native-image argfile.
  *
  * @author Moritz Halbritter
- * @author Phil Webb
+ * @author Phillip Webb
  * @since 3.0.0
  */
 public final class NativeImageArgFile {

diff --git a/...g-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/JarUriTests.java b/...g-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/JarUriTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -21,7 +21,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * @author pwebb
+ * Tests for {@link JarUri}.
+ *
+ * @author Phillip Webb
  */
 class JarUriTests {