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

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28206
This commit is contained in:
Andy Wilkinson
2021-10-06 09:57:19 +01:00
parent 9f4cf8398b 9c9fbf400e
commit 1931104d13
29 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MavenPluginAction.java
View File

@@ -26,8 +26,8 @@ import org.gradle.api.tasks.Upload;
* {@link Action} that is executed in response to the
* {@link org.gradle.api.plugins.MavenPlugin} being applied.
*
* @deprecated since 2.5.0 in favor of using the {@link MavenPublishPlugin}
* @author Andy Wilkinson
* @deprecated since 2.5.0 in favor of using the {@link MavenPublishPlugin}
*/
@Deprecated
final class MavenPluginAction implements PluginApplicationAction {

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/ContentFilter.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.
@@ -19,9 +19,9 @@ package org.springframework.boot.loader.tools.layer;
/**
* Callback interface that can be used to filter layer contents.
*
* @param <T> the content type
* @author Madhura Bhave
* @author Phillip Webb
* @param <T> the content type
* @since 2.3.0
*/
@FunctionalInterface

14
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
View File

@@ -85,8 +85,8 @@ 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 for removal in 2.5.0 in favor of using
* @see java.lang.Iterable#iterator()
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/
@@ -97,10 +97,10 @@ 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 for removal in 2.5.0 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
* @see Iterable#forEach {@link org.springframework.boot.loader.jar.JarFile} to access
* entries and {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing
* nested archives.
*/
@Deprecated
@Override
@@ -113,10 +113,10 @@ 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 for removal in 2.5.0 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
* @see Iterable#spliterator {@link org.springframework.boot.loader.jar.JarFile} to
* access entries and {@link #getNestedArchives(EntryFilter, EntryFilter)} for
* accessing nested archives.
*/
@Deprecated
@Override

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

@@ -225,8 +225,8 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
/**
* Return an iterator for the contained entries.
* @see java.lang.Iterable#iterator()
* @since 2.3.0
* @see java.lang.Iterable#iterator()
*/
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })