Merge branch '2.4.x' into 2.5.x

Closes gh-28680
This commit is contained in:
Andy Wilkinson
2021-11-15 12:08:49 +00:00

View File

@@ -86,9 +86,9 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
/**
* Return a new iterator for the archive entries.
* @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.
* @see java.lang.Iterable#iterator()
*/
@Deprecated
@Override
@@ -98,9 +98,9 @@ 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.
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
* @see Iterable#forEach {@link org.springframework.boot.loader.jar.JarFile} to access
* entries and {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing
* nested archives.
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
* @see Iterable#forEach
*/
@Deprecated
@Override
@@ -114,9 +114,9 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
/**
* Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
* @see Iterable#spliterator {@link org.springframework.boot.loader.jar.JarFile} to
* access entries and {@link #getNestedArchives(EntryFilter, EntryFilter)} for
* accessing nested archives.
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
* @see Iterable#spliterator
*/
@Deprecated
@Override