Merge branch '3.0.x' into 3.1.x

Closes gh-37405

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/BuildOutput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -23,7 +23,6 @@ import java.net.URISyntaxException;
  * Provides access to build output locations in a build system and IDE agnostic manner.
  *
  * @author Andy Wilkinson
- * @since 2.2.0
  */
 public class BuildOutput {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ClassPathExclusions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * Annotation used to exclude entries from the classpath.
  *
  * @author Andy Wilkinson
- * @since 1.5.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ClassPathOverrides.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * Annotation used to override entries on the classpath.
  *
  * @author Andy Wilkinson
- * @since 1.5.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ForkedClassPath.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * {@link ClassPathOverrides} are needed, but just a copy of the classpath.
  *
  * @author Christoph Dreis
- * @since 2.4.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOs.java

@@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * architecture check.
  *
  * @author Moritz Halbritter
- * @since 2.5.11
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailable.java

@@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * Disables test execution if a process is unavailable.
  *
  * @author Phillip Webb
- * @since 3.1.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailables.java

@@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * Repeatable container for {@link DisabledIfProcessUnavailable}.
  *
  * @author Phillip Webb
- * @since 3.1.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/CapturedOutput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -23,7 +23,6 @@ package org.springframework.boot.testsupport.system;
  * @author Madhura Bhave
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @since 2.2.0
  */
 public interface CapturedOutput extends CharSequence {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java

@@ -62,7 +62,6 @@ import org.junit.jupiter.api.extension.ParameterResolver;
  * @author Phillip Webb
  * @author Andy Wilkinson
  * @author Sam Brannen
- * @since 2.2.0
  * @see CapturedOutput
  */
 public class OutputCaptureExtension

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/ActiveMQContainer.java

@@ -22,7 +22,6 @@ import org.testcontainers.containers.GenericContainer;
  * A {@link GenericContainer} for ActiveMQ.
  *
  * @author Stephane Nicoll
- * @since 3.1.0
  */
 public class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -23,7 +23,6 @@ import java.time.Duration;
  * heavily contended environments such as CI.
  *
  * @author Andy Wilkinson
- * @since 2.4.10
  */
 public class CassandraContainer extends org.testcontainers.containers.CassandraContainer<CassandraContainer> {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DisabledIfDockerUnavailable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.3.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java

@@ -24,7 +24,6 @@ import org.testcontainers.utility.DockerImageName;
  * @author Stephane Nicoll
  * @author Eddú Meléndez
  * @author Moritz Halbritter
- * @since 2.3.6
  */
 public final class DockerImageNames {
 
@@ -198,7 +197,6 @@ public final class DockerImageNames {
 	/**
 	 * Return a {@link DockerImageName} suitable for running a Docker registry.
 	 * @return a docker image name for running a registry
-	 * @since 2.4.0
 	 */
 	public static DockerImageName registry() {
 		return DockerImageName.parse("registry").withTag(REGISTRY_VERSION);
@@ -207,7 +205,6 @@ public final class DockerImageNames {
 	/**
 	 * Return a {@link DockerImageName} suitable for running Zipkin.
 	 * @return a docker image name for running Zipkin
-	 * @since 3.1.0
 	 */
 	public static DockerImageName zipkin() {
 		return DockerImageName.parse("openzipkin/zipkin").withTag(ZIPKIN_VERSION);

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -23,7 +23,6 @@ import org.testcontainers.containers.GenericContainer;
  *
  * @author Andy Wilkinson
  * @author Madhura Bhave
- * @since 2.0.0
  */
 public class RedisContainer extends GenericContainer<RedisContainer> {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/DirtiesUrlFactories.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  * Indicates that a test pollutes URL factories.
  *
  * @author Phillip Webb
- * @since 2.6.14
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/ExampleFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -29,7 +29,6 @@ import jakarta.servlet.ServletResponse;
  * Simple example Filter used for testing.
  *
  * @author Phillip Webb
- * @since 2.0.0
  */
 public class ExampleFilter implements Filter {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/ExampleServlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -30,7 +30,6 @@ import org.springframework.util.StreamUtils;
  * Simple example Servlet used for testing.
  *
  * @author Phillip Webb
- * @since 2.0.0
  */
 @SuppressWarnings("serial")
 public class ExampleServlet extends GenericServlet {

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServer.java

@@ -46,7 +46,6 @@ import static org.mockito.Mockito.mock;
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @since 2.0.0
  */
 public abstract class MockServletWebServer {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/Servlet5ClassPathOverrides.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -29,7 +29,6 @@ import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
  * Annotation to downgrade to Servlet 5.0.
  *
  * @author Phillip Webb
- * @since 3.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })