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

12
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.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 BuildLog {
* @param request the build request
* @param imageReference the builder image reference
* @return a consumer for progress update events
* @deprecated since 2.4.0 in favor of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #pullingImage(ImageReference, ImageType)}
*/
@Deprecated
@@ -57,7 +57,8 @@ public interface BuildLog {
* Log that the builder image has been pulled.
* @param request the build request
* @param image the builder image that was pulled
* @deprecated since 2.4.0 in favor of {@link #pulledImage(Image, ImageType)}
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #pulledImage(Image, ImageType)}
*/
@Deprecated
void pulledBuilder(BuildRequest request, Image image);
@@ -67,7 +68,7 @@ public interface BuildLog {
* @param request the build request
* @param imageReference the run image reference
* @return a consumer for progress update events
* @deprecated since 2.4.0 in favor of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #pullingImage(ImageReference, ImageType)}
*/
@Deprecated
@@ -77,7 +78,8 @@ public interface BuildLog {
* Log that a run image has been pulled.
* @param request the build request
* @param image the run image that was pulled
* @deprecated since 2.4.0 in favor of {@link #pulledImage(Image, ImageType)}
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #pulledImage(Image, ImageType)}
*/
@Deprecated
void pulledRunImage(BuildRequest request, Image image);

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() {

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java
View File

@@ -100,7 +100,7 @@ public abstract class Packager {
* Create a new {@link Packager} instance.
* @param source the source archive file to package
* @param layoutFactory the layout factory to use or {@code null}
* @deprecated since 2.5.0 in favor of {@link #Packager(File)} and
* @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Packager(File)} and
* {@link #setLayoutFactory(LayoutFactory)}
*/
@Deprecated

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
View File

@@ -50,8 +50,8 @@ public class Repackager extends Packager {
* Create a new {@link Repackager} instance.
* @param source the source archive file to package
* @param layoutFactory the layout factory to use or {@code null}
* @deprecated since 2.5.0 in favor of {@link #Repackager(File)} and
* {@link #setLayoutFactory(LayoutFactory)}
* @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Repackager(File)}
* and {@link #setLayoutFactory(LayoutFactory)}
*/
@Deprecated
public Repackager(File source, LayoutFactory layoutFactory) {

7
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.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.
@@ -63,7 +63,8 @@ public abstract class Launcher {
* @param archives the archives
* @return the classloader
* @throws Exception if the classloader cannot be created
* @deprecated since 2.3.0 in favor of {@link #createClassLoader(Iterator)}
* @deprecated since 2.3 for removal in 2.5 in favor of
* {@link #createClassLoader(Iterator)}
*/
@Deprecated
protected ClassLoader createClassLoader(List<Archive> archives) throws Exception {
@@ -139,7 +140,7 @@ public abstract class Launcher {
* Returns the archives that will be used to construct the class path.
* @return the class path archives
* @throws Exception if the class path archives cannot be obtained
* @deprecated since 2.3.0 in favor of implementing
* @deprecated since 2.3 for removal in 2.5 in favor of implementing
* {@link #getClassPathArchivesIterator()}.
*/
@Deprecated

10
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.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.
@@ -75,7 +75,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
* @param filter the filter used to limit entries
* @return nested archives
* @throws IOException if nested archives cannot be read
* @deprecated since 2.3.0 in favor of
* @deprecated since 2.3 for removal in 2.5 in favor of
* {@link #getNestedArchives(EntryFilter, EntryFilter)}
*/
@Deprecated
@@ -86,7 +86,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
/**
* Return a new iterator for the archive entries.
* @see java.lang.Iterable#iterator()
* @deprecated since 2.3.0 in favor of using
* @deprecated since 2.3 for removal in 2.5 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/
@@ -98,7 +98,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
* Performs the given action for each element of the {@code Iterable} until all
* elements have been processed or the action throws an exception.
* @see Iterable#forEach
* @deprecated since 2.3.0 in favor of using
* @deprecated since 2.3 for removal in 2.5 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/
@@ -114,7 +114,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
/**
* Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
* @see Iterable#spliterator
* @deprecated since 2.3.0 in favor of using
* @deprecated since 2.3 for removal in 2.5 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.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.
@@ -70,7 +70,7 @@ public class ArtifactsLibraries implements Libraries {
* @param artifacts the artifacts to represent as libraries
* @param unpacks artifacts that should be unpacked on launch
* @param log the log
* @deprecated since 2.4.0 in favour of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #ArtifactsLibraries(Set, Collection, Collection, Log)}
*/
@Deprecated