Browse Source

Merge branch '3.5.x'

Closes gh-46544
pull/46550/head
Stéphane Nicoll 5 months ago
parent
commit
8827e29aec
  1. 3
      config/checkstyle/checkstyle.xml
  2. 2
      core/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferedStartupStep.java
  3. 2
      core/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferingApplicationStartup.java
  4. 2
      core/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/StartupTimeline.java
  5. 2
      core/spring-boot/src/main/java/org/springframework/boot/context/properties/ConstructorBound.java
  6. 2
      core/spring-boot/src/main/java/org/springframework/boot/convert/PeriodStyle.java
  7. 2
      core/spring-boot/src/main/java/org/springframework/boot/convert/PeriodToStringConverter.java
  8. 2
      documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/graphql/runtimewiring/GreetingController.java
  9. 2
      module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/AbstractMongoContainerConnectionDetailsFactory.java
  10. 2
      module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/MongoDbAtlasLocalContainerConnectionDetailsFactory.java

3
config/checkstyle/checkstyle.xml

@ -7,6 +7,9 @@
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/> <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
</module> </module>
<module name="io.spring.javaformat.checkstyle.SpringChecks" /> <module name="io.spring.javaformat.checkstyle.SpringChecks" />
<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
<property name="headerCopyrightPattern" value="2012-present" />
</module>
<module name="com.puppycrawl.tools.checkstyle.TreeWalker"> <module name="com.puppycrawl.tools.checkstyle.TreeWalker">
<module name="io.spring.javaformat.checkstyle.check.SpringDeprecatedCheck" /> <module name="io.spring.javaformat.checkstyle.check.SpringDeprecatedCheck" />
<module name="io.spring.javaformat.checkstyle.check.SpringJUnit5Check" /> <module name="io.spring.javaformat.checkstyle.check.SpringJUnit5Check" />

2
core/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferedStartupStep.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
core/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/BufferingApplicationStartup.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
core/spring-boot/src/main/java/org/springframework/boot/context/metrics/buffering/StartupTimeline.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
core/spring-boot/src/main/java/org/springframework/boot/context/properties/ConstructorBound.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2019-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
core/spring-boot/src/main/java/org/springframework/boot/convert/PeriodStyle.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
core/spring-boot/src/main/java/org/springframework/boot/convert/PeriodToStringConverter.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/graphql/runtimewiring/GreetingController.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-present the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/AbstractMongoContainerConnectionDetailsFactory.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2025 the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/testcontainers/MongoDbAtlasLocalContainerConnectionDetailsFactory.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2025 the original author or authors. * Copyright 2012-present the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

Loading…
Cancel
Save