mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.0.x' into 3.1.x
Closes gh-37405
This commit is contained in:
commit
5910b3c0d6
@ -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");
|
* 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.
|
||||||
@ -23,7 +23,6 @@ import java.net.URISyntaxException;
|
|||||||
* Provides access to build output locations in a build system and IDE agnostic manner.
|
* Provides access to build output locations in a build system and IDE agnostic manner.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 2.2.0
|
|
||||||
*/
|
*/
|
||||||
public class BuildOutput {
|
public class BuildOutput {
|
||||||
|
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* Annotation used to exclude entries from the classpath.
|
* Annotation used to exclude entries from the classpath.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 1.5.0
|
|
||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* Annotation used to override entries on the classpath.
|
* Annotation used to override entries on the classpath.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 1.5.0
|
|
||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -30,7 +30,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* {@link ClassPathOverrides} are needed, but just a copy of the classpath.
|
* {@link ClassPathOverrides} are needed, but just a copy of the classpath.
|
||||||
*
|
*
|
||||||
* @author Christoph Dreis
|
* @author Christoph Dreis
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* architecture check.
|
* architecture check.
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
* @since 2.5.11
|
|
||||||
*/
|
*/
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* Disables test execution if a process is unavailable.
|
* Disables test execution if a process is unavailable.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 3.1.0
|
|
||||||
*/
|
*/
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* Repeatable container for {@link DisabledIfProcessUnavailable}.
|
* Repeatable container for {@link DisabledIfProcessUnavailable}.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 3.1.0
|
|
||||||
*/
|
*/
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -23,7 +23,6 @@ package org.springframework.boot.testsupport.system;
|
|||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 2.2.0
|
|
||||||
*/
|
*/
|
||||||
public interface CapturedOutput extends CharSequence {
|
public interface CapturedOutput extends CharSequence {
|
||||||
|
|
||||||
|
@ -62,7 +62,6 @@ import org.junit.jupiter.api.extension.ParameterResolver;
|
|||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @author Sam Brannen
|
* @author Sam Brannen
|
||||||
* @since 2.2.0
|
|
||||||
* @see CapturedOutput
|
* @see CapturedOutput
|
||||||
*/
|
*/
|
||||||
public class OutputCaptureExtension
|
public class OutputCaptureExtension
|
||||||
|
@ -22,7 +22,6 @@ import org.testcontainers.containers.GenericContainer;
|
|||||||
* A {@link GenericContainer} for ActiveMQ.
|
* A {@link GenericContainer} for ActiveMQ.
|
||||||
*
|
*
|
||||||
* @author Stephane Nicoll
|
* @author Stephane Nicoll
|
||||||
* @since 3.1.0
|
|
||||||
*/
|
*/
|
||||||
public class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
|
public class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
|
||||||
|
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -23,7 +23,6 @@ import java.time.Duration;
|
|||||||
* heavily contended environments such as CI.
|
* heavily contended environments such as CI.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 2.4.10
|
|
||||||
*/
|
*/
|
||||||
public class CassandraContainer extends org.testcontainers.containers.CassandraContainer<CassandraContainer> {
|
public class CassandraContainer extends org.testcontainers.containers.CassandraContainer<CassandraContainer> {
|
||||||
|
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 2.3.0
|
|
||||||
*/
|
*/
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@ -24,7 +24,6 @@ import org.testcontainers.utility.DockerImageName;
|
|||||||
* @author Stephane Nicoll
|
* @author Stephane Nicoll
|
||||||
* @author Eddú Meléndez
|
* @author Eddú Meléndez
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
* @since 2.3.6
|
|
||||||
*/
|
*/
|
||||||
public final class DockerImageNames {
|
public final class DockerImageNames {
|
||||||
|
|
||||||
@ -198,7 +197,6 @@ public final class DockerImageNames {
|
|||||||
/**
|
/**
|
||||||
* Return a {@link DockerImageName} suitable for running a Docker registry.
|
* Return a {@link DockerImageName} suitable for running a Docker registry.
|
||||||
* @return a docker image name for running a registry
|
* @return a docker image name for running a registry
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
*/
|
||||||
public static DockerImageName registry() {
|
public static DockerImageName registry() {
|
||||||
return DockerImageName.parse("registry").withTag(REGISTRY_VERSION);
|
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 {@link DockerImageName} suitable for running Zipkin.
|
||||||
* @return a docker image name for running Zipkin
|
* @return a docker image name for running Zipkin
|
||||||
* @since 3.1.0
|
|
||||||
*/
|
*/
|
||||||
public static DockerImageName zipkin() {
|
public static DockerImageName zipkin() {
|
||||||
return DockerImageName.parse("openzipkin/zipkin").withTag(ZIPKIN_VERSION);
|
return DockerImageName.parse("openzipkin/zipkin").withTag(ZIPKIN_VERSION);
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -23,7 +23,6 @@ import org.testcontainers.containers.GenericContainer;
|
|||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
* @since 2.0.0
|
|
||||||
*/
|
*/
|
||||||
public class RedisContainer extends GenericContainer<RedisContainer> {
|
public class RedisContainer extends GenericContainer<RedisContainer> {
|
||||||
|
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|||||||
* Indicates that a test pollutes URL factories.
|
* Indicates that a test pollutes URL factories.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 2.6.14
|
|
||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -29,7 +29,6 @@ import jakarta.servlet.ServletResponse;
|
|||||||
* Simple example Filter used for testing.
|
* Simple example Filter used for testing.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 2.0.0
|
|
||||||
*/
|
*/
|
||||||
public class ExampleFilter implements Filter {
|
public class ExampleFilter implements Filter {
|
||||||
|
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -30,7 +30,6 @@ import org.springframework.util.StreamUtils;
|
|||||||
* Simple example Servlet used for testing.
|
* Simple example Servlet used for testing.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 2.0.0
|
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class ExampleServlet extends GenericServlet {
|
public class ExampleServlet extends GenericServlet {
|
||||||
|
@ -46,7 +46,6 @@ import static org.mockito.Mockito.mock;
|
|||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
* @since 2.0.0
|
|
||||||
*/
|
*/
|
||||||
public abstract class MockServletWebServer {
|
public abstract class MockServletWebServer {
|
||||||
|
|
||||||
|
@ -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");
|
* 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.
|
||||||
@ -29,7 +29,6 @@ import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
|
|||||||
* Annotation to downgrade to Servlet 5.0.
|
* Annotation to downgrade to Servlet 5.0.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 3.0.0
|
|
||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
Loading…
Reference in New Issue
Block a user