Merge branch '2.5.x'

Closes gh-28681
spring-projects · Nov 15, 2021 · b1ff60c · b1ff60c
2 parents d6bead1 + 4cfbc0d
commit b1ff60c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...ols/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/...ols/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
@@ -86,9 +86,9 @@ default List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
 	/**
 	 * 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 @@ default List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
 	 * 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 @@ default void forEach(Consumer<? super Entry> action) {
 	/**
 	 * 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