Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x

Browse Source 
Closes gh-25825
This commit is contained in:
Phillip Webb
2021-03-29 15:45:27 -07:00
parent a025f3d252 26dd1b9a26
commit 363f5829d1
68 changed files with 190 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
@@ -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.0 in favor of {@link #getMainClass()}.
* @deprecated since 2.4 for removal in 2.6 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.0 in favour of {@link #getMainClass} and
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
* {@link Property#set(Object)}
*/
@Deprecated

14
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
@@ -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.0 in favor of {@link #getMainClass()}.
* @deprecated since 2.4 for removal in 2.6 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.0 in favour of {@link #getMainClass} and
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
* {@link Property#set(Object)}
*/
@Deprecated
@@ -133,8 +133,8 @@ public interface BootArchive extends Task {
* {@code false}.
* @return {@code true} if the Devtools jar should be excluded, or {@code false} if
* not
* @deprecated since 2.3.0 in favour of configuring a classpath that does not include
* development-only dependencies
* @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
* does not include development-only dependencies
*/
@Input
@Deprecated
@@ -144,8 +144,8 @@ public interface BootArchive extends Task {
* Sets whether or not the Devtools jar should be excluded.
* @param excludeDevtools {@code true} if the Devtools jar should be excluded, or
* {@code false} if not
* @deprecated since 2.3.0 in favour of configuring a classpath that does not include
* development-only dependencies
* @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
* does not include development-only dependencies
*/
@Deprecated
void setExcludeDevtools(boolean excludeDevtools);

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
View File

@@ -133,7 +133,8 @@ public class BootJar extends Jar implements BootArchive {
* Returns the {@link Configuration Configurations} of the project associated with
* this task.
* @return the configurations
* @deprecated since 2.3.5 in favor of {@link Project#getConfigurations}
* @deprecated since 2.3.5 for removal in 2.5 in favor of
* {@link Project#getConfigurations}
*/
@Internal
@Deprecated
@@ -196,7 +197,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.0 as layering as now enabled by default.
* @deprecated since 2.4 for removal in 2.6 as layering as now enabled by default.
*/
@Deprecated
public void layered() {