Browse Source

Merge branch '3.2.x'

pull/40617/head
Moritz Halbritter 2 years ago
parent
commit
d3e49747b0
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactorySupportTests.java
  2. 4
      spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/NativeImageArgFile.java
  3. 6
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/JarUriTests.java

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactorySupportTests.java

@ -1,5 +1,5 @@ @@ -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.

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/NativeImageArgFile.java

@ -1,5 +1,5 @@ @@ -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 @@ import org.springframework.util.function.ThrowingConsumer; @@ -27,7 +27,7 @@ import org.springframework.util.function.ThrowingConsumer;
* 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 {

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/origin/JarUriTests.java

@ -1,5 +1,5 @@ @@ -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 org.junit.jupiter.api.Test; @@ -21,7 +21,9 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author pwebb
* Tests for {@link JarUri}.
*
* @author Phillip Webb
*/
class JarUriTests {

Loading…
Cancel
Save