Skip to content

Commit 4cfbc0d

Browse files
committed
Merge branch '2.4.x' into 2.5.x
Closes gh-28680
2 parents 4c193a1 + 2e5f80e commit 4cfbc0d

File tree

1 file changed

+7
-7
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ default List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
8686
/**
8787
* Return a new iterator for the archive entries.
8888
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
89-
* @see java.lang.Iterable#iterator()
9089
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
9190
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
91+
* @see java.lang.Iterable#iterator()
9292
*/
9393
@Deprecated
9494
@Override
@@ -98,9 +98,9 @@ default List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
9898
* Performs the given action for each element of the {@code Iterable} until all
9999
* elements have been processed or the action throws an exception.
100100
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
101-
* @see Iterable#forEach {@link org.springframework.boot.loader.jar.JarFile} to access
102-
* entries and {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing
103-
* nested archives.
101+
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
102+
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
103+
* @see Iterable#forEach
104104
*/
105105
@Deprecated
106106
@Override
@@ -114,9 +114,9 @@ default void forEach(Consumer<? super Entry> action) {
114114
/**
115115
* Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
116116
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
117-
* @see Iterable#spliterator {@link org.springframework.boot.loader.jar.JarFile} to
118-
* access entries and {@link #getNestedArchives(EntryFilter, EntryFilter)} for
119-
* accessing nested archives.
117+
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
118+
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
119+
* @see Iterable#spliterator
120120
*/
121121
@Deprecated
122122
@Override

0 commit comments

Comments
 (0)