Merge branch '2.4.x'

This commit is contained in:
Phillip Webb
2021-03-30 09:26:16 -07:00
51 changed files with 85 additions and 79 deletions

View File

@@ -68,7 +68,7 @@ public class SpringBootExtension {
/**
* Returns the fully-qualified main class name of the application.
* @return the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass()}.
*/
@Deprecated
@ReplacedBy("mainClass")
@@ -79,7 +79,7 @@ public class SpringBootExtension {
/**
* Sets the fully-qualified main class name of the application.
* @param mainClassName the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass} and
* {@link Property#set(Object)}
*/
@Deprecated

View File

@@ -47,7 +47,7 @@ public interface BootArchive extends Task {
/**
* Returns the fully-qualified main class name of the application.
* @return the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass()}.
*/
@Deprecated
@ReplacedBy("mainClass")
@@ -56,7 +56,7 @@ public interface BootArchive extends Task {
/**
* Sets the fully-qualified main class name of the application.
* @param mainClassName the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass} and
* {@link Property#set(Object)}
*/
@Deprecated

View File

@@ -117,7 +117,7 @@ public class BootBuildImage extends DefaultTask {
/**
* Returns the property for the archive file from which the image will be built.
* @return the archive file property
* @deprecated since 2.5 for removal in 2.7 in favor of {@link #getArchiveFile()}
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of {@link #getArchiveFile()}
*/
@Deprecated
@Input

View File

@@ -183,7 +183,7 @@ public class BootJar extends Jar implements BootArchive {
/**
* Configures the jar to be layered using the default layering.
* @since 2.3.0
* @deprecated since 2.4 for removal in 2.6 as layering as now enabled by default.
* @deprecated since 2.4.0 for removal in 2.6.0 as layering as now enabled by default.
*/
@Deprecated
public void layered() {