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

Merge branch '2.4.x'

Browse Source 
Closes gh-25826
This commit is contained in:
Phillip Webb
2021-03-29 15:47:30 -07:00
parent f3c9cc85cb 363f5829d1
commit 44b1751bb4
59 changed files with 145 additions and 119 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

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java
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.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

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

@@ -117,8 +117,9 @@ 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.0 in favor of {@link #getArchiveFile()}
* @deprecated since 2.5 for removal in 2.7 in favor of {@link #getArchiveFile()}
*/
@Deprecated
@Input
public RegularFileProperty getJar() {
return this.archiveFile;

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
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.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() {