Merge branch '1.5.x' into 2.0.x
This commit is contained in:
@@ -49,6 +49,7 @@ import javax.tools.StandardLocation;
|
||||
*
|
||||
* @author Madhura Bhave
|
||||
* @author Phillip Webb
|
||||
* @since 1.5.0
|
||||
*/
|
||||
@SupportedAnnotationTypes({ "org.springframework.context.annotation.Configuration",
|
||||
"org.springframework.boot.autoconfigure.condition.ConditionalOnClass",
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.util.List;
|
||||
* A raw view of a hint used for parsing only.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.3.0
|
||||
*/
|
||||
class ConfigurationMetadataHint {
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ package org.springframework.boot.configurationmetadata;
|
||||
* source.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.3.0
|
||||
*/
|
||||
class ConfigurationMetadataItem extends ConfigurationMetadataProperty {
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ import org.json.JSONObject;
|
||||
* Read standard json metadata format as {@link ConfigurationMetadataRepository}.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.3.0
|
||||
*/
|
||||
class JsonReader {
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.util.List;
|
||||
* A raw metadata structure. Used to initialize a {@link ConfigurationMetadataRepository}.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.3.0
|
||||
*/
|
||||
class RawConfigurationMetadata {
|
||||
|
||||
|
||||
@@ -40,7 +40,6 @@ import org.springframework.boot.configurationprocessor.fieldvalues.FieldValuesPa
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class TypeElementMembers {
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2018 the original author or authors.
|
||||
* Copyright 2012-2019 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.
|
||||
@@ -26,7 +26,6 @@ import javax.lang.model.type.TypeMirror;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class TypeExcludeFilter {
|
||||
|
||||
|
||||
@@ -40,7 +40,6 @@ import javax.lang.model.util.Types;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class TypeUtils {
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ import java.util.List;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class ExpressionTree extends ReflectionWrapper {
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
|
||||
* needing tools.jar on the classpath.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class ReflectionWrapper {
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@ import java.lang.reflect.Proxy;
|
||||
* Reflection based access to {@code com.sun.source.tree.Tree}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class Tree extends ReflectionWrapper {
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ package org.springframework.boot.configurationprocessor.fieldvalues.javac;
|
||||
* Reflection base alternative for {@code com.sun.source.tree.TreeVisitor}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
interface TreeVisitor {
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2018 the original author or authors.
|
||||
* Copyright 2012-2019 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.
|
||||
@@ -25,7 +25,6 @@ import javax.lang.model.element.Element;
|
||||
* Reflection based access to {@code com.sun.source.util.Trees}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
final class Trees extends ReflectionWrapper {
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ import javax.lang.model.element.Modifier;
|
||||
* Reflection based access to {@code com.sun.source.tree.VariableTree}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.2.0
|
||||
*/
|
||||
class VariableTree extends ReflectionWrapper {
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootWar;
|
||||
* @author Dave Syer
|
||||
* @author Andy Wilkinson
|
||||
* @author Danny Hyun
|
||||
* @since 1.2.7
|
||||
*/
|
||||
public class SpringBootPlugin implements Plugin<Project> {
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ import java.util.Properties;
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public final class BuildPropertiesWriter {
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import java.security.NoSuchAlgorithmException;
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public abstract class FileUtils {
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ import org.apache.commons.compress.archivers.zip.UnixStat;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class JarWriter implements LoaderClassesWriter, AutoCloseable {
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ package org.springframework.boot.loader.tools;
|
||||
* custom loader classes.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
* @see Layouts
|
||||
* @see RepackagingLayout
|
||||
* @see CustomLoaderLayout
|
||||
|
||||
@@ -23,6 +23,7 @@ import java.io.File;
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@FunctionalInterface
|
||||
public interface LayoutFactory {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2018 the original author or authors.
|
||||
* Copyright 2012-2019 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,6 +28,7 @@ import java.util.Map;
|
||||
* @author Phillip Webb
|
||||
* @author Dave Syer
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public final class Layouts {
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ import java.io.IOException;
|
||||
* Encapsulates information about libraries that may be packed into the archive.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@FunctionalInterface
|
||||
public interface Libraries {
|
||||
|
||||
@@ -23,6 +23,7 @@ import java.io.IOException;
|
||||
* Callback interface used to iterate {@link Libraries}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@FunctionalInterface
|
||||
public interface LibraryCallback {
|
||||
|
||||
@@ -22,6 +22,7 @@ package org.springframework.boot.loader.tools;
|
||||
* A custom {@link Layout} can handle additional scopes as required.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public interface LibraryScope {
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ import org.springframework.asm.Type;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public abstract class MainClassFinder {
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ import org.springframework.util.StringUtils;
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class Repackager {
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import org.springframework.boot.loader.archive.Archive;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public abstract class ExecutableArchiveLauncher extends Launcher {
|
||||
|
||||
|
||||
@@ -24,7 +24,8 @@ import org.springframework.boot.loader.archive.Archive;
|
||||
* included inside a {@code /BOOT-INF/classes} directory.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @author Andy Wilkinso
|
||||
* @since 1.0.0n
|
||||
*/
|
||||
public class JarLauncher extends ExecutableArchiveLauncher {
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ import org.springframework.boot.loader.jar.Handler;
|
||||
* @author Phillip Webb
|
||||
* @author Dave Syer
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class LaunchedURLClassLoader extends URLClassLoader {
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ import org.springframework.boot.loader.jar.JarFile;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Dave Syer
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public abstract class Launcher {
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ import java.lang.reflect.Method;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class MainMethodRunner {
|
||||
|
||||
|
||||
@@ -70,6 +70,7 @@ import org.springframework.boot.loader.util.SystemPropertyUtils;
|
||||
* @author Dave Syer
|
||||
* @author Janne Valkealahti
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class PropertiesLauncher extends Launcher {
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import org.springframework.boot.loader.archive.Archive;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class WarLauncher extends ExecutableArchiveLauncher {
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import org.springframework.boot.loader.Launcher;
|
||||
* An archive that can be launched by the {@link Launcher}.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
* @see JarFileArchive
|
||||
*/
|
||||
public interface Archive extends Iterable<Archive.Entry> {
|
||||
|
||||
@@ -39,6 +39,7 @@ import java.util.jar.Manifest;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class ExplodedArchive implements Archive {
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@ import org.springframework.boot.loader.jar.JarFile;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class JarFileArchive implements Archive {
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
||||
* Implementations must allow concurrent reads in a thread-safe manner.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public interface RandomAccessData {
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import java.io.RandomAccessFile;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class RandomAccessDataFile implements RandomAccessData {
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ import java.util.regex.Pattern;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
* @see JarFile#registerUrlProtocolHandler()
|
||||
*/
|
||||
public class Handler extends URLStreamHandler {
|
||||
|
||||
@@ -46,6 +46,7 @@ import org.springframework.boot.loader.data.RandomAccessDataFile;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class JarFile extends java.util.jar.JarFile {
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ import java.util.Set;
|
||||
* @author Juergen Hoeller
|
||||
* @author Rob Harrop
|
||||
* @author Dave Syer
|
||||
* @since 1.0.0
|
||||
* @see System#getProperty(String)
|
||||
*/
|
||||
public abstract class SystemPropertyUtils {
|
||||
|
||||
@@ -35,7 +35,7 @@ import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author David Turanski
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
|
||||
|
||||
@@ -43,7 +43,7 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
|
||||
* Collection of artifact definitions to include. The {@link Include} element defines
|
||||
* a {@code groupId} and {@code artifactId} mandatory properties and an optional
|
||||
* {@code classifier} property.
|
||||
* @since 1.2
|
||||
* @since 1.2.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.includes")
|
||||
private List<Include> includes;
|
||||
@@ -52,21 +52,21 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
|
||||
* Collection of artifact definitions to exclude. The {@link Exclude} element defines
|
||||
* a {@code groupId} and {@code artifactId} mandatory properties and an optional
|
||||
* {@code classifier} property.
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.excludes")
|
||||
private List<Exclude> excludes;
|
||||
|
||||
/**
|
||||
* Comma separated list of groupId names to exclude (exact match).
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.excludeGroupIds", defaultValue = "")
|
||||
private String excludeGroupIds;
|
||||
|
||||
/**
|
||||
* Comma separated list of artifact names to exclude (exact match).
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
* @deprecated as of 2.0.2 in favour of {@code excludes}
|
||||
*/
|
||||
@Parameter(property = "spring-boot.excludeArtifactIds", defaultValue = "")
|
||||
|
||||
@@ -46,6 +46,7 @@ import org.springframework.boot.loader.tools.MainClassFinder;
|
||||
* @author Stephane Nicoll
|
||||
* @author David Liu
|
||||
* @author Daniel Young
|
||||
* @since 1.3.0
|
||||
* @see RunMojo
|
||||
* @see StartMojo
|
||||
*/
|
||||
@@ -55,7 +56,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
|
||||
/**
|
||||
* The Maven project.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(defaultValue = "${project}", readonly = true, required = true)
|
||||
private MavenProject project;
|
||||
@@ -66,7 +67,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
* them to appear twice if {@code ClassLoader.getResources()} is called. Please
|
||||
* consider adding {@code spring-boot-devtools} to your project instead as it provides
|
||||
* this feature and many more.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.addResources", defaultValue = "false")
|
||||
private boolean addResources = false;
|
||||
@@ -74,14 +75,14 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* Path to agent jar. NOTE: the use of agents means that processes will be started by
|
||||
* forking a new JVM.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.agent")
|
||||
private File[] agent;
|
||||
|
||||
/**
|
||||
* Flag to say that the agent requires -noverify.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.noverify")
|
||||
private boolean noverify = false;
|
||||
@@ -90,7 +91,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
* Current working directory to use for the application. If not specified, basedir
|
||||
* will be used. NOTE: the use of working directory means that processes will be
|
||||
* started by forking a new JVM.
|
||||
* @since 1.5
|
||||
* @since 1.5.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.workingDirectory")
|
||||
private File workingDirectory;
|
||||
@@ -100,7 +101,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
* application. On command line, make sure to wrap multiple values between quotes.
|
||||
* NOTE: the use of JVM arguments means that processes will be started by forking a
|
||||
* new JVM.
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.jvmArguments")
|
||||
private String jvmArguments;
|
||||
@@ -108,7 +109,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* Arguments that should be passed to the application. On command line use commas to
|
||||
* separate multiple arguments.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.arguments")
|
||||
private String[] arguments;
|
||||
@@ -117,7 +118,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
* The spring profiles to activate. Convenience shortcut of specifying the
|
||||
* 'spring.profiles.active' argument. On command line use commas to separate multiple
|
||||
* profiles.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.profiles")
|
||||
private String[] profiles;
|
||||
@@ -125,7 +126,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* The name of the main class. If not specified the first compiled class found that
|
||||
* contains a 'main' method will be used.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.main-class")
|
||||
private String mainClass;
|
||||
@@ -133,7 +134,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* Additional folders besides the classes directory that should be added to the
|
||||
* classpath.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.folders")
|
||||
private String[] folders;
|
||||
@@ -141,7 +142,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* Directory containing the classes and resource files that should be packaged into
|
||||
* the archive.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(defaultValue = "${project.build.outputDirectory}", required = true)
|
||||
private File classesDirectory;
|
||||
@@ -150,14 +151,14 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
|
||||
* Flag to indicate if the run processes should be forked. {@code fork} is
|
||||
* automatically enabled if an agent, jvmArguments or working directory are specified,
|
||||
* or if devtools is present.
|
||||
* @since 1.2
|
||||
* @since 1.2.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.fork")
|
||||
private Boolean fork;
|
||||
|
||||
/**
|
||||
* Flag to include the test classpath when running.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.run.useTestClasspath", defaultValue = "false")
|
||||
private Boolean useTestClasspath;
|
||||
|
||||
@@ -39,6 +39,7 @@ import org.springframework.boot.loader.tools.LibraryScope;
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class ArtifactsLibraries implements Libraries {
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author David Turanski
|
||||
* @since 1.2
|
||||
* @since 1.2.0
|
||||
*/
|
||||
public abstract class DependencyFilter extends AbstractArtifactsFilter {
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.springframework.boot.maven;
|
||||
* A model for a dependency to exclude.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
public class Exclude extends FilterableDependency {
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.apache.maven.artifact.Artifact;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author David Turanski
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
public class ExcludeFilter extends DependencyFilter {
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ import org.apache.maven.plugins.annotations.Parameter;
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @author David Turanski
|
||||
* @since 1.2
|
||||
*/
|
||||
abstract class FilterableDependency {
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.springframework.boot.maven;
|
||||
* A model for a dependency to include.
|
||||
*
|
||||
* @author David Turanski
|
||||
* @since 1.2
|
||||
* @since 1.2.0
|
||||
*/
|
||||
public class Include extends FilterableDependency {
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
|
||||
* {@link Include}.
|
||||
*
|
||||
* @author David Turanski
|
||||
* @since 1.2
|
||||
* @since 1.2.0
|
||||
*/
|
||||
public class IncludeFilter extends DependencyFilter {
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import org.apache.maven.shared.artifact.filter.collection.AbstractArtifactFeatur
|
||||
* classes use of {@link String#startsWith} to match on prefix.
|
||||
*
|
||||
* @author Mark Ingram
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
public class MatchingGroupIdFilter extends AbstractArtifactFeatureFilter {
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ import org.apache.maven.plugins.shade.resource.ResourceTransformer;
|
||||
*
|
||||
* @author Dave Syer
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public class PropertiesMergingResourceTransformer implements ResourceTransformer {
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ import org.springframework.boot.loader.tools.Repackager.MainClassTimeoutWarningL
|
||||
* @author Phillip Webb
|
||||
* @author Dave Syer
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Mojo(name = "repackage", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true,
|
||||
requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
|
||||
@@ -65,35 +66,35 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
|
||||
/**
|
||||
* The Maven project.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(defaultValue = "${project}", readonly = true, required = true)
|
||||
private MavenProject project;
|
||||
|
||||
/**
|
||||
* Maven project helper utils.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Component
|
||||
private MavenProjectHelper projectHelper;
|
||||
|
||||
/**
|
||||
* Directory containing the generated archive.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(defaultValue = "${project.build.directory}", required = true)
|
||||
private File outputDirectory;
|
||||
|
||||
/**
|
||||
* Name of the generated archive.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter(defaultValue = "${project.build.finalName}", required = true)
|
||||
private String finalName;
|
||||
|
||||
/**
|
||||
* Skip the execution.
|
||||
* @since 1.2
|
||||
* @since 1.2.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.repackage.skip", defaultValue = "false")
|
||||
private boolean skip;
|
||||
@@ -106,14 +107,14 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
* deploy it alongside to the original one, see <a href=
|
||||
* "https://maven.apache.org/plugins/maven-deploy-plugin/examples/deploying-with-classifiers.html"
|
||||
* > the maven documentation for more details</a>.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter
|
||||
private String classifier;
|
||||
|
||||
/**
|
||||
* Attach the repackaged archive to be installed and deployed.
|
||||
* @since 1.4
|
||||
* @since 1.4.0
|
||||
*/
|
||||
@Parameter(defaultValue = "true")
|
||||
private boolean attach = true;
|
||||
@@ -121,7 +122,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* The name of the main class. If not specified the first compiled class found that
|
||||
* contains a 'main' method will be used.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter
|
||||
private String mainClass;
|
||||
@@ -130,7 +131,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
* The type of archive (which corresponds to how the dependencies are laid out inside
|
||||
* it). Possible values are JAR, WAR, ZIP, DIR, NONE. Defaults to a guess based on the
|
||||
* archive type.
|
||||
* @since 1.0
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Parameter
|
||||
private LayoutType layout;
|
||||
@@ -139,7 +140,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
* The layout factory that will be used to create the executable archive if no
|
||||
* explicit layout is set. Alternative layouts implementations can be provided by 3rd
|
||||
* parties.
|
||||
* @since 1.5
|
||||
* @since 1.5.0
|
||||
*/
|
||||
@Parameter
|
||||
private LayoutFactory layoutFactory;
|
||||
@@ -148,7 +149,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
* A list of the libraries that must be unpacked from fat jars in order to run.
|
||||
* Specify each library as a {@code <dependency>} with a {@code <groupId>} and a
|
||||
* {@code <artifactId>} and they will be unpacked at runtime.
|
||||
* @since 1.1
|
||||
* @since 1.1.0
|
||||
*/
|
||||
@Parameter
|
||||
private List<Dependency> requiresUnpack;
|
||||
@@ -162,7 +163,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
* or war that has been made fully-executable. It is recommended that you only enable
|
||||
* this option if you intend to execute it directly, rather than running it with
|
||||
* {@code java -jar} or deploying it to a servlet container.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter(defaultValue = "false")
|
||||
private boolean executable;
|
||||
@@ -170,28 +171,28 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
|
||||
/**
|
||||
* The embedded launch script to prepend to the front of the jar if it is fully
|
||||
* executable. If not specified the 'Spring Boot' default script will be used.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter
|
||||
private File embeddedLaunchScript;
|
||||
|
||||
/**
|
||||
* Properties that should be expanded in the embedded launch script.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter
|
||||
private Properties embeddedLaunchScriptProperties;
|
||||
|
||||
/**
|
||||
* Exclude Spring Boot devtools from the repackaged archive.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter(defaultValue = "true")
|
||||
private boolean excludeDevtools = true;
|
||||
|
||||
/**
|
||||
* Include system scoped dependencies.
|
||||
* @since 1.4
|
||||
* @since 1.4.0
|
||||
*/
|
||||
@Parameter(defaultValue = "false")
|
||||
public boolean includeSystemScope;
|
||||
|
||||
@@ -27,7 +27,6 @@ import org.codehaus.plexus.util.cli.CommandLineUtils;
|
||||
* Parse and expose arguments specified in a single string.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 1.1.0
|
||||
*/
|
||||
class RunArguments {
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ import org.springframework.boot.loader.tools.RunProcess;
|
||||
* @author Phillip Webb
|
||||
* @author Stephane Nicoll
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Mojo(name = "run", requiresProject = true, defaultPhase = LifecyclePhase.VALIDATE,
|
||||
requiresDependencyResolution = ResolutionScope.TEST)
|
||||
|
||||
@@ -52,7 +52,7 @@ public class StopMojo extends AbstractMojo {
|
||||
* Flag to indicate if process to stop was forked. By default, the value is inherited
|
||||
* from the {@link MavenProject}. If it is set, it must match the value used to
|
||||
* {@link StartMojo start} the process.
|
||||
* @since 1.3
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@Parameter(property = "spring-boot.stop.fork")
|
||||
private Boolean fork;
|
||||
|
||||
@@ -26,6 +26,7 @@ import org.springframework.util.ClassUtils;
|
||||
* skipped.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public abstract class Assume {
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import org.springframework.util.Assert;
|
||||
*
|
||||
* @param <T> the type of object that the condition accepts
|
||||
* @author Phillip Webb
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public final class Matched<T> extends Condition<T> {
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ import org.junit.rules.TemporaryFolder;
|
||||
* @author Stephane Nicoll
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.5.0
|
||||
*/
|
||||
public class TestCompiler {
|
||||
|
||||
|
||||
@@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* Abstract base class for {@code @Configuration} sanity checks.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public abstract class AbstractConfigurationClassTests {
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ import static org.hamcrest.Matchers.allOf;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public class OutputCapture implements TestRule {
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
* Copyright 2012-2019 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,6 +28,7 @@ import java.lang.annotation.Target;
|
||||
* from the classpath.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.5.0
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.TYPE)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
* Copyright 2012-2019 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,6 +27,7 @@ import java.lang.annotation.Target;
|
||||
* on the classpath.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.5.0
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.TYPE)
|
||||
|
||||
@@ -64,6 +64,7 @@ import org.springframework.util.StringUtils;
|
||||
* the thread context class loader while the test is being run.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @since 1.5.0
|
||||
*/
|
||||
public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner {
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @author Madhura Bhave
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public class CassandraContainer extends Container {
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @author Madhura Bhave
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public class Neo4jContainer extends Container {
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ import org.testcontainers.containers.GenericContainer;
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @author Madhura Bhave
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public class RedisContainer extends Container {
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ import javax.servlet.ServletResponse;
|
||||
* Simple example Filter used for testing.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public class ExampleFilter implements Filter {
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ 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 {
|
||||
|
||||
@@ -43,6 +43,7 @@ import static org.mockito.Mockito.mock;
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Andy Wilkinson
|
||||
* @since 2.0.0
|
||||
*/
|
||||
public abstract class MockServletWebServer {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user