You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/08/23 14:49:11 UTC

[commons-lang] branch master updated (02de3b21b -> 34e4ef7ea)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git


    from 02de3b21b First sentence of a Javadoc comment does not need p tags
     new 21da81bb4 Add a main test class to prints out the difference time working with MutableInt AtomicInteger.
     new 1c2397eb4 First sentence of a Javadoc comment does not need p tags
     new 34e4ef7ea Normalize Javadoc paragraph tags "p" (lower case)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/commons/lang3/AnnotationUtils.java  |  20 +-
 .../java/org/apache/commons/lang3/ArrayUtils.java  |   1 -
 .../java/org/apache/commons/lang3/BitField.java    |  44 +-
 .../org/apache/commons/lang3/BooleanUtils.java     | 126 ++--
 .../org/apache/commons/lang3/CharEncoding.java     |  20 +-
 .../java/org/apache/commons/lang3/CharRange.java   |  36 +-
 .../apache/commons/lang3/CharSequenceUtils.java    |  12 +-
 .../java/org/apache/commons/lang3/CharSet.java     |  24 +-
 .../org/apache/commons/lang3/CharSetUtils.java     |  26 +-
 .../java/org/apache/commons/lang3/CharUtils.java   |  66 +-
 .../org/apache/commons/lang3/ClassPathUtils.java   |   4 +-
 .../java/org/apache/commons/lang3/ClassUtils.java  |  90 ---
 .../java/org/apache/commons/lang3/Conversion.java  |  99 +--
 .../java/org/apache/commons/lang3/EnumUtils.java   |  40 +-
 .../java/org/apache/commons/lang3/Functions.java   |   2 -
 .../java/org/apache/commons/lang3/JavaVersion.java |  10 +-
 .../java/org/apache/commons/lang3/LocaleUtils.java |  26 +-
 .../commons/lang3/NotImplementedException.java     |   6 +-
 .../java/org/apache/commons/lang3/ObjectUtils.java |  94 ++-
 .../apache/commons/lang3/RandomStringUtils.java    |  78 +--
 src/main/java/org/apache/commons/lang3/Range.java  |  55 +-
 .../java/org/apache/commons/lang3/RegExUtils.java  |  30 +-
 .../commons/lang3/SerializationException.java      |  18 +-
 .../apache/commons/lang3/SerializationUtils.java   |  26 +-
 .../apache/commons/lang3/StringEscapeUtils.java    |  62 +-
 .../java/org/apache/commons/lang3/StringUtils.java | 683 ++++++++++-----------
 .../java/org/apache/commons/lang3/SystemUtils.java | 349 ++++-------
 .../java/org/apache/commons/lang3/ThreadUtils.java |   6 +-
 .../java/org/apache/commons/lang3/Validate.java    | 132 ++--
 .../org/apache/commons/lang3/builder/Builder.java  |   3 -
 .../commons/lang3/builder/CompareToBuilder.java    |  76 +--
 .../org/apache/commons/lang3/builder/Diff.java     |  15 +-
 .../apache/commons/lang3/builder/DiffBuilder.java  |  46 --
 .../apache/commons/lang3/builder/DiffResult.java   |  24 +-
 .../org/apache/commons/lang3/builder/Diffable.java |   8 +-
 .../commons/lang3/builder/EqualsBuilder.java       | 116 ++--
 .../commons/lang3/builder/HashCodeBuilder.java     |  79 +--
 .../builder/MultilineRecursiveToStringStyle.java   |   4 +-
 .../lang3/builder/RecursiveToStringStyle.java      |   4 +-
 .../lang3/builder/ReflectionDiffBuilder.java       |   5 +-
 .../lang3/builder/ReflectionToStringBuilder.java   |  45 +-
 .../lang3/builder/StandardToStringStyle.java       | 114 ++--
 .../commons/lang3/builder/ToStringBuilder.java     | 226 +++----
 .../commons/lang3/builder/ToStringStyle.java       | 411 ++++++-------
 .../apache/commons/lang3/builder/package-info.java |   4 +-
 .../commons/lang3/compare/ComparableUtils.java     |   2 +-
 .../lang3/concurrent/AtomicInitializer.java        |   3 +-
 .../lang3/concurrent/AtomicSafeInitializer.java    |   3 +-
 .../lang3/concurrent/BackgroundInitializer.java    |   3 +-
 .../lang3/concurrent/BasicThreadFactory.java       |   6 +-
 .../concurrent/CallableBackgroundInitializer.java  |   4 +-
 .../commons/lang3/concurrent/CircuitBreaker.java   |   3 +-
 .../lang3/concurrent/CircuitBreakingException.java |   3 +-
 .../commons/lang3/concurrent/Computable.java       |   2 +-
 .../lang3/concurrent/ConcurrentException.java      |   3 +-
 .../lang3/concurrent/ConcurrentInitializer.java    |   3 +-
 .../concurrent/ConcurrentRuntimeException.java     |   3 +-
 .../commons/lang3/concurrent/ConcurrentUtils.java  |   7 +-
 .../lang3/concurrent/ConstantInitializer.java      |   3 +-
 .../lang3/concurrent/EventCountCircuitBreaker.java |   3 +-
 .../commons/lang3/concurrent/LazyInitializer.java  |   3 +-
 .../apache/commons/lang3/concurrent/Memoizer.java  |  18 +-
 .../concurrent/MultiBackgroundInitializer.java     |   3 +-
 .../lang3/concurrent/ThresholdCircuitBreaker.java  |   4 +-
 .../commons/lang3/concurrent/TimedSemaphore.java   |   3 +-
 .../lang3/concurrent/locks/LockingVisitors.java    |  15 +-
 .../lang3/concurrent/locks/package-info.java       |   3 +-
 .../commons/lang3/concurrent/package-info.java     |   2 -
 .../commons/lang3/event/EventListenerSupport.java  |   3 +-
 .../lang3/exception/ContextedException.java        |   3 +-
 .../lang3/exception/ContextedRuntimeException.java |   3 +-
 .../commons/lang3/exception/package-info.java      |   2 +-
 .../apache/commons/lang3/function/Failable.java    |   2 -
 .../org/apache/commons/lang3/math/Fraction.java    |  90 +--
 .../apache/commons/lang3/math/IEEE754rUtils.java   |  44 +-
 .../org/apache/commons/lang3/math/NumberUtils.java | 146 ++---
 .../apache/commons/lang3/math/package-info.java    |   4 +-
 .../commons/lang3/mutable/MutableObject.java       |   2 -
 .../apache/commons/lang3/mutable/package-info.java |   4 +-
 .../org/apache/commons/lang3/package-info.java     |  18 +-
 .../commons/lang3/reflect/ConstructorUtils.java    |  30 +-
 .../commons/lang3/reflect/InheritanceUtils.java    |   8 +-
 .../apache/commons/lang3/reflect/MemberUtils.java  |   4 +-
 .../apache/commons/lang3/reflect/MethodUtils.java  |  81 ++-
 .../apache/commons/lang3/reflect/TypeLiteral.java  |   4 +-
 .../apache/commons/lang3/reflect/package-info.java |   2 +-
 .../commons/lang3/text/FormattableUtils.java       |   6 +-
 .../org/apache/commons/lang3/text/WordUtils.java   |  51 +-
 .../apache/commons/lang3/text/package-info.java    |   6 +-
 .../text/translate/CharSequenceTranslator.java     |   4 +-
 .../lang3/text/translate/JavaUnicodeEscaper.java   |  10 -
 .../lang3/text/translate/NumericEntityEscaper.java |  14 +-
 .../lang3/text/translate/UnicodeEscaper.java       |  14 +-
 .../commons/lang3/text/translate/package-info.java |   4 +-
 .../apache/commons/lang3/time/DateFormatUtils.java |  40 +-
 .../org/apache/commons/lang3/time/DateParser.java  |   6 +-
 .../org/apache/commons/lang3/time/DatePrinter.java |  38 +-
 .../org/apache/commons/lang3/time/DateUtils.java   | 124 ++--
 .../commons/lang3/time/DurationFormatUtils.java    |  36 +-
 .../apache/commons/lang3/time/FastDateFormat.java  | 132 ++--
 .../apache/commons/lang3/time/FastDateParser.java  |  14 +-
 .../apache/commons/lang3/time/FastDatePrinter.java |  80 +--
 .../org/apache/commons/lang3/time/StopWatch.java   |  48 +-
 .../apache/commons/lang3/time/package-info.java    |   4 +-
 .../apache/commons/lang3/tuple/ImmutablePair.java  |  14 +-
 .../commons/lang3/tuple/ImmutableTriple.java       |   6 +-
 .../apache/commons/lang3/tuple/MutablePair.java    |   8 +-
 .../apache/commons/lang3/tuple/MutableTriple.java  |   6 +-
 .../java/org/apache/commons/lang3/tuple/Pair.java  |  30 +-
 .../org/apache/commons/lang3/tuple/Triple.java     |  24 +-
 .../lang3/mutable/PrintAtomicVsMutable.java}       |  32 +-
 111 files changed, 1990 insertions(+), 2678 deletions(-)
 copy src/{main/java/org/apache/commons/lang3/mutable/package-info.java => test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java} (52%)


[commons-lang] 02/03: First sentence of a Javadoc comment does not need p tags

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git

commit 1c2397eb4774032eedd4223b7d3b9ec366d3b685
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 23 10:17:50 2022 -0400

    First sentence of a Javadoc comment does not need p tags
---
 .../org/apache/commons/lang3/AnnotationUtils.java  |  20 +-
 .../java/org/apache/commons/lang3/ArrayUtils.java  |   1 -
 .../java/org/apache/commons/lang3/BitField.java    |  44 +-
 .../org/apache/commons/lang3/BooleanUtils.java     | 126 ++--
 .../org/apache/commons/lang3/CharEncoding.java     |  20 +-
 .../java/org/apache/commons/lang3/CharRange.java   |  36 +-
 .../apache/commons/lang3/CharSequenceUtils.java    |  12 +-
 .../java/org/apache/commons/lang3/CharSet.java     |  24 +-
 .../org/apache/commons/lang3/CharSetUtils.java     |  26 +-
 .../java/org/apache/commons/lang3/CharUtils.java   |  66 +-
 .../org/apache/commons/lang3/ClassPathUtils.java   |   4 +-
 .../java/org/apache/commons/lang3/ClassUtils.java  |  90 ---
 .../java/org/apache/commons/lang3/Conversion.java  |  99 +--
 .../java/org/apache/commons/lang3/EnumUtils.java   |  40 +-
 .../java/org/apache/commons/lang3/Functions.java   |   2 -
 .../java/org/apache/commons/lang3/JavaVersion.java |  10 +-
 .../java/org/apache/commons/lang3/LocaleUtils.java |  26 +-
 .../commons/lang3/NotImplementedException.java     |   6 +-
 .../java/org/apache/commons/lang3/ObjectUtils.java |  94 ++-
 .../apache/commons/lang3/RandomStringUtils.java    |  78 +--
 src/main/java/org/apache/commons/lang3/Range.java  |  55 +-
 .../java/org/apache/commons/lang3/RegExUtils.java  |  30 +-
 .../commons/lang3/SerializationException.java      |  18 +-
 .../apache/commons/lang3/SerializationUtils.java   |  26 +-
 .../apache/commons/lang3/StringEscapeUtils.java    |  62 +-
 .../java/org/apache/commons/lang3/StringUtils.java | 683 ++++++++++-----------
 .../java/org/apache/commons/lang3/SystemUtils.java | 349 ++++-------
 .../java/org/apache/commons/lang3/ThreadUtils.java |   6 +-
 .../java/org/apache/commons/lang3/Validate.java    | 132 ++--
 .../org/apache/commons/lang3/builder/Builder.java  |   3 -
 .../commons/lang3/builder/CompareToBuilder.java    |  76 +--
 .../org/apache/commons/lang3/builder/Diff.java     |  15 +-
 .../apache/commons/lang3/builder/DiffBuilder.java  |  46 --
 .../apache/commons/lang3/builder/DiffResult.java   |  24 +-
 .../org/apache/commons/lang3/builder/Diffable.java |   8 +-
 .../commons/lang3/builder/EqualsBuilder.java       | 116 ++--
 .../commons/lang3/builder/HashCodeBuilder.java     |  77 +--
 .../builder/MultilineRecursiveToStringStyle.java   |   4 +-
 .../lang3/builder/RecursiveToStringStyle.java      |   4 +-
 .../lang3/builder/ReflectionDiffBuilder.java       |   5 +-
 .../lang3/builder/ReflectionToStringBuilder.java   |  45 +-
 .../lang3/builder/StandardToStringStyle.java       | 112 ++--
 .../commons/lang3/builder/ToStringBuilder.java     | 226 +++----
 .../commons/lang3/builder/ToStringStyle.java       | 411 ++++++-------
 .../apache/commons/lang3/builder/package-info.java |   4 +-
 .../commons/lang3/compare/ComparableUtils.java     |   2 +-
 .../lang3/concurrent/AtomicInitializer.java        |   3 +-
 .../lang3/concurrent/AtomicSafeInitializer.java    |   3 +-
 .../lang3/concurrent/BackgroundInitializer.java    |   3 +-
 .../lang3/concurrent/BasicThreadFactory.java       |   6 +-
 .../concurrent/CallableBackgroundInitializer.java  |   4 +-
 .../commons/lang3/concurrent/CircuitBreaker.java   |   3 +-
 .../lang3/concurrent/CircuitBreakingException.java |   3 +-
 .../commons/lang3/concurrent/Computable.java       |   2 +-
 .../lang3/concurrent/ConcurrentException.java      |   3 +-
 .../lang3/concurrent/ConcurrentInitializer.java    |   3 +-
 .../concurrent/ConcurrentRuntimeException.java     |   3 +-
 .../commons/lang3/concurrent/ConcurrentUtils.java  |   7 +-
 .../lang3/concurrent/ConstantInitializer.java      |   3 +-
 .../lang3/concurrent/EventCountCircuitBreaker.java |   3 +-
 .../commons/lang3/concurrent/LazyInitializer.java  |   3 +-
 .../apache/commons/lang3/concurrent/Memoizer.java  |  18 +-
 .../concurrent/MultiBackgroundInitializer.java     |   3 +-
 .../lang3/concurrent/ThresholdCircuitBreaker.java  |   4 +-
 .../commons/lang3/concurrent/TimedSemaphore.java   |   3 +-
 .../lang3/concurrent/locks/LockingVisitors.java    |  15 +-
 .../lang3/concurrent/locks/package-info.java       |   3 +-
 .../commons/lang3/concurrent/package-info.java     |   2 -
 .../commons/lang3/event/EventListenerSupport.java  |   3 +-
 .../lang3/exception/ContextedException.java        |   3 +-
 .../lang3/exception/ContextedRuntimeException.java |   3 +-
 .../commons/lang3/exception/package-info.java      |   2 +-
 .../apache/commons/lang3/function/Failable.java    |   2 -
 .../org/apache/commons/lang3/math/Fraction.java    |  90 +--
 .../apache/commons/lang3/math/IEEE754rUtils.java   |  44 +-
 .../org/apache/commons/lang3/math/NumberUtils.java | 146 ++---
 .../apache/commons/lang3/math/package-info.java    |   4 +-
 .../commons/lang3/mutable/MutableObject.java       |   2 -
 .../apache/commons/lang3/mutable/package-info.java |   4 +-
 .../org/apache/commons/lang3/package-info.java     |  18 +-
 .../commons/lang3/reflect/ConstructorUtils.java    |  30 +-
 .../commons/lang3/reflect/InheritanceUtils.java    |   8 +-
 .../apache/commons/lang3/reflect/MemberUtils.java  |   4 +-
 .../apache/commons/lang3/reflect/MethodUtils.java  |  81 ++-
 .../apache/commons/lang3/reflect/TypeLiteral.java  |   4 +-
 .../apache/commons/lang3/reflect/package-info.java |   2 +-
 .../commons/lang3/text/FormattableUtils.java       |   6 +-
 .../org/apache/commons/lang3/text/WordUtils.java   |  51 +-
 .../apache/commons/lang3/text/package-info.java    |   6 +-
 .../text/translate/CharSequenceTranslator.java     |   4 +-
 .../lang3/text/translate/JavaUnicodeEscaper.java   |  10 -
 .../lang3/text/translate/NumericEntityEscaper.java |  14 +-
 .../lang3/text/translate/UnicodeEscaper.java       |  14 +-
 .../commons/lang3/text/translate/package-info.java |   4 +-
 .../apache/commons/lang3/time/DateFormatUtils.java |  40 +-
 .../org/apache/commons/lang3/time/DateParser.java  |   6 +-
 .../org/apache/commons/lang3/time/DatePrinter.java |  38 +-
 .../org/apache/commons/lang3/time/DateUtils.java   | 124 ++--
 .../commons/lang3/time/DurationFormatUtils.java    |  36 +-
 .../apache/commons/lang3/time/FastDateFormat.java  | 132 ++--
 .../apache/commons/lang3/time/FastDateParser.java  |  14 +-
 .../apache/commons/lang3/time/FastDatePrinter.java |  80 +--
 .../org/apache/commons/lang3/time/StopWatch.java   |  48 +-
 .../apache/commons/lang3/time/package-info.java    |   4 +-
 .../apache/commons/lang3/tuple/ImmutablePair.java  |  14 +-
 .../commons/lang3/tuple/ImmutableTriple.java       |   6 +-
 .../apache/commons/lang3/tuple/MutablePair.java    |   8 +-
 .../apache/commons/lang3/tuple/MutableTriple.java  |   6 +-
 .../java/org/apache/commons/lang3/tuple/Pair.java  |  30 +-
 .../org/apache/commons/lang3/tuple/Triple.java     |  24 +-
 110 files changed, 1962 insertions(+), 2670 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/AnnotationUtils.java b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
index 09450c2ed..9d0571488 100644
--- a/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/AnnotationUtils.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.exception.UncheckedException;
 
 /**
- * <p>Helper methods for working with {@link Annotation} instances.</p>
+ * Helper methods for working with {@link Annotation} instances.
  *
  * <p>This class contains various utility methods that make working with
  * annotations simpler.</p>
@@ -90,8 +90,8 @@ public class AnnotationUtils {
     };
 
     /**
-     * <p>{@link AnnotationUtils} instances should NOT be constructed in
-     * standard programming. Instead, the class should be used statically.</p>
+     * {@link AnnotationUtils} instances should NOT be constructed in
+     * standard programming. Instead, the class should be used statically.
      *
      * <p>This constructor is public to permit tools that require a JavaBean
      * instance to operate.</p>
@@ -100,8 +100,8 @@ public class AnnotationUtils {
     }
 
     /**
-     * <p>Checks if two annotations are equal using the criteria for equality
-     * presented in the {@link Annotation#equals(Object)} API docs.</p>
+     * Checks if two annotations are equal using the criteria for equality
+     * presented in the {@link Annotation#equals(Object)} API docs.
      *
      * @param a1 the first Annotation to compare, {@code null} returns
      * {@code false} unless both are {@code null}
@@ -142,8 +142,8 @@ public class AnnotationUtils {
     }
 
     /**
-     * <p>Generate a hash code for the given annotation using the algorithm
-     * presented in the {@link Annotation#hashCode()} API docs.</p>
+     * Generate a hash code for the given annotation using the algorithm
+     * presented in the {@link Annotation#hashCode()} API docs.
      *
      * @param a the Annotation for a hash code calculation is desired, not
      * {@code null}
@@ -171,8 +171,8 @@ public class AnnotationUtils {
     }
 
     /**
-     * <p>Generate a string representation of an Annotation, as suggested by
-     * {@link Annotation#toString()}.</p>
+     * Generate a string representation of an Annotation, as suggested by
+     * {@link Annotation#toString()}.
      *
      * @param a the annotation of which a string representation is desired
      * @return the standard string representation of an annotation, not
@@ -194,7 +194,7 @@ public class AnnotationUtils {
     }
 
     /**
-     * <p>Checks if the specified type is permitted as an annotation member.</p>
+     * Checks if the specified type is permitted as an annotation member.
      *
      * <p>The Java language specification only permits certain types to be used
      * in annotations. These include {@link String}, {@link Class}, primitive
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index d3f3431ef..fb90edc6d 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -8680,7 +8680,6 @@ public class ArrayUtils {
      *     <li>ArrayUtils.swap([true, false, true], -1, 1) -&gt; [false, true, true]</li>
      * </ul>
      *
-     *
      * @param array  the array to swap, may be {@code null}
      * @param offset1 the index of the first element to swap
      * @param offset2 the index of the second element to swap
diff --git a/src/main/java/org/apache/commons/lang3/BitField.java b/src/main/java/org/apache/commons/lang3/BitField.java
index fa64df55a..a2d0ccbe3 100644
--- a/src/main/java/org/apache/commons/lang3/BitField.java
+++ b/src/main/java/org/apache/commons/lang3/BitField.java
@@ -17,9 +17,9 @@
 package org.apache.commons.lang3;
 
 /**
- * <p>Supports operations on bit-mapped fields. Instances of this class can be
+ * Supports operations on bit-mapped fields. Instances of this class can be
  * used to store a flag or data within an {@code int}, {@code short} or
- * {@code byte}.</p>
+ * {@code byte}.
  *
  * <p>Each {@link BitField} is constructed with a mask value, which indicates
  * the bits that will be used to store and retrieve the data for that field.
@@ -76,7 +76,7 @@ public class BitField {
     private final int shiftCount;
 
     /**
-     * <p>Creates a BitField instance.</p>
+     * Creates a BitField instance.
      *
      * @param mask the mask specifying which bits apply to this
      *  BitField. Bits that are set in this mask are the bits
@@ -88,8 +88,8 @@ public class BitField {
     }
 
     /**
-     * <p>Obtains the value for the specified BitField, appropriately
-     * shifted right.</p>
+     * Obtains the value for the specified BitField, appropriately
+     * shifted right.
      *
      * <p>Many users of a BitField will want to treat the specified
      * bits as an int value, and will not want to be aware that the
@@ -106,8 +106,8 @@ public class BitField {
     }
 
     /**
-     * <p>Obtains the value for the specified BitField, appropriately
-     * shifted right, as a short.</p>
+     * Obtains the value for the specified BitField, appropriately
+     * shifted right, as a short.
      *
      * <p>Many users of a BitField will want to treat the specified
      * bits as an int value, and will not want to be aware that the
@@ -124,7 +124,7 @@ public class BitField {
     }
 
     /**
-     * <p>Obtains the value for the specified BitField, unshifted.</p>
+     * Obtains the value for the specified BitField, unshifted.
      *
      * @param holder the int data containing the bits we're
      *  interested in
@@ -135,7 +135,7 @@ public class BitField {
     }
 
     /**
-     * <p>Obtains the value for the specified BitField, unshifted.</p>
+     * Obtains the value for the specified BitField, unshifted.
      *
      * @param holder the short data containing the bits we're
      *  interested in
@@ -146,7 +146,7 @@ public class BitField {
     }
 
     /**
-     * <p>Returns whether the field is set or not.</p>
+     * Returns whether the field is set or not.
      *
      * <p>This is most commonly used for a single-bit field, which is
      * often used to represent a boolean value; the results of using
@@ -163,7 +163,7 @@ public class BitField {
     }
 
     /**
-     * <p>Returns whether all of the bits are set or not.</p>
+     * Returns whether all of the bits are set or not.
      *
      * <p>This is a stricter test than {@link #isSet(int)},
      * in that all of the bits in a multi-bit set must be set
@@ -179,7 +179,7 @@ public class BitField {
     }
 
     /**
-     * <p>Replaces the bits with new values.</p>
+     * Replaces the bits with new values.
      *
      * @see #getValue(int)
      * @param holder the int data containing the bits we're
@@ -193,7 +193,7 @@ public class BitField {
     }
 
     /**
-     * <p>Replaces the bits with new values.</p>
+     * Replaces the bits with new values.
      *
      * @see #getShortValue(short)
      * @param holder the short data containing the bits we're
@@ -207,7 +207,7 @@ public class BitField {
     }
 
     /**
-     * <p>Clears the bits.</p>
+     * Clears the bits.
      *
      * @param holder the int data containing the bits we're
      *  interested in
@@ -219,7 +219,7 @@ public class BitField {
     }
 
     /**
-     * <p>Clears the bits.</p>
+     * Clears the bits.
      *
      * @param holder the short data containing the bits we're
      *  interested in
@@ -231,7 +231,7 @@ public class BitField {
     }
 
     /**
-     * <p>Clears the bits.</p>
+     * Clears the bits.
      *
      * @param holder the byte data containing the bits we're
      *  interested in
@@ -244,7 +244,7 @@ public class BitField {
     }
 
     /**
-     * <p>Sets the bits.</p>
+     * Sets the bits.
      *
      * @param holder the int data containing the bits we're
      *  interested in
@@ -256,7 +256,7 @@ public class BitField {
     }
 
     /**
-     * <p>Sets the bits.</p>
+     * Sets the bits.
      *
      * @param holder the short data containing the bits we're
      *  interested in
@@ -268,7 +268,7 @@ public class BitField {
     }
 
     /**
-     * <p>Sets the bits.</p>
+     * Sets the bits.
      *
      * @param holder the byte data containing the bits we're
      *  interested in
@@ -281,7 +281,7 @@ public class BitField {
     }
 
     /**
-     * <p>Sets a boolean BitField.</p>
+     * Sets a boolean BitField.
      *
      * @param holder the int data containing the bits we're
      *  interested in
@@ -294,7 +294,7 @@ public class BitField {
     }
 
     /**
-     * <p>Sets a boolean BitField.</p>
+     * Sets a boolean BitField.
      *
      * @param holder the short data containing the bits we're
      *  interested in
@@ -307,7 +307,7 @@ public class BitField {
     }
 
     /**
-     * <p>Sets a boolean BitField.</p>
+     * Sets a boolean BitField.
      *
      * @param holder the byte data containing the bits we're
      *  interested in
diff --git a/src/main/java/org/apache/commons/lang3/BooleanUtils.java b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
index 9b2bd117a..e4479246c 100644
--- a/src/main/java/org/apache/commons/lang3/BooleanUtils.java
+++ b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
@@ -19,7 +19,7 @@ package org.apache.commons.lang3;
 import org.apache.commons.lang3.math.NumberUtils;
 
 /**
- * <p>Operations on boolean primitives and Boolean objects.</p>
+ * Operations on boolean primitives and Boolean objects.
  *
  * <p>This class tries to handle {@code null} input gracefully.
  * An exception will not be thrown for a {@code null} input.
@@ -72,7 +72,7 @@ public class BooleanUtils {
     public static final String YES = "yes";
 
     /**
-     * <p>Performs an 'and' operation on a set of booleans.</p>
+     * Performs an 'and' operation on a set of booleans.
      *
      * <pre>
      *   BooleanUtils.and(true, true)         = true
@@ -100,7 +100,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Performs an 'and' operation on an array of Booleans.</p>
+     * Performs an 'and' operation on an array of Booleans.
      * <pre>
      *   BooleanUtils.and(Boolean.TRUE, Boolean.TRUE)                 = Boolean.TRUE
      *   BooleanUtils.and(Boolean.FALSE, Boolean.FALSE)               = Boolean.FALSE
@@ -136,7 +136,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Compares two {@code boolean} values. This is the same functionality as provided in Java 7.</p>
+     * Compares two {@code boolean} values. This is the same functionality as provided in Java 7.
      *
      * @param x the first {@code boolean} to compare
      * @param y the second {@code boolean} to compare
@@ -153,8 +153,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Checks if a {@link Boolean} value is {@code false},
-     * handling {@code null} by returning {@code false}.</p>
+     * Checks if a {@link Boolean} value is {@code false},
+     * handling {@code null} by returning {@code false}.
      *
      * <pre>
      *   BooleanUtils.isFalse(Boolean.TRUE)  = false
@@ -171,8 +171,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Checks if a {@link Boolean} value is <i>not</i> {@code false},
-     * handling {@code null} by returning {@code true}.</p>
+     * Checks if a {@link Boolean} value is <i>not</i> {@code false},
+     * handling {@code null} by returning {@code true}.
      *
      * <pre>
      *   BooleanUtils.isNotFalse(Boolean.TRUE)  = true
@@ -189,8 +189,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Checks if a {@link Boolean} value is <i>not</i> {@code true},
-     * handling {@code null} by returning {@code true}.</p>
+     * Checks if a {@link Boolean} value is <i>not</i> {@code true},
+     * handling {@code null} by returning {@code true}.
      *
      * <pre>
      *   BooleanUtils.isNotTrue(Boolean.TRUE)  = false
@@ -207,8 +207,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Checks if a {@link Boolean} value is {@code true},
-     * handling {@code null} by returning {@code false}.</p>
+     * Checks if a {@link Boolean} value is {@code true},
+     * handling {@code null} by returning {@code false}.
      *
      * <pre>
      *   BooleanUtils.isTrue(Boolean.TRUE)  = true
@@ -225,12 +225,12 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Negates the specified boolean.</p>
+     * Negates the specified boolean.
      *
      * <p>If {@code null} is passed in, {@code null} will be returned.</p>
      *
      * <p>NOTE: This returns {@code null} and will throw a {@link NullPointerException}
-     * if unboxed to a boolean. </p>
+     * if unboxed to a boolean.</p>
      *
      * <pre>
      *   BooleanUtils.negate(Boolean.TRUE)  = Boolean.FALSE;
@@ -248,7 +248,7 @@ public class BooleanUtils {
         return bool.booleanValue() ? Boolean.FALSE : Boolean.TRUE;
     }
     /**
-     * <p>Performs a one-hot on an array of booleans.</p>
+     * Performs a one-hot on an array of booleans.
      * <p>
      * This implementation returns true if one, and only one, of the supplied values is true.
      * </p>
@@ -275,7 +275,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Performs a one-hot on an array of booleans.</p>
+     * Performs a one-hot on an array of booleans.
      * <p>
      * This implementation returns true if one, and only one, of the supplied values is true.
      * </p>
@@ -296,7 +296,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Performs an 'or' operation on a set of booleans.</p>
+     * Performs an 'or' operation on a set of booleans.
      *
      * <pre>
      *   BooleanUtils.or(true, true)          = true
@@ -324,7 +324,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Performs an 'or' operation on an array of Booleans.</p>
+     * Performs an 'or' operation on an array of Booleans.
      * <pre>
      *   BooleanUtils.or(Boolean.TRUE, Boolean.TRUE)                  = Boolean.TRUE
      *   BooleanUtils.or(Boolean.FALSE, Boolean.FALSE)                = Boolean.FALSE
@@ -361,8 +361,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a boolean handling {@code null}
-     * by returning {@code false}.</p>
+     * Converts a Boolean to a boolean handling {@code null}
+     * by returning {@code false}.
      *
      * <pre>
      *   BooleanUtils.toBoolean(Boolean.TRUE)  = true
@@ -378,8 +378,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an int to a boolean using the convention that {@code zero}
-     * is {@code false}, everything else is {@code true}.</p>
+     * Converts an int to a boolean using the convention that {@code zero}
+     * is {@code false}, everything else is {@code true}.
      *
      * <pre>
      *   BooleanUtils.toBoolean(0) = false
@@ -396,7 +396,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an int to a boolean specifying the conversion values.</p>
+     * Converts an int to a boolean specifying the conversion values.
      *
      * <p>If the {@code trueValue} and {@code falseValue} are the same number then
      * the return value will be {@code true} in case {@code value} matches it.</p>
@@ -427,7 +427,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an Integer to a boolean specifying the conversion values.</p>
+     * Converts an Integer to a boolean specifying the conversion values.
      *
      * <pre>
      *   BooleanUtils.toBoolean(Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(0)) = false
@@ -460,7 +460,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a String to a boolean (optimised for performance).</p>
+     * Converts a String to a boolean (optimised for performance).
      *
      * <p>{@code 'true'}, {@code 'on'}, {@code 'y'}, {@code 't'} or {@code 'yes'}
      * (case insensitive) will return {@code true}. Otherwise,
@@ -493,7 +493,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a String to a Boolean throwing an exception if no match found.</p>
+     * Converts a String to a Boolean throwing an exception if no match found.
      *
      * <pre>
      *   BooleanUtils.toBoolean("true", "true", "false")  = true
@@ -525,7 +525,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a boolean handling {@code null}.</p>
+     * Converts a Boolean to a boolean handling {@code null}.
      *
      * <pre>
      *   BooleanUtils.toBooleanDefaultIfNull(Boolean.TRUE, false)  = true
@@ -548,8 +548,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an int to a Boolean using the convention that {@code zero}
-     * is {@code false}, everything else is {@code true}.</p>
+     * Converts an int to a Boolean using the convention that {@code zero}
+     * is {@code false}, everything else is {@code true}.
      *
      * <pre>
      *   BooleanUtils.toBoolean(0) = Boolean.FALSE
@@ -566,7 +566,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an int to a Boolean specifying the conversion values.</p>
+     * Converts an int to a Boolean specifying the conversion values.
      *
      * <p>NOTE: This method may return {@code null} and may throw a {@link NullPointerException}
      * if unboxed to a {@code boolean}.</p>
@@ -604,8 +604,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an Integer to a Boolean using the convention that {@code zero}
-     * is {@code false}, every other numeric value is {@code true}.</p>
+     * Converts an Integer to a Boolean using the convention that {@code zero}
+     * is {@code false}, every other numeric value is {@code true}.
      *
      * <p>{@code null} will be converted to {@code null}.</p>
      *
@@ -630,7 +630,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts an Integer to a Boolean specifying the conversion values.</p>
+     * Converts an Integer to a Boolean specifying the conversion values.
      *
      * <p>NOTE: This method may return {@code null} and may throw a {@link NullPointerException}
      * if unboxed to a {@code boolean}.</p>
@@ -676,7 +676,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a String to a Boolean.</p>
+     * Converts a String to a Boolean.
      *
      * <p>{@code 'true'}, {@code 'on'}, {@code 'y'}, {@code 't'}, {@code 'yes'}
      * or {@code '1'} (case insensitive) will return {@code true}.
@@ -805,7 +805,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a String to a Boolean throwing an exception if no match.</p>
+     * Converts a String to a Boolean throwing an exception if no match.
      *
      * <p>NOTE: This method may return {@code null} and may throw a {@link NullPointerException}
      * if unboxed to a {@code boolean}.</p>
@@ -853,8 +853,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to an int using the convention that
-     * {@code true} is {@code 1} and {@code false} is {@code 0}.</p>
+     * Converts a boolean to an int using the convention that
+     * {@code true} is {@code 1} and {@code false} is {@code 0}.
      *
      * <pre>
      *   BooleanUtils.toInteger(true)  = 1
@@ -869,7 +869,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to an int specifying the conversion values.</p>
+     * Converts a boolean to an int specifying the conversion values.
      *
      * <pre>
      *   BooleanUtils.toInteger(true, 1, 0)  = 1
@@ -886,7 +886,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to an int specifying the conversion values.</p>
+     * Converts a Boolean to an int specifying the conversion values.
      *
      * <pre>
      *   BooleanUtils.toInteger(Boolean.TRUE, 1, 0, 2)  = 1
@@ -908,8 +908,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to an Integer using the convention that
-     * {@code true} is {@code 1} and {@code false} is {@code 0}.</p>
+     * Converts a boolean to an Integer using the convention that
+     * {@code true} is {@code 1} and {@code false} is {@code 0}.
      *
      * <pre>
      *   BooleanUtils.toIntegerObject(true)  = Integer.valueOf(1)
@@ -924,7 +924,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to an Integer specifying the conversion values.</p>
+     * Converts a boolean to an Integer specifying the conversion values.
      *
      * <pre>
      *   BooleanUtils.toIntegerObject(true, Integer.valueOf(1), Integer.valueOf(0))  = Integer.valueOf(1)
@@ -941,8 +941,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a Integer using the convention that
-     * {@code zero} is {@code false}.</p>
+     * Converts a Boolean to a Integer using the convention that
+     * {@code zero} is {@code false}.
      *
      * <p>{@code null} will be converted to {@code null}.</p>
      *
@@ -962,7 +962,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to an Integer specifying the conversion values.</p>
+     * Converts a Boolean to an Integer specifying the conversion values.
      *
      * <pre>
      *   BooleanUtils.toIntegerObject(Boolean.TRUE, Integer.valueOf(1), Integer.valueOf(0), Integer.valueOf(2))  = Integer.valueOf(1)
@@ -984,7 +984,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to a String returning one of the input Strings.</p>
+     * Converts a boolean to a String returning one of the input Strings.
      *
      * <pre>
      *   BooleanUtils.toString(true, "true", "false")   = "true"
@@ -1001,7 +1001,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a String returning one of the input Strings.</p>
+     * Converts a Boolean to a String returning one of the input Strings.
      *
      * <pre>
      *   BooleanUtils.toString(Boolean.TRUE, "true", "false", null)   = "true"
@@ -1023,8 +1023,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to a String returning {@code 'on'}
-     * or {@code 'off'}.</p>
+     * Converts a boolean to a String returning {@code 'on'}
+     * or {@code 'off'}.
      *
      * <pre>
      *   BooleanUtils.toStringOnOff(true)   = "on"
@@ -1039,8 +1039,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a String returning {@code 'on'},
-     * {@code 'off'}, or {@code null}.</p>
+     * Converts a Boolean to a String returning {@code 'on'},
+     * {@code 'off'}, or {@code null}.
      *
      * <pre>
      *   BooleanUtils.toStringOnOff(Boolean.TRUE)  = "on"
@@ -1056,8 +1056,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to a String returning {@code 'true'}
-     * or {@code 'false'}.</p>
+     * Converts a boolean to a String returning {@code 'true'}
+     * or {@code 'false'}.
      *
      * <pre>
      *   BooleanUtils.toStringTrueFalse(true)   = "true"
@@ -1072,8 +1072,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a String returning {@code 'true'},
-     * {@code 'false'}, or {@code null}.</p>
+     * Converts a Boolean to a String returning {@code 'true'},
+     * {@code 'false'}, or {@code null}.
      *
      * <pre>
      *   BooleanUtils.toStringTrueFalse(Boolean.TRUE)  = "true"
@@ -1089,8 +1089,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a boolean to a String returning {@code 'yes'}
-     * or {@code 'no'}.</p>
+     * Converts a boolean to a String returning {@code 'yes'}
+     * or {@code 'no'}.
      *
      * <pre>
      *   BooleanUtils.toStringYesNo(true)   = "yes"
@@ -1105,8 +1105,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Converts a Boolean to a String returning {@code 'yes'},
-     * {@code 'no'}, or {@code null}.</p>
+     * Converts a Boolean to a String returning {@code 'yes'},
+     * {@code 'no'}, or {@code null}.
      *
      * <pre>
      *   BooleanUtils.toStringYesNo(Boolean.TRUE)  = "yes"
@@ -1122,7 +1122,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Performs an xor on a set of booleans.</p>
+     * Performs an xor on a set of booleans.
      * <p>
      *   This behaves like an XOR gate;
      *   it returns true if the number of true values is odd,
@@ -1155,7 +1155,7 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>Performs an xor on an array of Booleans.</p>
+     * Performs an xor on an array of Booleans.
      * <pre>
      *   BooleanUtils.xor(Boolean.TRUE, Boolean.TRUE)                 = Boolean.FALSE
      *   BooleanUtils.xor(Boolean.FALSE, Boolean.FALSE)               = Boolean.FALSE
@@ -1179,8 +1179,8 @@ public class BooleanUtils {
     }
 
     /**
-     * <p>{@link BooleanUtils} instances should NOT be constructed in standard programming.
-     * Instead, the class should be used as {@code BooleanUtils.negate(true);}.</p>
+     * {@link BooleanUtils} instances should NOT be constructed in standard programming.
+     * Instead, the class should be used as {@code BooleanUtils.negate(true);}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean instance
      * to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/CharEncoding.java b/src/main/java/org/apache/commons/lang3/CharEncoding.java
index ff7dfc1a5..621b44d8d 100644
--- a/src/main/java/org/apache/commons/lang3/CharEncoding.java
+++ b/src/main/java/org/apache/commons/lang3/CharEncoding.java
@@ -21,7 +21,7 @@ import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 
 /**
- * <p>Character encoding names required of every implementation of the Java platform.</p>
+ * Character encoding names required of every implementation of the Java platform.
  *
  * <p>According to <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html">JRE character
  * encoding names</a>:</p>
@@ -40,51 +40,51 @@ import java.nio.charset.IllegalCharsetNameException;
 public class CharEncoding {
 
     /**
-     * <p>ISO Latin Alphabet #1, also known as ISO-LATIN-1.</p>
+     * ISO Latin Alphabet #1, also known as ISO-LATIN-1.
      *
      * <p>Every implementation of the Java platform is required to support this character encoding.</p>
      */
     public static final String ISO_8859_1 = "ISO-8859-1";
 
     /**
-     * <p>Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block
-     * of the Unicode character set.</p>
+     * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block
+     * of the Unicode character set.
      *
      * <p>Every implementation of the Java platform is required to support this character encoding.</p>
      */
     public static final String US_ASCII = "US-ASCII";
 
     /**
-     * <p>Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial
-     * byte-order mark (either order accepted on input, big-endian used on output).</p>
+     * Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial
+     * byte-order mark (either order accepted on input, big-endian used on output).
      *
      * <p>Every implementation of the Java platform is required to support this character encoding.</p>
      */
     public static final String UTF_16 = "UTF-16";
 
     /**
-     * <p>Sixteen-bit Unicode Transformation Format, big-endian byte order.</p>
+     * Sixteen-bit Unicode Transformation Format, big-endian byte order.
      *
      * <p>Every implementation of the Java platform is required to support this character encoding.</p>
      */
     public static final String UTF_16BE = "UTF-16BE";
 
     /**
-     * <p>Sixteen-bit Unicode Transformation Format, little-endian byte order.</p>
+     * Sixteen-bit Unicode Transformation Format, little-endian byte order.
      *
      * <p>Every implementation of the Java platform is required to support this character encoding.</p>
      */
     public static final String UTF_16LE = "UTF-16LE";
 
     /**
-     * <p>Eight-bit Unicode Transformation Format.</p>
+     * Eight-bit Unicode Transformation Format.
      *
      * <p>Every implementation of the Java platform is required to support this character encoding.</p>
      */
     public static final String UTF_8 = "UTF-8";
 
     /**
-     * <p>Returns whether the named charset is supported.</p>
+     * Returns whether the named charset is supported.
      *
      * <p>This is similar to <a
      * href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html#isSupported%28java.lang.String%29">
diff --git a/src/main/java/org/apache/commons/lang3/CharRange.java b/src/main/java/org/apache/commons/lang3/CharRange.java
index f53772dd2..da3bbce1b 100644
--- a/src/main/java/org/apache/commons/lang3/CharRange.java
+++ b/src/main/java/org/apache/commons/lang3/CharRange.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 /**
- * <p>A contiguous range of characters, optionally negated.</p>
+ * A contiguous range of characters, optionally negated.
  *
  * <p>Instances are immutable.</p>
  *
@@ -55,8 +55,8 @@ final class CharRange implements Iterable<Character>, Serializable {
     static final CharRange[] EMPTY_ARRAY = {};
 
     /**
-     * <p>Constructs a {@link CharRange} over a set of characters,
-     * optionally negating the range.</p>
+     * Constructs a {@link CharRange} over a set of characters,
+     * optionally negating the range.
      *
      * <p>A negated range includes everything except that defined by the
      * start and end characters.</p>
@@ -81,7 +81,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Constructs a {@link CharRange} over a single character.</p>
+     * Constructs a {@link CharRange} over a single character.
      *
      * @param ch  only character in this range
      * @return the new CharRange object
@@ -92,7 +92,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Constructs a negated {@link CharRange} over a single character.</p>
+     * Constructs a negated {@link CharRange} over a single character.
      *
      * <p>A negated range includes everything except that defined by the
      * single character.</p>
@@ -106,7 +106,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Constructs a {@link CharRange} over a set of characters.</p>
+     * Constructs a {@link CharRange} over a set of characters.
      *
      * <p>If start and end are in the wrong order, they are reversed.
      * Thus {@code a-e} is the same as {@code e-a}.</p>
@@ -121,7 +121,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Constructs a negated {@link CharRange} over a set of characters.</p>
+     * Constructs a negated {@link CharRange} over a set of characters.
      *
      * <p>A negated range includes everything except that defined by the
      * start and end characters.</p>
@@ -140,7 +140,7 @@ final class CharRange implements Iterable<Character>, Serializable {
 
     // Accessors
     /**
-     * <p>Gets the start character for this character range.</p>
+     * Gets the start character for this character range.
      *
      * @return the start char (inclusive)
      */
@@ -149,7 +149,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Gets the end character for this character range.</p>
+     * Gets the end character for this character range.
      *
      * @return the end char (inclusive)
      */
@@ -158,7 +158,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Is this {@link CharRange} negated.</p>
+     * Is this {@link CharRange} negated.
      *
      * <p>A negated range includes everything except that defined by the
      * start and end characters.</p>
@@ -171,7 +171,7 @@ final class CharRange implements Iterable<Character>, Serializable {
 
     // Contains
     /**
-     * <p>Is the character specified contained in this range.</p>
+     * Is the character specified contained in this range.
      *
      * @param ch  the character to check
      * @return {@code true} if this range contains the input character
@@ -181,8 +181,8 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Are all the characters of the passed in range contained in
-     * this range.</p>
+     * Are all the characters of the passed in range contained in
+     * this range.
      *
      * @param range  the range to check against
      * @return {@code true} if this range entirely contains the input range
@@ -204,8 +204,8 @@ final class CharRange implements Iterable<Character>, Serializable {
 
     // Basics
     /**
-     * <p>Compares two CharRange objects, returning true if they represent
-     * exactly the same range of characters defined in the same way.</p>
+     * Compares two CharRange objects, returning true if they represent
+     * exactly the same range of characters defined in the same way.
      *
      * @param obj  the object to compare to
      * @return true if equal
@@ -223,7 +223,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Gets a hashCode compatible with the equals method.</p>
+     * Gets a hashCode compatible with the equals method.
      *
      * @return a suitable hashCode
      */
@@ -233,7 +233,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Gets a string representation of the character range.</p>
+     * Gets a string representation of the character range.
      *
      * @return string representation of this range
      */
@@ -255,7 +255,7 @@ final class CharRange implements Iterable<Character>, Serializable {
     }
 
     /**
-     * <p>Returns an iterator which can be used to walk through the characters described by this range.</p>
+     * Returns an iterator which can be used to walk through the characters described by this range.
      *
      * <p>#NotThreadSafe# the iterator is not thread-safe</p>
      * @return an iterator to the chars represented by this range
diff --git a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
index 76a73f2f0..dc7c698df 100644
--- a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
@@ -17,8 +17,8 @@
 package org.apache.commons.lang3;
 
 /**
- * <p>Operations on {@link CharSequence} that are
- * {@code null} safe.</p>
+ * Operations on {@link CharSequence} that are
+ * {@code null} safe.
  *
  * @see CharSequence
  * @since 3.0
@@ -338,8 +338,8 @@ public class CharSequenceUtils {
     }
 
     /**
-     * <p>Returns a new {@link CharSequence} that is a subsequence of this
-     * sequence starting with the {@code char} value at the specified index.</p>
+     * Returns a new {@link CharSequence} that is a subsequence of this
+     * sequence starting with the {@code char} value at the specified index.
      *
      * <p>This provides the {@link CharSequence} equivalent to {@link String#substring(int)}.
      * The length (in {@code char}) of the returned sequence is {@code length() - start},
@@ -378,8 +378,8 @@ public class CharSequenceUtils {
     }
 
     /**
-     * <p>{@link CharSequenceUtils} instances should NOT be constructed in
-     * standard programming.</p>
+     * {@link CharSequenceUtils} instances should NOT be constructed in
+     * standard programming.
      *
      * <p>This constructor is public to permit tools that require a JavaBean
      * instance to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/CharSet.java b/src/main/java/org/apache/commons/lang3/CharSet.java
index e3b4728ae..a6b7bcbb5 100644
--- a/src/main/java/org/apache/commons/lang3/CharSet.java
+++ b/src/main/java/org/apache/commons/lang3/CharSet.java
@@ -25,7 +25,7 @@ import java.util.Set;
 import java.util.stream.Stream;
 
 /**
- * <p>A set of characters.</p>
+ * A set of characters.
  *
  * <p>Instances are immutable, but instances of subclasses may not be.</p>
  *
@@ -92,7 +92,7 @@ public class CharSet implements Serializable {
     private final Set<CharRange> set = Collections.synchronizedSet(new HashSet<>());
 
     /**
-     * <p>Factory method to create a new CharSet using a special syntax.</p>
+     * Factory method to create a new CharSet using a special syntax.
      *
      * <ul>
      *  <li>{@code null} or empty string ("")
@@ -166,8 +166,8 @@ public class CharSet implements Serializable {
     }
 
     /**
-     * <p>Constructs a new CharSet using the set syntax.
-     * Each string is merged in with the set.</p>
+     * Constructs a new CharSet using the set syntax.
+     * Each string is merged in with the set.
      *
      * @param set  Strings to merge into the initial set
      * @throws NullPointerException if set is {@code null}
@@ -177,7 +177,7 @@ public class CharSet implements Serializable {
     }
 
     /**
-     * <p>Add a set definition string to the {@link CharSet}.</p>
+     * Add a set definition string to the {@link CharSet}.
      *
      * @param str  set definition string
      */
@@ -211,7 +211,7 @@ public class CharSet implements Serializable {
     }
 
     /**
-     * <p>Gets the internal set as an array of CharRange objects.</p>
+     * Gets the internal set as an array of CharRange objects.
      *
      * @return an array of immutable CharRange objects
      * @since 2.0
@@ -223,8 +223,8 @@ public class CharSet implements Serializable {
     }
 
     /**
-     * <p>Does the {@link CharSet} contain the specified
-     * character {@code ch}.</p>
+     * Does the {@link CharSet} contain the specified
+     * character {@code ch}.
      *
      * @param ch  the character to check for
      * @return {@code true} if the set contains the characters
@@ -237,8 +237,8 @@ public class CharSet implements Serializable {
 
     // Basics
     /**
-     * <p>Compares two {@link CharSet} objects, returning true if they represent
-     * exactly the same set of characters defined in the same way.</p>
+     * Compares two {@link CharSet} objects, returning true if they represent
+     * exactly the same set of characters defined in the same way.
      *
      * <p>The two sets {@code abc} and {@code a-c} are <i>not</i>
      * equal according to this method.</p>
@@ -260,7 +260,7 @@ public class CharSet implements Serializable {
     }
 
     /**
-     * <p>Gets a hash code compatible with the equals method.</p>
+     * Gets a hash code compatible with the equals method.
      *
      * @return a suitable hash code
      * @since 2.0
@@ -271,7 +271,7 @@ public class CharSet implements Serializable {
     }
 
     /**
-     * <p>Gets a string representation of the set.</p>
+     * Gets a string representation of the set.
      *
      * @return string representation of the set
      */
diff --git a/src/main/java/org/apache/commons/lang3/CharSetUtils.java b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
index 733423dd1..198a6535a 100644
--- a/src/main/java/org/apache/commons/lang3/CharSetUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
@@ -19,7 +19,7 @@ package org.apache.commons.lang3;
 import org.apache.commons.lang3.stream.Streams;
 
 /**
- * <p>Operations on {@link CharSet} instances.</p>
+ * Operations on {@link CharSet} instances.
  *
  * <p>This class handles {@code null} input gracefully.
  * An exception will not be thrown for a {@code null} input.
@@ -32,8 +32,8 @@ import org.apache.commons.lang3.stream.Streams;
 public class CharSetUtils {
 
     /**
-     * <p>Takes an argument in set-syntax, see evaluateSet,
-     * and identifies whether any of the characters are present in the specified string.</p>
+     * Takes an argument in set-syntax, see evaluateSet,
+     * and identifies whether any of the characters are present in the specified string.
      *
      * <pre>
      * CharSetUtils.containsAny(null, *)        = false
@@ -64,8 +64,8 @@ public class CharSetUtils {
     }
 
     /**
-     * <p>Takes an argument in set-syntax, see evaluateSet,
-     * and returns the number of characters present in the specified string.</p>
+     * Takes an argument in set-syntax, see evaluateSet,
+     * and returns the number of characters present in the specified string.
      *
      * <pre>
      * CharSetUtils.count(null, *)        = 0
@@ -107,8 +107,8 @@ public class CharSetUtils {
     }
 
     /**
-     * <p>Takes an argument in set-syntax, see evaluateSet,
-     * and deletes any of characters present in the specified string.</p>
+     * Takes an argument in set-syntax, see evaluateSet,
+     * and deletes any of characters present in the specified string.
      *
      * <pre>
      * CharSetUtils.delete(null, *)        = null
@@ -132,8 +132,8 @@ public class CharSetUtils {
     }
 
     /**
-     * <p>Takes an argument in set-syntax, see evaluateSet,
-     * and keeps any of characters present in the specified string.</p>
+     * Takes an argument in set-syntax, see evaluateSet,
+     * and keeps any of characters present in the specified string.
      *
      * <pre>
      * CharSetUtils.keep(null, *)        = null
@@ -181,8 +181,8 @@ public class CharSetUtils {
     }
 
     /**
-     * <p>Squeezes any repetitions of a character that is mentioned in the
-     * supplied set.</p>
+     * Squeezes any repetitions of a character that is mentioned in the
+     * supplied set.
      *
      * <pre>
      * CharSetUtils.squeeze(null, *)        = null
@@ -232,8 +232,8 @@ public class CharSetUtils {
     }
 
     /**
-     * <p>CharSetUtils instances should NOT be constructed in standard programming.
-     * Instead, the class should be used as {@code CharSetUtils.evaluateSet(null);}.</p>
+     * CharSetUtils instances should NOT be constructed in standard programming.
+     * Instead, the class should be used as {@code CharSetUtils.evaluateSet(null);}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean instance
      * to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/CharUtils.java b/src/main/java/org/apache/commons/lang3/CharUtils.java
index 11cc891c0..52b864d6e 100644
--- a/src/main/java/org/apache/commons/lang3/CharUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharUtils.java
@@ -19,7 +19,7 @@ package org.apache.commons.lang3;
 import java.util.Objects;
 
 /**
- * <p>Operations on char primitives and Character objects.</p>
+ * Operations on char primitives and Character objects.
  *
  * <p>This class tries to handle {@code null} input gracefully.
  * An exception will not be thrown for a {@code null} input.
@@ -64,8 +64,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>{@link CharUtils} instances should NOT be constructed in standard programming.
-     * Instead, the class should be used as {@code CharUtils.toString('c');}.</p>
+     * {@link CharUtils} instances should NOT be constructed in standard programming.
+     * Instead, the class should be used as {@code CharUtils.toString('c');}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean instance
      * to operate.</p>
@@ -74,7 +74,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to a Character.</p>
+     * Converts the character to a Character.
      *
      * <p>For ASCII 7 bit characters, this uses a cache that will return the
      * same Character object each time.</p>
@@ -94,8 +94,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the String to a Character using the first character, returning
-     * null for empty Strings.</p>
+     * Converts the String to a Character using the first character, returning
+     * null for empty Strings.
      *
      * <p>For ASCII 7 bit characters, this uses a cache that will return the
      * same Character object each time.</p>
@@ -115,7 +115,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the Character to a char throwing an exception for {@code null}.</p>
+     * Converts the Character to a char throwing an exception for {@code null}.
      *
      * <pre>
      *   CharUtils.toChar(' ')  = ' '
@@ -132,7 +132,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the Character to a char handling {@code null}.</p>
+     * Converts the Character to a char handling {@code null}.
      *
      * <pre>
      *   CharUtils.toChar(null, 'X') = 'X'
@@ -149,8 +149,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the String to a char using the first character, throwing
-     * an exception on empty Strings.</p>
+     * Converts the String to a char using the first character, throwing
+     * an exception on empty Strings.
      *
      * <pre>
      *   CharUtils.toChar("A")  = 'A'
@@ -170,8 +170,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the String to a char using the first character, defaulting
-     * the value on empty Strings.</p>
+     * Converts the String to a char using the first character, defaulting
+     * the value on empty Strings.
      *
      * <pre>
      *   CharUtils.toChar(null, 'X') = 'X'
@@ -189,8 +189,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to the Integer it represents, throwing an
-     * exception if the character is not numeric.</p>
+     * Converts the character to the Integer it represents, throwing an
+     * exception if the character is not numeric.
      *
      * <p>This method converts the char '1' to the int 1 and so on.</p>
      *
@@ -211,8 +211,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to the Integer it represents, throwing an
-     * exception if the character is not numeric.</p>
+     * Converts the character to the Integer it represents, throwing an
+     * exception if the character is not numeric.
      *
      * <p>This method converts the char '1' to the int 1 and so on.</p>
      *
@@ -230,8 +230,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to the Integer it represents, throwing an
-     * exception if the character is not numeric.</p>
+     * Converts the character to the Integer it represents, throwing an
+     * exception if the character is not numeric.
      *
      * <p>This method converts the char '1' to the int 1 and so on.</p>
      *
@@ -251,8 +251,8 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to the Integer it represents, throwing an
-     * exception if the character is not numeric.</p>
+     * Converts the character to the Integer it represents, throwing an
+     * exception if the character is not numeric.
      *
      * <p>This method converts the char '1' to the int 1 and so on.</p>
      *
@@ -271,7 +271,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to a String that contains the one character.</p>
+     * Converts the character to a String that contains the one character.
      *
      * <p>For ASCII 7 bit characters, this uses a cache that will return the
      * same String object each time.</p>
@@ -292,7 +292,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the character to a String that contains the one character.</p>
+     * Converts the character to a String that contains the one character.
      *
      * <p>For ASCII 7 bit characters, this uses a cache that will return the
      * same String object each time.</p>
@@ -313,7 +313,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the string to the Unicode format '\u0020'.</p>
+     * Converts the string to the Unicode format '\u0020'.
      *
      * <p>This format is the Java source code format.</p>
      *
@@ -334,7 +334,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Converts the string to the Unicode format '\u0020'.</p>
+     * Converts the string to the Unicode format '\u0020'.
      *
      * <p>This format is the Java source code format.</p>
      *
@@ -354,7 +354,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit.</p>
+     * Checks whether the character is ASCII 7 bit.
      *
      * <pre>
      *   CharUtils.isAscii('a')  = true
@@ -373,7 +373,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit printable.</p>
+     * Checks whether the character is ASCII 7 bit printable.
      *
      * <pre>
      *   CharUtils.isAsciiPrintable('a')  = true
@@ -392,7 +392,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit control.</p>
+     * Checks whether the character is ASCII 7 bit control.
      *
      * <pre>
      *   CharUtils.isAsciiControl('a')  = false
@@ -411,7 +411,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit alphabetic.</p>
+     * Checks whether the character is ASCII 7 bit alphabetic.
      *
      * <pre>
      *   CharUtils.isAsciiAlpha('a')  = true
@@ -430,7 +430,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit alphabetic upper case.</p>
+     * Checks whether the character is ASCII 7 bit alphabetic upper case.
      *
      * <pre>
      *   CharUtils.isAsciiAlphaUpper('a')  = false
@@ -449,7 +449,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit alphabetic lower case.</p>
+     * Checks whether the character is ASCII 7 bit alphabetic lower case.
      *
      * <pre>
      *   CharUtils.isAsciiAlphaLower('a')  = true
@@ -468,7 +468,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit numeric.</p>
+     * Checks whether the character is ASCII 7 bit numeric.
      *
      * <pre>
      *   CharUtils.isAsciiNumeric('a')  = false
@@ -487,7 +487,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Checks whether the character is ASCII 7 bit numeric.</p>
+     * Checks whether the character is ASCII 7 bit numeric.
      *
      * <pre>
      *   CharUtils.isAsciiAlphanumeric('a')  = true
@@ -506,7 +506,7 @@ public class CharUtils {
     }
 
     /**
-     * <p>Compares two {@code char} values numerically. This is the same functionality as provided in Java 7.</p>
+     * Compares two {@code char} values numerically. This is the same functionality as provided in Java 7.
      *
      * @param x the first {@code char} to compare
      * @param y the second {@code char} to compare
diff --git a/src/main/java/org/apache/commons/lang3/ClassPathUtils.java b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
index b05392d5a..d9a25c1d1 100644
--- a/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassPathUtils.java
@@ -27,9 +27,9 @@ package org.apache.commons.lang3;
 public class ClassPathUtils {
 
     /**
-     * <p>{@link ClassPathUtils} instances should NOT be constructed in
+     * {@link ClassPathUtils} instances should NOT be constructed in
      * standard programming. Instead, the class should be used as
-     * {@code ClassPathUtils.toFullyQualifiedName(MyClass.class, "MyClass.properties");}.</p>
+     * {@code ClassPathUtils.toFullyQualifiedName(MyClass.class, "MyClass.properties");}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean
      * instance to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 2608822b0..2d7f93d2a 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -34,9 +34,7 @@ import java.util.stream.Collectors;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 /**
- * <p>
  * Operates on classes without using reflection.
- * </p>
  *
  * <p>
  * This class handles invalid {@code null} inputs as best it can. Each method documents its behavior in more detail.
@@ -170,9 +168,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Given a {@link List} of {@link Class} objects, this method converts them into class names.
-     * </p>
      *
      * <p>
      * A new {@link List} is returned. {@code null} objects will be copied into the returned list as {@code null}.
@@ -187,9 +183,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Given a {@link List} of class names, this method converts them into classes.
-     * </p>
      *
      * <p>
      * A new {@link List} is returned. If the class name cannot be found, {@code null} is stored in the {@link List}. If the
@@ -216,9 +210,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the abbreviated name of a {@link Class}.
-     * </p>
      *
      * @param cls the class to get the abbreviated name for, may be {@code null}
      * @param lengthHint the desired length of the abbreviated name
@@ -235,9 +227,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the abbreviated class name from a {@link String}.
-     * </p>
      *
      * <p>
      * The string passed in is assumed to be a class name - it is not checked.
@@ -343,9 +333,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets a {@link List} of all interfaces implemented by the given class and its superclasses.
-     * </p>
      *
      * <p>
      * The order is determined by looking through each interface in turn as declared in the source file and following its
@@ -388,9 +376,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets a {@link List} of superclasses for the given class.
-     * </p>
      *
      * @param cls the class to look up, may be {@code null}
      * @return the {@link List} of superclasses in order going up from this one {@code null} if null input
@@ -409,9 +395,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical class name for a {@link Class}.
-     * </p>
      *
      * @param cls the class for which to get the canonical class name; may be null
      * @return the canonical name of the class, or the empty String
@@ -423,9 +407,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical name for a {@link Class}.
-     * </p>
      *
      * @param cls the class for which to get the canonical class name; may be null
      * @param valueIfNull the return value if null
@@ -442,9 +424,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical name for an {@link Object}.
-     * </p>
      *
      * @param object the object for which to get the canonical class name; may be null
      * @return the canonical name of the object, or the empty String
@@ -456,9 +436,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical name for an {@link Object}.
-     * </p>
      *
      * @param object the object for which to get the canonical class name; may be null
      * @param valueIfNull the return value if null
@@ -475,10 +453,8 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Converts a given name of class into canonical format. If name of class is not a name of array class it returns
      * unchanged name.
-     * </p>
      *
      * <p>
      * The method does not change the {@code $} separators in case the class is inner class.
@@ -621,9 +597,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code cls.getName()}
-     * </p>
      *
      * @param cls the class for which to get the class name; may be null
      * @return the class name or the empty string in case the argument is {@code null}
@@ -635,9 +609,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code cls.getName()}
-     * </p>
      *
      * @param cls the class for which to get the class name; may be null
      * @param valueIfNull the return value if the argument {@code cls} is {@code null}
@@ -650,9 +622,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code object.getClass().getName()}
-     * </p>
      *
      * @param object the object for which to get the class name; may be null
      * @return the class name or the empty String
@@ -664,9 +634,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code object.getClass().getSimpleName()}
-     * </p>
      *
      * @param object the object for which to get the class name; may be null
      * @param valueIfNull the value to return if {@code object} is {@code null}
@@ -679,9 +647,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the package name from the canonical name of a {@link Class}.
-     * </p>
      *
      * @param cls the class to get the package name for, may be {@code null}.
      * @return the package name or an empty string
@@ -695,9 +661,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the package name from the class name of an {@link Object}.
-     * </p>
      *
      * @param object the class to get the package name for, may be null
      * @param valueIfNull the value to return if null
@@ -712,9 +676,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the package name from the class name.
-     * </p>
      *
      * <p>
      * The string passed in is assumed to be a class name - it is not checked.
@@ -732,9 +694,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the package name of a {@link Class}.
-     * </p>
      *
      * @param cls the class to get the package name for, may be {@code null}.
      * @return the package name or an empty string
@@ -747,9 +707,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the package name of an {@link Object}.
-     * </p>
      *
      * @param object the class to get the package name for, may be null
      * @param valueIfNull the value to return if null
@@ -763,9 +721,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the package name from a {@link String}.
-     * </p>
      *
      * <p>
      * The string passed in is assumed to be a class name - it is not checked.
@@ -799,11 +755,9 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Returns the desired Method much like {@code Class.getMethod}, however it ensures that the returned Method is from a
      * public class or interface and not from an anonymous inner class. This means that the Method is invokable and doesn't
      * fall foul of Java bug <a href="https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4071957">4071957</a>).
-     * </p>
      *
      * <pre>
      *  <code>Set set = Collections.unmodifiableSet(...);
@@ -849,9 +803,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical name minus the package name from a {@link Class}.
-     * </p>
      *
      * @param cls the class for which to get the short canonical class name; may be null
      * @return the canonical name without the package name or an empty string
@@ -865,9 +817,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical name minus the package name for an {@link Object}.
-     * </p>
      *
      * @param object the class to get the short name for, may be null
      * @param valueIfNull the value to return if null
@@ -882,9 +832,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the canonical name minus the package name from a String.
-     * </p>
      *
      * <p>
      * The string passed in is assumed to be a class name - it is not checked.
@@ -982,9 +930,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the class name minus the package name from a {@link Class}.
-     * </p>
      *
      * <p>
      * This method simply gets the name using {@code Class.getName()} and then calls {@link #getShortClassName(Class)}. See
@@ -1003,9 +949,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the class name of the {@code object} without the package name or names.
-     * </p>
      *
      * <p>
      * The method looks up the class of the object and then converts the name of the class invoking
@@ -1025,9 +969,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Gets the class name minus the package name from a String.
-     * </p>
      *
      * <p>
      * The string passed in is assumed to be a class name - it is not checked. The string has to be formatted the way as the
@@ -1090,9 +1032,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code cls.getSimpleName()}
-     * </p>
      *
      * @param cls the class for which to get the simple name; may be null
      * @return the simple class name or the empty string in case the argument is {@code null}
@@ -1104,9 +1044,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code cls.getSimpleName()}
-     * </p>
      *
      * @param cls the class for which to get the simple name; may be null
      * @param valueIfNull the value to return if null
@@ -1119,9 +1057,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code object.getClass().getSimpleName()}
-     * </p>
      *
      * <p>
      * It is to note that this method is overloaded and in case the argument {@code object} is a {@link Class} object then
@@ -1141,9 +1077,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Null-safe version of {@code object.getClass().getSimpleName()}
-     * </p>
      *
      * @param object the object for which to get the simple class name; may be null
      * @param valueIfNull the value to return if {@code object} is {@code null}
@@ -1247,9 +1181,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Checks if one {@link Class} can be assigned to a variable of another {@link Class}.
-     * </p>
      *
      * <p>
      * Unlike the {@link Class#isAssignableFrom(java.lang.Class)} method, this method takes into account widenings of
@@ -1288,9 +1220,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Checks if one {@link Class} can be assigned to a variable of another {@link Class}.
-     * </p>
      *
      * <p>
      * Unlike the {@link Class#isAssignableFrom(java.lang.Class)} method, this method takes into account widenings of
@@ -1378,9 +1308,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Checks if an array of Classes can be assigned to another array of Classes.
-     * </p>
      *
      * <p>
      * This method calls {@link #isAssignable(Class, Class) isAssignable} for each Class pair in the input arrays. It can be
@@ -1425,9 +1353,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Checks if an array of Classes can be assigned to another array of Classes.
-     * </p>
      *
      * <p>
      * This method calls {@link #isAssignable(Class, Class) isAssignable} for each Class pair in the input arrays. It can be
@@ -1481,9 +1407,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Is the specified class an inner class or static nested class.
-     * </p>
      *
      * @param cls the class to check, may be null
      * @return {@code true} if the class is an inner or static nested class, false if not or {@code null}
@@ -1531,9 +1455,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Converts the specified array of primitive Class objects to an array of its corresponding wrapper Class objects.
-     * </p>
      *
      * @param classes the class array to convert, may be null or empty
      * @return an array which contains for each given class, the wrapper class or the original class if class is not a
@@ -1557,9 +1479,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Converts the specified primitive Class object to its corresponding wrapper Class object.
-     * </p>
      *
      * <p>
      * NOTE: From v2.2, this method handles {@code Void.TYPE}, returning {@code Void.TYPE}.
@@ -1606,10 +1526,8 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Converts an array of {@link Object} in to an array of {@link Class} objects. If any of these objects is null, a null
      * element will be inserted into the array.
-     * </p>
      *
      * <p>
      * This method returns {@code null} for a {@code null} input array.
@@ -1634,13 +1552,11 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Decides if the part that was just copied to its destination location in the work array can be kept as it was copied
      * or must be abbreviated. It must be kept when the part is the last one, which is the simple name of the class. In this
      * case the {@code source} index, from where the characters are copied points one position after the last character,
      * a.k.a. {@code source ==
      * originalLength}
-     * </p>
      *
      * <p>
      * If the part is not the last one then it can be kept unabridged if the number of the characters copied so far plus the
@@ -1661,9 +1577,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Converts the specified array of wrapper Class objects to an array of its corresponding primitive Class objects.
-     * </p>
      *
      * <p>
      * This method invokes {@code wrapperToPrimitive()} for each element of the passed in array.
@@ -1692,9 +1606,7 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * Converts the specified wrapper class to its corresponding primitive class.
-     * </p>
      *
      * <p>
      * This method is the counter part of {@code primitiveToWrapper()}. If the passed in class is a wrapper class for a
@@ -1712,10 +1624,8 @@ public class ClassUtils {
     }
 
     /**
-     * <p>
      * ClassUtils instances should NOT be constructed in standard programming. Instead, the class should be used as
      * {@code ClassUtils.getShortClassName(cls)}.
-     * </p>
      *
      * <p>
      * This constructor is public to permit tools that require a JavaBean instance to operate.
diff --git a/src/main/java/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java
index d58771427..a4ef5b778 100644
--- a/src/main/java/org/apache/commons/lang3/Conversion.java
+++ b/src/main/java/org/apache/commons/lang3/Conversion.java
@@ -20,9 +20,8 @@ import java.util.UUID;
 
 
 /**
- * <p>
  * Static methods to convert a type into another, with endianness and bit ordering awareness.
- * </p>
+ *
  * <p>
  * The methods names follow a naming rule:<br>
  * {@code <source type>[source endianness][source bit ordering]To<destination type>[destination endianness][destination bit ordering]}
@@ -81,9 +80,8 @@ public class Conversion {
     private static final boolean[] FFFF = {false, false, false, false};
 
     /**
-     * <p>
      * Converts a hexadecimal digit into an int using the default (Lsb0) bit ordering.
-     * </p>
+     *
      * <p>
      * '1' is converted to 1
      * </p>
@@ -101,9 +99,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a hexadecimal digit into an int using the Msb0 bit ordering.
-     * </p>
+     *
      * <p>
      * '1' is converted to 8
      * </p>
@@ -158,10 +155,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a hexadecimal digit into binary (represented as boolean array) using the default
      * (Lsb0) bit ordering.
-     * </p>
+     *
      * <p>
      * '1' is converted as follow: (1, 0, 0, 0)
      * </p>
@@ -216,10 +212,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a hexadecimal digit into binary (represented as boolean array) using the Msb0
      * bit ordering.
-     * </p>
+     *
      * <p>
      * '1' is converted as follow: (0, 0, 0, 1)
      * </p>
@@ -274,10 +269,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) to a hexadecimal digit using the default
      * (Lsb0) bit ordering.
-     * </p>
+     *
      * <p>
      * (1, 0, 0, 0) is converted as follow: '1'
      * </p>
@@ -292,10 +286,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) to a hexadecimal digit using the default
      * (Lsb0) bit ordering.
-     * </p>
+     *
      * <p>
      * (1, 0, 0, 0) is converted as follow: '1'
      * </p>
@@ -335,10 +328,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) to a hexadecimal digit using the Msb0 bit
      * ordering.
-     * </p>
+     *
      * <p>
      * (1, 0, 0, 0) is converted as follow: '8'
      * </p>
@@ -354,10 +346,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) to a hexadecimal digit using the Msb0 bit
      * ordering.
-     * </p>
+     *
      * <p>
      * (1, 0, 0, 0) is converted as follow: '8' (1, 0, 0, 1, 1, 0, 1, 0) with srcPos = 3 is converted
      * to 'D'
@@ -402,10 +393,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts the first 4 bits of a binary (represented as boolean array) in big endian Msb0
      * bit ordering to a hexadecimal digit.
-     * </p>
+     *
      * <p>
      * (1, 0, 0, 0) is converted as follow: '8' (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0) is converted
      * to '4'
@@ -421,10 +411,9 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a binary (represented as boolean array) in big endian Msb0 bit ordering to a
      * hexadecimal digit.
-     * </p>
+     *
      * <p>
      * (1, 0, 0, 0) with srcPos = 0 is converted as follow: '8' (1, 0, 0, 0, 0, 0, 0, 0,
      * 0, 0, 0, 1, 0, 1, 0, 0) with srcPos = 2 is converted to '5'
@@ -473,9 +462,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts the 4 lsb of an int to a hexadecimal digit.
-     * </p>
+     *
      * <p>
      * 0 returns '0'
      * </p>
@@ -499,9 +487,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts the 4 lsb of an int to a hexadecimal digit encoded using the Msb0 bit ordering.
-     * </p>
+     *
      * <p>
      * 0 returns '0'
      * </p>
@@ -556,10 +543,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of int into a long using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the int array to convert
      * @param srcPos the position in {@code src}, in int unit, from where to start the
@@ -591,10 +576,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of short into a long using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the short array to convert
      * @param srcPos the position in {@code src}, in short unit, from where to start the
@@ -626,10 +609,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of short into an int using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the short array to convert
      * @param srcPos the position in {@code src}, in short unit, from where to start the
@@ -661,10 +642,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of byte into a long using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the byte array to convert
      * @param srcPos the position in {@code src}, in byte unit, from where to start the
@@ -696,10 +675,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of byte into an int using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the byte array to convert
      * @param srcPos the position in {@code src}, in byte unit, from where to start the
@@ -731,10 +708,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of byte into a short using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the byte array to convert
      * @param srcPos the position in {@code src}, in byte unit, from where to start the
@@ -766,10 +741,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of Char into a long using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the hex string to convert
      * @param srcPos the position in {@code src}, in Char unit, from where to start the
@@ -799,10 +772,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of Char into an int using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the hex string to convert
      * @param srcPos the position in {@code src}, in Char unit, from where to start the
@@ -831,10 +802,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of Char into a short using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the hex string to convert
      * @param srcPos the position in {@code src}, in Char unit, from where to start the
@@ -864,10 +833,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an array of Char into a byte using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the hex string to convert
      * @param srcPos the position in {@code src}, in Char unit, from where to start the
@@ -897,10 +864,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) into a long using the default (little
      * endian, Lsb0) byte and bit ordering.
-     * </p>
      *
      * @param src the binary to convert
      * @param srcPos the position in {@code src}, in boolean unit, from where to start the
@@ -932,10 +897,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) into an int using the default (little
      * endian, Lsb0) byte and bit ordering.
-     * </p>
      *
      * @param src the binary to convert
      * @param srcPos the position in {@code src}, in boolean unit, from where to start the
@@ -967,10 +930,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) into a short using the default (little
      * endian, Lsb0) byte and bit ordering.
-     * </p>
      *
      * @param src the binary to convert
      * @param srcPos the position in {@code src}, in boolean unit, from where to start the
@@ -1002,10 +963,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts binary (represented as boolean array) into a byte using the default (little
      * endian, Lsb0) byte and bit ordering.
-     * </p>
      *
      * @param src the binary to convert
      * @param srcPos the position in {@code src}, in boolean unit, from where to start the
@@ -1037,10 +996,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a long into an array of int using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the long to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1069,10 +1026,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a long into an array of short using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the long to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1101,10 +1056,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an int into an array of short using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the int to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1133,10 +1086,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a long into an array of byte using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the long to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1165,10 +1116,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an int into an array of byte using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the int to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1197,10 +1146,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a short into an array of byte using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the short to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1229,10 +1176,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a long into an array of Char using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the long to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1268,10 +1213,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an int into an array of Char using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the int to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1307,10 +1250,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a short into an array of Char using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the short to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1346,10 +1287,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a byte into an array of Char using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the byte to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1385,10 +1324,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a long into an array of boolean using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the long to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1417,10 +1354,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts an int into an array of boolean using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the int to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1449,10 +1384,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a short into an array of boolean using the default (little endian, Lsb0) byte
      * and bit ordering.
-     * </p>
      *
      * @param src the short to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1482,10 +1415,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts a byte into an array of boolean using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the byte to convert
      * @param srcPos the position in {@code src}, in bits, from where to start the conversion
@@ -1514,10 +1445,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts UUID into an array of byte using the default (little endian, Lsb0) byte and bit
      * ordering.
-     * </p>
      *
      * @param src the UUID to convert
      * @param dst the destination array
@@ -1544,10 +1473,8 @@ public class Conversion {
     }
 
     /**
-     * <p>
      * Converts bytes from an array into a UUID using the default (little endian, Lsb0) byte and
      * bit ordering.
-     * </p>
      *
      * @param src the byte array to convert
      * @param srcPos the position in {@code src} where to copy the result from
diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java
index b4783c7a7..c3e66b64c 100644
--- a/src/main/java/org/apache/commons/lang3/EnumUtils.java
+++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
- * <p>Utility library to provide helper methods for Java enums.</p>
+ * Utility library to provide helper methods for Java enums.
  *
  * <p>#ThreadSafe#</p>
  *
@@ -74,7 +74,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Creates a long bit vector representation of the given array of Enum values.</p>
+     * Creates a long bit vector representation of the given array of Enum values.
      *
      * <p>This generates a value that is usable by {@link EnumUtils#processBitVector}.</p>
      *
@@ -97,7 +97,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Creates a long bit vector representation of the given subset of an Enum.</p>
+     * Creates a long bit vector representation of the given subset of an Enum.
      *
      * <p>This generates a value that is usable by {@link EnumUtils#processBitVector}.</p>
      *
@@ -126,7 +126,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Creates a bit vector representation of the given subset of an Enum using as many {@code long}s as needed.</p>
+     * Creates a bit vector representation of the given subset of an Enum using as many {@code long}s as needed.
      *
      * <p>This generates a value that is usable by {@link EnumUtils#processBitVectors}.</p>
      *
@@ -156,7 +156,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Creates a bit vector representation of the given subset of an Enum using as many {@code long}s as needed.</p>
+     * Creates a bit vector representation of the given subset of an Enum using as many {@code long}s as needed.
      *
      * <p>This generates a value that is usable by {@link EnumUtils#processBitVectors}.</p>
      *
@@ -185,7 +185,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the enum for the class, returning {@code null} if not found.</p>
+     * Gets the enum for the class, returning {@code null} if not found.
      *
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name.</p>
@@ -200,7 +200,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the enum for the class, returning {@code defaultEnum} if not found.</p>
+     * Gets the enum for the class, returning {@code defaultEnum} if not found.
      *
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name.</p>
@@ -224,7 +224,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the enum for the class, returning {@code null} if not found.</p>
+     * Gets the enum for the class, returning {@code null} if not found.
      *
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name and performs case insensitive matching of the name.</p>
@@ -240,7 +240,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the enum for the class, returning {@code defaultEnum} if not found.</p>
+     * Gets the enum for the class, returning {@code defaultEnum} if not found.
      *
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name and performs case insensitive matching of the name.</p>
@@ -258,7 +258,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the {@link List} of enums.</p>
+     * Gets the {@link List} of enums.
      *
      * <p>This method is useful when you need a list of enums rather than an array.</p>
      *
@@ -271,7 +271,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the {@link Map} of enums by name.</p>
+     * Gets the {@link Map} of enums by name.
      *
      * <p>This method is useful when you need a map of enums by name.</p>
      *
@@ -284,9 +284,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>
      * Gets the {@link Map} of enums by name.
-     * </p>
      *
      * <p>
      * This method is useful when you need a map of enums by name.
@@ -304,9 +302,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>
      * Gets the enum for the class in a system property, returning {@code defaultEnum} if not found.
-     * </p>
      *
      * <p>
      * This method differs from {@link Enum#valueOf} in that it does not throw an exception for an invalid enum name.
@@ -326,7 +322,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Gets the enum for the class, returning {@code defaultEnum} if not found.</p>
+     * Gets the enum for the class, returning {@code defaultEnum} if not found.
      *
      * <p>This method differs from {@link Enum#valueOf} in that it does not throw an exception
      * for an invalid enum name and performs case insensitive matching of the name.</p>
@@ -348,7 +344,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Checks if the specified name is a valid enum for the class.</p>
+     * Checks if the specified name is a valid enum for the class.
      *
      * <p>This method differs from {@link Enum#valueOf} in that checks if the name is
      * a valid enum without needing to catch the exception.</p>
@@ -363,7 +359,7 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Checks if the specified name is a valid enum for the class.</p>
+     * Checks if the specified name is a valid enum for the class.
      *
      * <p>This method differs from {@link Enum#valueOf} in that checks if the name is
      * a valid enum without needing to catch the exception
@@ -380,8 +376,8 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Convert a long value created by {@link EnumUtils#generateBitVector} into the set of
-     * enum values that it represents.</p>
+     * Convert a long value created by {@link EnumUtils#generateBitVector} into the set of
+     * enum values that it represents.
      *
      * <p>If you store this value, beware any changes to the enum that would affect ordinal values.</p>
      * @param enumClass the class of the enum we are working with, not {@code null}
@@ -398,8 +394,8 @@ public class EnumUtils {
     }
 
     /**
-     * <p>Convert a {@code long[]} created by {@link EnumUtils#generateBitVectors} into the set of
-     * enum values that it represents.</p>
+     * Convert a {@code long[]} created by {@link EnumUtils#generateBitVectors} into the set of
+     * enum values that it represents.
      *
      * <p>If you store this value, beware any changes to the enum that would affect ordinal values.</p>
      * @param enumClass the class of the enum we are working with, not {@code null}
diff --git a/src/main/java/org/apache/commons/lang3/Functions.java b/src/main/java/org/apache/commons/lang3/Functions.java
index 28da79388..4d3c471d1 100644
--- a/src/main/java/org/apache/commons/lang3/Functions.java
+++ b/src/main/java/org/apache/commons/lang3/Functions.java
@@ -494,13 +494,11 @@ public class Functions {
     }
 
     /**
-     * <p>
      * Rethrows a {@link Throwable} as an unchecked exception. If the argument is already unchecked, namely a
      * {@link RuntimeException} or {@link Error} then the argument will be rethrown without modification. If the
      * exception is {@link IOException} then it will be wrapped into a {@link UncheckedIOException}. In every other
      * cases the exception will be wrapped into a {@code
      * UndeclaredThrowableException}
-     * </p>
      *
      * <p>
      * Note that there is a declared return type for this method, even though it never returns. The reason for that is
diff --git a/src/main/java/org/apache/commons/lang3/JavaVersion.java b/src/main/java/org/apache/commons/lang3/JavaVersion.java
index fc9a7237f..4fc8073be 100644
--- a/src/main/java/org/apache/commons/lang3/JavaVersion.java
+++ b/src/main/java/org/apache/commons/lang3/JavaVersion.java
@@ -19,9 +19,9 @@ package org.apache.commons.lang3;
 import org.apache.commons.lang3.math.NumberUtils;
 
 /**
- * <p>An enum representing all the versions of the Java specification.
+ * An enum representing all the versions of the Java specification.
  * This is intended to mirror available values from the
- * <em>java.specification.version</em> System property. </p>
+ * <em>java.specification.version</em> System property.
  *
  * @since 3.0
  */
@@ -177,7 +177,7 @@ public enum JavaVersion {
     }
 
     /**
-     * <p>Whether this version of Java is at least the version of Java passed in.</p>
+     * Whether this version of Java is at least the version of Java passed in.
      *
      * <p>For example:<br>
      *  {@code myVersion.atLeast(JavaVersion.JAVA_1_4)}</p>
@@ -190,7 +190,7 @@ public enum JavaVersion {
     }
 
     /**
-     * <p>Whether this version of Java is at most the version of Java passed in.</p>
+     * Whether this version of Java is at most the version of Java passed in.
      *
      * <p>For example:<br>
      *  {@code myVersion.atMost(JavaVersion.JAVA_1_4)}</p>
@@ -285,7 +285,7 @@ public enum JavaVersion {
     }
 
     /**
-     * <p>The string value is overridden to return the standard name.</p>
+     * The string value is overridden to return the standard name.
      *
      * <p>For example, {@code "1.5"}.</p>
      *
diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index 8da310b7a..c9c22fb9c 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -29,7 +29,7 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
- * <p>Operations to assist when working with a {@link Locale}.</p>
+ * Operations to assist when working with a {@link Locale}.
  *
  * <p>This class tries to handle {@code null} input gracefully.
  * An exception will not be thrown for a {@code null} input.
@@ -64,7 +64,7 @@ public class LocaleUtils {
         new ConcurrentHashMap<>();
 
     /**
-     * <p>Obtains an unmodifiable list of installed locales.</p>
+     * Obtains an unmodifiable list of installed locales.
      *
      * <p>This method is a wrapper around {@link Locale#getAvailableLocales()}.
      * It is more efficient, as the JDK method must create a new array each
@@ -81,7 +81,7 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Obtains an unmodifiable set of installed locales.</p>
+     * Obtains an unmodifiable set of installed locales.
      *
      * <p>This method is a wrapper around {@link Locale#getAvailableLocales()}.
      * It is more efficient, as the JDK method must create a new array each
@@ -94,7 +94,7 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Obtains the list of countries supported for a given language.</p>
+     * Obtains the list of countries supported for a given language.
      *
      * <p>This method takes a language code and searches to find the
      * countries available for that language. Variant locales are removed.</p>
@@ -111,7 +111,7 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Checks if the locale specified is in the set of available locales.</p>
+     * Checks if the locale specified is in the set of available locales.
      *
      * @param locale the Locale object to check if it is available
      * @return true if the locale is a known locale
@@ -151,7 +151,7 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Obtains the list of languages supported for a given country.</p>
+     * Obtains the list of languages supported for a given country.
      *
      * <p>This method takes a country code and searches to find the
      * languages available for that country. Variant locales are removed.</p>
@@ -168,8 +168,8 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Obtains the list of locales to search through when performing
-     * a locale search.</p>
+     * Obtains the list of locales to search through when performing
+     * a locale search.
      *
      * <pre>
      * localeLookupList(Locale("fr", "CA", "xxx"))
@@ -184,8 +184,8 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Obtains the list of locales to search through when performing
-     * a locale search.</p>
+     * Obtains the list of locales to search through when performing
+     * a locale search.
      *
      * <pre>
      * localeLookupList(Locale("fr", "CA", "xxx"), Locale("en"))
@@ -263,7 +263,7 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>Converts a String to a Locale.</p>
+     * Converts a String to a Locale.
      *
      * <p>This method takes the string format of a locale and creates the
      * locale object from it.</p>
@@ -334,8 +334,8 @@ public class LocaleUtils {
     }
 
     /**
-     * <p>{@link LocaleUtils} instances should NOT be constructed in standard programming.
-     * Instead, the class should be used as {@code LocaleUtils.toLocale("en_GB");}.</p>
+     * {@link LocaleUtils} instances should NOT be constructed in standard programming.
+     * Instead, the class should be used as {@code LocaleUtils.toLocale("en_GB");}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean instance
      * to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/NotImplementedException.java b/src/main/java/org/apache/commons/lang3/NotImplementedException.java
index 2b20ca45c..783b8a259 100644
--- a/src/main/java/org/apache/commons/lang3/NotImplementedException.java
+++ b/src/main/java/org/apache/commons/lang3/NotImplementedException.java
@@ -17,13 +17,13 @@
 package org.apache.commons.lang3;
 
 /**
- * <p>Thrown to indicate that a block of code has not been implemented.
+ * Thrown to indicate that a block of code has not been implemented.
  * This exception supplements {@link UnsupportedOperationException}
- * by providing a more semantically rich description of the problem.</p>
+ * by providing a more semantically rich description of the problem.
  *
  * <p>{@link NotImplementedException} represents the case where the
  * author has yet to implement the logic at this point in the program.
- * This can act as an exception based TODO tag. </p>
+ * This can act as an exception based TODO tag.</p>
  *
  * <pre>
  * public void foo() {
diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index 0155da451..b0aeac2ae 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -43,7 +43,7 @@ import org.apache.commons.lang3.time.DurationUtils;
 import org.apache.commons.lang3.stream.Streams;
 
 /**
- * <p>Operations on {@link Object}.</p>
+ * Operations on {@link Object}.
  *
  * <p>This class tries to handle {@code null} input gracefully.
  * An exception will generally not be thrown for a {@code null} input.
@@ -58,8 +58,8 @@ import org.apache.commons.lang3.stream.Streams;
 public class ObjectUtils {
 
     /**
-     * <p>Class used as a null placeholder where {@code null}
-     * has another meaning.</p>
+     * Class used as a null placeholder where {@code null}
+     * has another meaning.
      *
      * <p>For example, in a {@link HashMap} the
      * {@link java.util.HashMap#get(java.lang.Object)} method returns
@@ -85,7 +85,7 @@ public class ObjectUtils {
         }
 
         /**
-         * <p>Ensure Singleton after serialization.</p>
+         * Ensure Singleton after serialization.
          *
          * @return the singleton value
          */
@@ -97,8 +97,8 @@ public class ObjectUtils {
     private static final char AT_SIGN = '@';
 
     /**
-     * <p>Singleton used as a {@code null} placeholder where
-     * {@code null} has another meaning.</p>
+     * Singleton used as a {@code null} placeholder where
+     * {@code null} has another meaning.
      *
      * <p>For example, in a {@link HashMap} the
      * {@link java.util.HashMap#get(java.lang.Object)} method returns
@@ -224,7 +224,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Clone an object.</p>
+     * Clone an object.
      *
      * @param <T> the type of the object
      * @param obj  the object to clone, null returns null
@@ -271,7 +271,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Clone an object if possible.</p>
+     * Clone an object if possible.
      *
      * <p>This method is similar to {@link #clone(Object)}, but will return the provided
      * instance as the return value instead of {@code null} if the instance
@@ -292,8 +292,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Null safe comparison of Comparables.
-     * {@code null} is assumed to be less than a non-{@code null} value.</p>
+     * Null safe comparison of Comparables.
+     * {@code null} is assumed to be less than a non-{@code null} value.
      * <p>TODO Move to ComparableUtils.</p>
      *
      * @param <T> type of the values processed by this method
@@ -307,7 +307,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Null safe comparison of Comparables.</p>
+     * Null safe comparison of Comparables.
      * <p>TODO Move to ComparableUtils.</p>
      *
      * @param <T> type of the values processed by this method
@@ -578,7 +578,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Returns a default value if the object passed is {@code null}.</p>
+     * Returns a default value if the object passed is {@code null}.
      *
      * <pre>
      * ObjectUtils.defaultIfNull(null, null)      = null
@@ -600,8 +600,8 @@ public class ObjectUtils {
 
     // Null-safe equals/hashCode
     /**
-     * <p>Compares two objects for equality, where either one or both
-     * objects may be {@code null}.</p>
+     * Compares two objects for equality, where either one or both
+     * objects may be {@code null}.
      *
      * <pre>
      * ObjectUtils.equals(null, null)                  = true
@@ -626,9 +626,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Returns the first value in the array which is not {@code null}.
+     * Returns the first value in the array which is not {@code null}.
      * If all the values are {@code null} or the array is {@code null}
-     * or empty then {@code null} is returned.</p>
+     * or empty then {@code null} is returned.
      *
      * <pre>
      * ObjectUtils.firstNonNull(null, null)      = null
@@ -666,12 +666,12 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Executes the given suppliers in order and returns the first return
+     * Executes the given suppliers in order and returns the first return
      * value where a value other than {@code null} is returned.
      * Once a non-{@code null} value is obtained, all following suppliers are
      * not executed anymore.
      * If all the return values are {@code null} or no suppliers are provided
-     * then {@code null} is returned.</p>
+     * then {@code null} is returned.
      *
      * <pre>
      * ObjectUtils.firstNonNullLazy(null, () -&gt; null) = null
@@ -695,10 +695,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>
      * Returns the given {@code object} is it is non-null, otherwise returns the Supplier's {@link Supplier#get()}
      * value.
-     * </p>
      *
      * <p>
      * The caller responsible for thread-safety and exception handling of default value supplier.
@@ -724,8 +722,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Gets the hash code of an object returning zero when the
-     * object is {@code null}.</p>
+     * Gets the hash code of an object returning zero when the
+     * object is {@code null}.
      *
      * <pre>
      * ObjectUtils.hashCode(null)   = 0
@@ -760,7 +758,7 @@ public class ObjectUtils {
 
 
     /**
-     * <p>Gets the hash code for multiple objects.</p>
+     * Gets the hash code for multiple objects.
      *
      * <p>This allows a hash code to be rapidly calculated for a number of objects.
      * The hash code for a single object is the <em>not</em> same as {@link #hashCode(Object)}.
@@ -794,9 +792,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Appends the toString that would be produced by {@link Object}
+     * Appends the toString that would be produced by {@link Object}
      * if a class did not override toString itself. {@code null}
-     * will throw a NullPointerException for either of the two parameters. </p>
+     * will throw a NullPointerException for either of the two parameters.
      *
      * <pre>
      * ObjectUtils.identityToString(appendable, "")            = appendable.append("java.lang.String@1e23")
@@ -831,9 +829,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Gets the toString that would be produced by {@link Object}
+     * Gets the toString that would be produced by {@link Object}
      * if a class did not override toString itself. {@code null}
-     * will return {@code null}.</p>
+     * will return {@code null}.
      *
      * <pre>
      * ObjectUtils.identityToString(null)         = null
@@ -862,9 +860,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Appends the toString that would be produced by {@link Object}
+     * Appends the toString that would be produced by {@link Object}
      * if a class did not override toString itself. {@code null}
-     * will throw a NullPointerException for either of the two parameters. </p>
+     * will throw a NullPointerException for either of the two parameters.
      *
      * <pre>
      * ObjectUtils.identityToString(builder, "")            = builder.append("java.lang.String@1e23")
@@ -890,9 +888,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Appends the toString that would be produced by {@link Object}
+     * Appends the toString that would be produced by {@link Object}
      * if a class did not override toString itself. {@code null}
-     * will throw a NullPointerException for either of the two parameters. </p>
+     * will throw a NullPointerException for either of the two parameters.
      *
      * <pre>
      * ObjectUtils.identityToString(buf, "")            = buf.append("java.lang.String@1e23")
@@ -915,9 +913,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Appends the toString that would be produced by {@link Object}
+     * Appends the toString that would be produced by {@link Object}
      * if a class did not override toString itself. {@code null}
-     * will throw a NullPointerException for either of the two parameters. </p>
+     * will throw a NullPointerException for either of the two parameters.
      *
      * <pre>
      * ObjectUtils.identityToString(builder, "")            = builder.append("java.lang.String@1e23")
@@ -961,9 +959,7 @@ public class ObjectUtils {
      */
 
     /**
-     * <p>
      * Checks, whether the given object is an Object array or a primitive array in a null-safe manner.
-     * </p>
      *
      * <p>
      * A {@code null} {@code object} Object will return {@code false}.
@@ -987,7 +983,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Checks if an Object is empty or null.</p>
+     * Checks if an Object is empty or null.
      *
      * The following types are supported:
      * <ul>
@@ -1039,7 +1035,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Checks if an Object is not empty and not null.</p>
+     * Checks if an Object is not empty and not null.
      *
      * The following types are supported:
      * <ul>
@@ -1071,7 +1067,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Null safe comparison of Comparables.</p>
+     * Null safe comparison of Comparables.
      * <p>TODO Move to ComparableUtils.</p>
      *
      * @param <T> type of the values processed by this method
@@ -1142,7 +1138,7 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Null safe comparison of Comparables.</p>
+     * Null safe comparison of Comparables.
      * <p>TODO Move to ComparableUtils.</p>
      *
      * @param <T> type of the values processed by this method
@@ -1206,8 +1202,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Compares two objects for inequality, where either one or both
-     * objects may be {@code null}.</p>
+     * Compares two objects for inequality, where either one or both
+     * objects may be {@code null}.
      *
      * <pre>
      * ObjectUtils.notEqual(null, null)                  = false
@@ -1287,8 +1283,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Gets the {@code toString} of an {@link Object} returning
-     * an empty string ("") if {@code null} input.</p>
+     * Gets the {@code toString} of an {@link Object} returning
+     * an empty string ("") if {@code null} input.
      *
      * <pre>
      * ObjectUtils.toString(null)         = ""
@@ -1312,8 +1308,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Gets the {@code toString} of an {@link Object} returning
-     * a specified text if {@code null} input.</p>
+     * Gets the {@code toString} of an {@link Object} returning
+     * a specified text if {@code null} input.
      *
      * <pre>
      * ObjectUtils.toString(null, null)           = null
@@ -1338,8 +1334,8 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>Gets the {@code toString} of an {@link Object} returning
-     * a specified text if {@code null} input.</p>
+     * Gets the {@code toString} of an {@link Object} returning
+     * a specified text if {@code null} input.
      *
      * <pre>
      * ObjectUtils.toString(obj, () -&gt; expensive())
@@ -1379,9 +1375,9 @@ public class ObjectUtils {
     }
 
     /**
-     * <p>{@link ObjectUtils} instances should NOT be constructed in
+     * {@link ObjectUtils} instances should NOT be constructed in
      * standard programming. Instead, the static methods on the class should
-     * be used, such as {@code ObjectUtils.defaultIfNull("a","b");}.</p>
+     * be used, such as {@code ObjectUtils.defaultIfNull("a","b");}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean
      * instance to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/RandomStringUtils.java b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
index 2062b1730..798542034 100644
--- a/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
@@ -20,7 +20,7 @@ import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
- * <p>Generates random {@link String}s.</p>
+ * Generates random {@link String}s.
  *
  * <p><b>Caveat: Instances of {@link Random}, upon which the implementation of this
  * class relies, are not cryptographically secure.</b></p>
@@ -55,8 +55,8 @@ public class RandomStringUtils {
 
     // Random
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of all characters.</p>
      *
@@ -68,8 +68,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of alpha-numeric
      * characters as indicated by the arguments.</p>
@@ -86,8 +86,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of characters specified.</p>
      *
@@ -105,8 +105,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of alpha-numeric
      * characters as indicated by the arguments.</p>
@@ -125,8 +125,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string based on a variety of options, using
-     * default source of randomness.</p>
+     * Creates a random string based on a variety of options, using
+     * default source of randomness.
      *
      * <p>This method has exactly the same semantics as
      * {@link #random(int,int,int,boolean,boolean,char[],Random)}, but
@@ -151,8 +151,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string based on a variety of options, using
-     * supplied source of randomness.</p>
+     * Creates a random string based on a variety of options, using
+     * supplied source of randomness.
      *
      * <p>If start and end are both {@code 0}, start and end are set
      * to {@code ' '} and {@code 'z'}, the ASCII printable
@@ -262,8 +262,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of characters
      * specified by the string, must not be empty.
@@ -283,8 +283,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of Latin alphabetic
      * characters (a-z, A-Z).</p>
@@ -297,8 +297,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is between the inclusive minimum and
-     * the exclusive maximum.</p>
+     * Creates a random string whose length is between the inclusive minimum and
+     * the exclusive maximum.
      *
      * <p>Characters will be chosen from the set of Latin alphabetic characters (a-z, A-Z).</p>
      *
@@ -312,8 +312,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of Latin alphabetic
      * characters (a-z, A-Z) and the digits 0-9.</p>
@@ -326,8 +326,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is between the inclusive minimum and
-     * the exclusive maximum.</p>
+     * Creates a random string whose length is between the inclusive minimum and
+     * the exclusive maximum.
      *
      * <p>Characters will be chosen from the set of Latin alphabetic
      * characters (a-z, A-Z) and the digits 0-9.</p>
@@ -342,8 +342,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of characters whose
      * ASCII value is between {@code 32} and {@code 126} (inclusive).</p>
@@ -356,8 +356,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is between the inclusive minimum and
-     * the exclusive maximum.</p>
+     * Creates a random string whose length is between the inclusive minimum and
+     * the exclusive maximum.
      *
      * <p>Characters will be chosen from the set of characters whose
      * ASCII value is between {@code 32} and {@code 126} (inclusive).</p>
@@ -372,7 +372,7 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters specified.</p>
+     * Creates a random string whose length is the number of characters specified.
      *
      * <p>Characters will be chosen from the set of characters which match the POSIX [:graph:]
      * regular expression character class. This class contains all visible ASCII characters
@@ -387,8 +387,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is between the inclusive minimum and
-     * the exclusive maximum.</p>
+     * Creates a random string whose length is between the inclusive minimum and
+     * the exclusive maximum.
      *
      * <p>Characters will be chosen from the set of \p{Graph} characters.</p>
      *
@@ -402,8 +402,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters
-     * specified.</p>
+     * Creates a random string whose length is the number of characters
+     * specified.
      *
      * <p>Characters will be chosen from the set of numeric
      * characters.</p>
@@ -416,8 +416,8 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is between the inclusive minimum and
-     * the exclusive maximum.</p>
+     * Creates a random string whose length is between the inclusive minimum and
+     * the exclusive maximum.
      *
      * <p>Characters will be chosen from the set of \p{Digit} characters.</p>
      *
@@ -431,7 +431,7 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>Creates a random string whose length is the number of characters specified.</p>
+     * Creates a random string whose length is the number of characters specified.
      *
      * <p>Characters will be chosen from the set of characters which match the POSIX [:print:]
      * regular expression character class. This class includes all visible ASCII characters and spaces
@@ -447,8 +447,8 @@ public class RandomStringUtils {
 
 
     /**
-     * <p>Creates a random string whose length is between the inclusive minimum and
-     * the exclusive maximum.</p>
+     * Creates a random string whose length is between the inclusive minimum and
+     * the exclusive maximum.
      *
      * <p>Characters will be chosen from the set of \p{Print} characters.</p>
      *
@@ -462,9 +462,9 @@ public class RandomStringUtils {
     }
 
     /**
-     * <p>{@link RandomStringUtils} instances should NOT be constructed in
+     * {@link RandomStringUtils} instances should NOT be constructed in
      * standard programming. Instead, the class should be used as
-     * {@code RandomStringUtils.random(5);}.</p>
+     * {@code RandomStringUtils.random(5);}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean instance
      * to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/Range.java b/src/main/java/org/apache/commons/lang3/Range.java
index 96931a755..c252a6c94 100644
--- a/src/main/java/org/apache/commons/lang3/Range.java
+++ b/src/main/java/org/apache/commons/lang3/Range.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Comparator;
 
 /**
- * <p>An immutable range of objects from a minimum to maximum point inclusive.</p>
+ * An immutable range of objects from a minimum to maximum point inclusive.
  *
  * <p>The objects need to either be implementations of {@link Comparable}
  * or you need to supply a {@link Comparator}.</p>
@@ -57,7 +57,7 @@ public final class Range<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * <p>Obtains a range with the specified minimum and maximum values (both inclusive).</p>
+     * Obtains a range with the specified minimum and maximum values (both inclusive).
      *
      * <p>The range uses the natural ordering of the elements to determine where
      * values lie in the range.</p>
@@ -77,7 +77,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Obtains a range with the specified minimum and maximum values (both inclusive).</p>
+     * Obtains a range with the specified minimum and maximum values (both inclusive).
      *
      * <p>The range uses the specified {@link Comparator} to determine where
      * values lie in the range.</p>
@@ -98,8 +98,8 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Obtains a range using the specified element as both the minimum
-     * and maximum in this range.</p>
+     * Obtains a range using the specified element as both the minimum
+     * and maximum in this range.
      *
      * <p>The range uses the natural ordering of the elements to determine where
      * values lie in the range.</p>
@@ -115,8 +115,8 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Obtains a range using the specified element as both the minimum
-     * and maximum in this range.</p>
+     * Obtains a range using the specified element as both the minimum
+     * and maximum in this range.
      *
      * <p>The range uses the specified {@link Comparator} to determine where
      * values lie in the range.</p>
@@ -185,7 +185,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether the specified element occurs within this range.</p>
+     * Checks whether the specified element occurs within this range.
      *
      * @param element  the element to check for, null returns false
      * @return true if the specified element occurs within this range
@@ -198,7 +198,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range contains all the elements of the specified range.</p>
+     * Checks whether this range contains all the elements of the specified range.
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
@@ -215,11 +215,11 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks where the specified element occurs relative to this range.</p>
+     * Checks where the specified element occurs relative to this range.
      *
      * <p>The API is reminiscent of the Comparable interface returning {@code -1} if
      * the element is before the range, {@code 0} if contained within the range and
-     * {@code 1} if the element is after the range. </p>
+     * {@code 1} if the element is after the range.</p>
      *
      * @param element  the element to check for, not null
      * @return -1, 0 or +1 depending on the element's location relative to the range
@@ -237,7 +237,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Compares this range to another object to test if they are equal.</p>.
+     * Compares this range to another object to test if they are equal..
      *
      * <p>To be equal, the minimum and maximum values must be equal, which
      * ignores any differences in the comparator.</p>
@@ -261,10 +261,9 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>
      * Fits the given element into this range by returning the given element or, if out of bounds, the range minimum if
      * below, or the range maximum if above.
-     * </p>
+     *
      * <pre>
      * Range&lt;Integer&gt; range = Range.between(16, 64);
      * range.fit(-9) --&gt;  16
@@ -294,7 +293,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Gets the comparator being used to determine if objects are within the range.</p>
+     * Gets the comparator being used to determine if objects are within the range.
      *
      * <p>Natural ordering uses an internal comparator implementation, thus this
      * method never returns null. See {@link #isNaturalOrdering()}.</p>
@@ -306,7 +305,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Gets the maximum value in this range.</p>
+     * Gets the maximum value in this range.
      *
      * @return the maximum value in this range, not null
      */
@@ -315,7 +314,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Gets the minimum value in this range.</p>
+     * Gets the minimum value in this range.
      *
      * @return the minimum value in this range, not null
      */
@@ -324,7 +323,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Gets a suitable hash code for the range.</p>
+     * Gets a suitable hash code for the range.
      *
      * @return a hash code value for this object
      */
@@ -362,7 +361,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range is after the specified element.</p>
+     * Checks whether this range is after the specified element.
      *
      * @param element  the element to check for, null returns false
      * @return true if this range is entirely after the specified element
@@ -375,7 +374,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range is completely after the specified range.</p>
+     * Checks whether this range is completely after the specified range.
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
@@ -391,7 +390,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range is before the specified element.</p>
+     * Checks whether this range is before the specified element.
      *
      * @param element  the element to check for, null returns false
      * @return true if this range is entirely before the specified element
@@ -404,7 +403,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range is completely before the specified range.</p>
+     * Checks whether this range is completely before the specified range.
      *
      * <p>This method may fail if the ranges have two different comparators or element types.</p>
      *
@@ -420,7 +419,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range ends with the specified element.</p>
+     * Checks whether this range ends with the specified element.
      *
      * @param element  the element to check for, null returns false
      * @return true if the specified element occurs within this range
@@ -433,7 +432,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Whether or not the Range is using the natural ordering of the elements.</p>
+     * Whether or not the Range is using the natural ordering of the elements.
      *
      * <p>Natural ordering uses an internal comparator implementation, thus this
      * method is the only way to check if a null comparator was specified.</p>
@@ -445,7 +444,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range is overlapped by the specified range.</p>
+     * Checks whether this range is overlapped by the specified range.
      *
      * <p>Two ranges overlap if there is at least one element in common.</p>
      *
@@ -466,7 +465,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Checks whether this range starts with the specified element.</p>
+     * Checks whether this range starts with the specified element.
      *
      * @param element  the element to check for, null returns false
      * @return true if the specified element occurs within this range
@@ -479,7 +478,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Gets the range as a {@link String}.</p>
+     * Gets the range as a {@link String}.
      *
      * <p>The format of the String is '[<i>min</i>..<i>max</i>]'.</p>
      *
@@ -494,7 +493,7 @@ public final class Range<T> implements Serializable {
     }
 
     /**
-     * <p>Formats the receiver using the given format.</p>
+     * Formats the receiver using the given format.
      *
      * <p>This uses {@link java.util.Formattable} to perform the formatting. Three variables may
      * be used to embed the minimum, maximum and comparator.
diff --git a/src/main/java/org/apache/commons/lang3/RegExUtils.java b/src/main/java/org/apache/commons/lang3/RegExUtils.java
index 0efbceee7..36ecf42dc 100644
--- a/src/main/java/org/apache/commons/lang3/RegExUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RegExUtils.java
@@ -19,14 +19,14 @@ package org.apache.commons.lang3;
 import java.util.regex.Pattern;
 
 /**
- * <p>Helpers to process Strings using regular expressions.</p>
+ * Helpers to process Strings using regular expressions.
  * @see java.util.regex.Pattern
  * @since 3.8
  */
 public class RegExUtils {
 
     /**
-     * <p>Removes each substring of the text String that matches the given regular expression pattern.</p>
+     * Removes each substring of the text String that matches the given regular expression pattern.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -62,7 +62,7 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Removes each substring of the text String that matches the given regular expression.</p>
+     * Removes each substring of the text String that matches the given regular expression.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -108,7 +108,7 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Removes the first substring of the text string that matches the given regular expression pattern.</p>
+     * Removes the first substring of the text string that matches the given regular expression pattern.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -144,7 +144,7 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Removes the first substring of the text string that matches the given regular expression.</p>
+     * Removes the first substring of the text string that matches the given regular expression.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -189,7 +189,7 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Removes each substring of the source String that matches the given regular expression using the DOTALL option.</p>
+     * Removes each substring of the source String that matches the given regular expression using the DOTALL option.
      *
      * This call is a {@code null} safe equivalent to:
      * <ul>
@@ -220,7 +220,7 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Replaces each substring of the text String that matches the given regular expression pattern with the given replacement.</p>
+     * Replaces each substring of the text String that matches the given regular expression pattern with the given replacement.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -263,8 +263,8 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Replaces each substring of the text String that matches the given regular expression
-     * with the given replacement.</p>
+     * Replaces each substring of the text String that matches the given regular expression
+     * with the given replacement.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -317,8 +317,8 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Replaces the first substring of the text string that matches the given regular expression pattern
-     * with the given replacement.</p>
+     * Replaces the first substring of the text string that matches the given regular expression pattern
+     * with the given replacement.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -360,8 +360,8 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Replaces the first substring of the text string that matches the given regular expression
-     * with the given replacement.</p>
+     * Replaces the first substring of the text string that matches the given regular expression
+     * with the given replacement.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -412,8 +412,8 @@ public class RegExUtils {
     }
 
     /**
-     * <p>Replaces each substring of the source String that matches the given regular expression with the given
-     * replacement using the {@link Pattern#DOTALL} option. DOTALL is also known as single-line mode in Perl.</p>
+     * Replaces each substring of the source String that matches the given regular expression with the given
+     * replacement using the {@link Pattern#DOTALL} option. DOTALL is also known as single-line mode in Perl.
      *
      * This call is a {@code null} safe equivalent to:
      * <ul>
diff --git a/src/main/java/org/apache/commons/lang3/SerializationException.java b/src/main/java/org/apache/commons/lang3/SerializationException.java
index 618fa82cf..c68787312 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationException.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationException.java
@@ -17,7 +17,7 @@
 package org.apache.commons.lang3;
 
 /**
- * <p>Exception thrown when the Serialization process fails.</p>
+ * Exception thrown when the Serialization process fails.
  *
  * <p>The original error is wrapped within this one.</p>
  *
@@ -34,15 +34,15 @@ public class SerializationException extends RuntimeException {
     private static final long serialVersionUID = 4029025366392702726L;
 
     /**
-     * <p>Constructs a new {@link SerializationException} without specified
-     * detail message.</p>
+     * Constructs a new {@link SerializationException} without specified
+     * detail message.
      */
     public SerializationException() {
     }
 
     /**
-     * <p>Constructs a new {@link SerializationException} with specified
-     * detail message.</p>
+     * Constructs a new {@link SerializationException} with specified
+     * detail message.
      *
      * @param msg  The error message.
      */
@@ -51,8 +51,8 @@ public class SerializationException extends RuntimeException {
     }
 
     /**
-     * <p>Constructs a new {@link SerializationException} with specified
-     * nested {@link Throwable}.</p>
+     * Constructs a new {@link SerializationException} with specified
+     * nested {@link Throwable}.
      *
      * @param cause  The {@link Exception} or {@link Error}
      *  that caused this exception to be thrown.
@@ -62,8 +62,8 @@ public class SerializationException extends RuntimeException {
     }
 
     /**
-     * <p>Constructs a new {@link SerializationException} with specified
-     * detail message and nested {@link Throwable}.</p>
+     * Constructs a new {@link SerializationException} with specified
+     * detail message and nested {@link Throwable}.
      *
      * @param msg    The error message.
      * @param cause  The {@link Exception} or {@link Error}
diff --git a/src/main/java/org/apache/commons/lang3/SerializationUtils.java b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
index 2bc001ab6..ef3655e90 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
@@ -29,8 +29,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * <p>Assists with the serialization process and performs additional functionality based
- * on serialization.</p>
+ * Assists with the serialization process and performs additional functionality based
+ * on serialization.
  *
  * <ul>
  * <li>Deep clone using serialization
@@ -47,17 +47,17 @@ import java.util.Map;
 public class SerializationUtils {
 
     /**
-     * <p>Custom specialization of the standard JDK {@link java.io.ObjectInputStream}
+     * Custom specialization of the standard JDK {@link java.io.ObjectInputStream}
      * that uses a custom  {@link ClassLoader} to resolve a class.
      * If the specified {@link ClassLoader} is not able to resolve the class,
      * the context classloader of the current thread will be used.
      * This way, the standard deserialization work also in web-application
      * containers and application servers, no matter in which of the
      * {@link ClassLoader} the particular class that encapsulates
-     * serialization/deserialization lives. </p>
+     * serialization/deserialization lives.
      *
      * <p>For more in-depth information about the problem for which this
-     * class here is a workaround, see the JIRA issue LANG-626. </p>
+     * class here is a workaround, see the JIRA issue LANG-626.</p>
      */
      static class ClassLoaderAwareObjectInputStream extends ObjectInputStream {
         private static final Map<String, Class<?>> primitiveTypes =
@@ -118,7 +118,7 @@ public class SerializationUtils {
     }
 
     /**
-     * <p>Deep clone an {@link Object} using serialization.</p>
+     * Deep clone an {@link Object} using serialization.
      *
      * <p>This is many times slower than writing clone methods by hand
      * on all objects in your object graph. However, for complex object
@@ -153,9 +153,7 @@ public class SerializationUtils {
     }
 
     /**
-     * <p>
      * Deserializes a single {@link Object} from an array of bytes.
-     * </p>
      *
      * <p>
      * If the call site incorrectly types the return value, a {@link ClassCastException} is thrown from the call site.
@@ -176,9 +174,7 @@ public class SerializationUtils {
     }
 
     /**
-     * <p>
      * Deserializes an {@link Object} from the specified stream.
-     * </p>
      *
      * <p>
      * The stream will be closed once the object is written. This avoids the need for a finally clause, and maybe also
@@ -232,8 +228,8 @@ public class SerializationUtils {
     }
 
     /**
-     * <p>Serializes an {@link Object} to a byte array for
-     * storage/serialization.</p>
+     * Serializes an {@link Object} to a byte array for
+     * storage/serialization.
      *
      * @param obj  the object to serialize to bytes
      * @return a byte[] with the converted Serializable
@@ -246,7 +242,7 @@ public class SerializationUtils {
     }
 
     /**
-     * <p>Serializes an {@link Object} to the specified stream.</p>
+     * Serializes an {@link Object} to the specified stream.
      *
      * <p>The stream will be closed once the object is written.
      * This avoids the need for a finally clause, and maybe also exception
@@ -271,8 +267,8 @@ public class SerializationUtils {
     }
 
     /**
-     * <p>SerializationUtils instances should NOT be constructed in standard programming.
-     * Instead, the class should be used as {@code SerializationUtils.clone(object)}.</p>
+     * SerializationUtils instances should NOT be constructed in standard programming.
+     * Instead, the class should be used as {@code SerializationUtils.clone(object)}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean instance
      * to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
index 3233ad612..c70020ffe 100644
--- a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
@@ -31,8 +31,8 @@ import org.apache.commons.lang3.text.translate.UnicodeUnescaper;
 import org.apache.commons.lang3.text.translate.UnicodeUnpairedSurrogateRemover;
 
 /**
- * <p>Escapes and unescapes {@link String}s for
- * Java, Java Script, HTML and XML.</p>
+ * Escapes and unescapes {@link String}s for
+ * Java, Java Script, HTML and XML.
  *
  * <p>#ThreadSafe#</p>
  * @since 2.0
@@ -418,8 +418,8 @@ public class StringEscapeUtils {
     /* Helper functions */
 
     /**
-     * <p>{@link StringEscapeUtils} instances should NOT be constructed in
-     * standard programming.</p>
+     * {@link StringEscapeUtils} instances should NOT be constructed in
+     * standard programming.
      *
      * <p>Instead, the class should be used as:</p>
      * <pre>StringEscapeUtils.escapeJava("foo");</pre>
@@ -431,7 +431,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using Java String rules.</p>
+     * Escapes the characters in a {@link String} using Java String rules.
      *
      * <p>Deals correctly with quotes and control-chars (tab, backslash, cr, ff, etc.) </p>
      *
@@ -455,7 +455,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using EcmaScript String rules.</p>
+     * Escapes the characters in a {@link String} using EcmaScript String rules.
      * <p>Escapes any values it finds into their EcmaScript String form.
      * Deals correctly with quotes and control-chars (tab, backslash, cr, ff, etc.) </p>
      *
@@ -465,7 +465,7 @@ public class StringEscapeUtils {
      * <p>The only difference between Java strings and EcmaScript strings
      * is that in EcmaScript, a single quote and forward-slash (/) are escaped.</p>
      *
-     * <p>Note that EcmaScript is best known by the JavaScript and ActionScript dialects. </p>
+     * <p>Note that EcmaScript is best known by the JavaScript and ActionScript dialects.</p>
      *
      * <p>Example:</p>
      * <pre>
@@ -483,7 +483,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using Json String rules.</p>
+     * Escapes the characters in a {@link String} using Json String rules.
      * <p>Escapes any values it finds into their Json String form.
      * Deals correctly with quotes and control-chars (tab, backslash, cr, ff, etc.) </p>
      *
@@ -493,7 +493,7 @@ public class StringEscapeUtils {
      * <p>The only difference between Java strings and Json strings
      * is that in Json, forward-slash (/) is escaped.</p>
      *
-     * <p>See https://www.ietf.org/rfc/rfc4627.txt for further details. </p>
+     * <p>See https://www.ietf.org/rfc/rfc4627.txt for further details.</p>
      *
      * <p>Example:</p>
      * <pre>
@@ -511,10 +511,10 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Unescapes any Java literals found in the {@link String}.
+     * Unescapes any Java literals found in the {@link String}.
      * For example, it will turn a sequence of {@code '\'} and
      * {@code 'n'} into a newline character, unless the {@code '\'}
-     * is preceded by another {@code '\'}.</p>
+     * is preceded by another {@code '\'}.
      *
      * @param input  the {@link String} to unescape, may be null
      * @return a new unescaped {@link String}, {@code null} if null string input
@@ -524,7 +524,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Unescapes any EcmaScript literals found in the {@link String}.</p>
+     * Unescapes any EcmaScript literals found in the {@link String}.
      *
      * <p>For example, it will turn a sequence of {@code '\'} and {@code 'n'}
      * into a newline character, unless the {@code '\'} is preceded by another
@@ -541,7 +541,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Unescapes any Json literals found in the {@link String}.</p>
+     * Unescapes any Json literals found in the {@link String}.
      *
      * <p>For example, it will turn a sequence of {@code '\'} and {@code 'n'}
      * into a newline character, unless the {@code '\'} is preceded by another
@@ -558,7 +558,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using HTML entities.</p>
+     * Escapes the characters in a {@link String} using HTML entities.
      *
      * <p>
      * For example:
@@ -571,7 +571,7 @@ public class StringEscapeUtils {
      *
      * <p>Supports all known HTML 4.0 entities, including funky accents.
      * Note that the commonly used apostrophe escape character (&amp;apos;)
-     * is not a legal entity and so is not supported). </p>
+     * is not a legal entity and so is not supported).</p>
      *
      * @param input  the {@link String} to escape, may be null
      * @return a new escaped {@link String}, {@code null} if null string input
@@ -589,8 +589,8 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using HTML entities.</p>
-     * <p>Supports only the HTML 3.0 entities. </p>
+     * Escapes the characters in a {@link String} using HTML entities.
+     * <p>Supports only the HTML 3.0 entities.</p>
      *
      * @param input  the {@link String} to escape, may be null
      * @return a new escaped {@link String}, {@code null} if null string input
@@ -602,9 +602,9 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Unescapes a string containing entity escapes to a string
+     * Unescapes a string containing entity escapes to a string
      * containing the actual Unicode characters corresponding to the
-     * escapes. Supports HTML 4.0 entities.</p>
+     * escapes. Supports HTML 4.0 entities.
      *
      * <p>For example, the string {@code "&lt;Fran&ccedil;ais&gt;"}
      * will become {@code "<Français>"}</p>
@@ -623,9 +623,9 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Unescapes a string containing entity escapes to a string
+     * Unescapes a string containing entity escapes to a string
      * containing the actual Unicode characters corresponding to the
-     * escapes. Supports only HTML 3.0 entities.</p>
+     * escapes. Supports only HTML 3.0 entities.
      *
      * @param input  the {@link String} to unescape, may be null
      * @return a new unescaped {@link String}, {@code null} if null string input
@@ -637,7 +637,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using XML entities.</p>
+     * Escapes the characters in a {@link String} using XML entities.
      *
      * <p>For example: {@code "bread" & "butter"} =&gt;
      * {@code &quot;bread&quot; &amp; &quot;butter&quot;}.
@@ -662,7 +662,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using XML entities.</p>
+     * Escapes the characters in a {@link String} using XML entities.
      *
      * <p>For example: {@code "bread" & "butter"} =&gt;
      * {@code &quot;bread&quot; &amp; &quot;butter&quot;}.
@@ -694,7 +694,7 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Escapes the characters in a {@link String} using XML entities.</p>
+     * Escapes the characters in a {@link String} using XML entities.
      *
      * <p>For example: {@code "bread" & "butter"} =&gt;
      * {@code &quot;bread&quot; &amp; &quot;butter&quot;}.
@@ -724,15 +724,15 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Unescapes a string containing XML entity escapes to a string
+     * Unescapes a string containing XML entity escapes to a string
      * containing the actual Unicode characters corresponding to the
-     * escapes.</p>
+     * escapes.
      *
      * <p>Supports only the five basic XML entities (gt, lt, quot, amp, apos).
      * Does not support DTDs or external entities.</p>
      *
      * <p>Note that numerical \\u Unicode codes are unescaped to their respective
-     *    Unicode characters. This may change in future releases. </p>
+     *    Unicode characters. This may change in future releases.</p>
      *
      * @param input  the {@link String} to unescape, may be null
      * @return a new unescaped {@link String}, {@code null} if null string input
@@ -746,8 +746,8 @@ public class StringEscapeUtils {
 
 
     /**
-     * <p>Returns a {@link String} value for a CSV column enclosed in double quotes,
-     * if required.</p>
+     * Returns a {@link String} value for a CSV column enclosed in double quotes,
+     * if required.
      *
      * <p>If the value contains a comma, newline or double quote, then the
      *    String value is returned enclosed in double quotes.</p>
@@ -770,14 +770,14 @@ public class StringEscapeUtils {
     }
 
     /**
-     * <p>Returns a {@link String} value for an unescaped CSV column. </p>
+     * Returns a {@link String} value for an unescaped CSV column.
      *
      * <p>If the value is enclosed in double quotes, and contains a comma, newline
      *    or double quote, then quotes are removed.
      * </p>
      *
      * <p>Any double quote escaped characters (a pair of double quotes) are unescaped
-     *    to just one double quote. </p>
+     *    to just one double quote.</p>
      *
      * <p>If the value is not enclosed in double quotes, or is and does not contain a
      *    comma, newline or double quote, then the String value is returned unchanged.</p>
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index a4a60738a..b242191a3 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -36,8 +36,8 @@ import org.apache.commons.lang3.stream.LangCollectors;
 import org.apache.commons.lang3.stream.Streams;
 
 /**
- * <p>Operations on {@link java.lang.String} that are
- * {@code null} safe.</p>
+ * Operations on {@link java.lang.String} that are
+ * {@code null} safe.
  *
  * <ul>
  *  <li><b>IsEmpty/IsBlank</b>
@@ -178,7 +178,7 @@ public class StringUtils {
     public static final int INDEX_NOT_FOUND = -1;
 
     /**
-     * <p>The maximum size to which the padding constant(s) can expand.</p>
+     * The maximum size to which the padding constant(s) can expand.
      */
     private static final int PAD_LIMIT = 8192;
 
@@ -188,8 +188,8 @@ public class StringUtils {
     private static final Pattern STRIP_ACCENTS_PATTERN = Pattern.compile("\\p{InCombiningDiacriticalMarks}+"); //$NON-NLS-1$
 
     /**
-     * <p>Abbreviates a String using ellipses. This will turn
-     * "Now is the time for all good men" into "Now is the time for..."</p>
+     * Abbreviates a String using ellipses. This will turn
+     * "Now is the time for all good men" into "Now is the time for..."
      *
      * <p>Specifically:</p>
      * <ul>
@@ -223,8 +223,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Abbreviates a String using ellipses. This will turn
-     * "Now is the time for all good men" into "...is the time for..."</p>
+     * Abbreviates a String using ellipses. This will turn
+     * "Now is the time for all good men" into "...is the time for..."
      *
      * <p>Works like {@code abbreviate(String, int)}, but allows you to specify
      * a "left edge" offset.  Note that this left edge is not necessarily going to
@@ -262,9 +262,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Abbreviates a String using another given String as replacement marker. This will turn
+     * Abbreviates a String using another given String as replacement marker. This will turn
      * "Now is the time for all good men" into "Now is the time for..." if "..." was defined
-     * as the replacement marker.</p>
+     * as the replacement marker.
      *
      * <p>Specifically:</p>
      * <ul>
@@ -301,9 +301,9 @@ public class StringUtils {
         return abbreviate(str, abbrevMarker, 0, maxWidth);
     }
     /**
-     * <p>Abbreviates a String using a given replacement marker. This will turn
+     * Abbreviates a String using a given replacement marker. This will turn
      * "Now is the time for all good men" into "...is the time for..." if "..." was defined
-     * as the replacement marker.</p>
+     * as the replacement marker.
      *
      * <p>Works like {@code abbreviate(String, String, int)}, but allows you to specify
      * a "left edge" offset.  Note that this left edge is not necessarily going to
@@ -374,8 +374,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Abbreviates a String to the length passed, replacing the middle characters with the supplied
-     * replacement String.</p>
+     * Abbreviates a String to the length passed, replacing the middle characters with the supplied
+     * replacement String.
      *
      * <p>This abbreviation only occurs if the following criteria is met:</p>
      * <ul>
@@ -518,8 +518,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Capitalizes a String changing the first character to title case as
-     * per {@link Character#toTitleCase(int)}. No other characters are changed.</p>
+     * Capitalizes a String changing the first character to title case as
+     * per {@link Character#toTitleCase(int)}. No other characters are changed.
      *
      * <p>For a word based algorithm, see {@link org.apache.commons.text.WordUtils#capitalize(String)}.
      * A {@code null} input String returns {@code null}.</p>
@@ -563,8 +563,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Centers a String in a larger String of size {@code size}
-     * using the space character (' ').</p>
+     * Centers a String in a larger String of size {@code size}
+     * using the space character (' ').
      *
      * <p>If the size is less than the String length, the original String is returned.
      * A {@code null} String returns {@code null}.
@@ -590,8 +590,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Centers a String in a larger String of size {@code size}.
-     * Uses a supplied character as the value to pad the String with.</p>
+     * Centers a String in a larger String of size {@code size}.
+     * Uses a supplied character as the value to pad the String with.
      *
      * <p>If the size is less than the String length, the String is returned.
      * A {@code null} String returns {@code null}.
@@ -628,8 +628,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Centers a String in a larger String of size {@code size}.
-     * Uses a supplied String as the value to pad the String with.</p>
+     * Centers a String in a larger String of size {@code size}.
+     * Uses a supplied String as the value to pad the String with.
      *
      * <p>If the size is less than the String length, the String is returned.
      * A {@code null} String returns {@code null}.
@@ -671,9 +671,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes one newline from end of a String if it's there,
+     * Removes one newline from end of a String if it's there,
      * otherwise leave it alone.  A newline is &quot;{@code \n}&quot;,
-     * &quot;{@code \r}&quot;, or &quot;{@code \r\n}&quot;.</p>
+     * &quot;{@code \r}&quot;, or &quot;{@code \r\n}&quot;.
      *
      * <p>NOTE: This method changed in 2.0.
      * It now more closely matches Perl chomp.</p>
@@ -722,8 +722,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes {@code separator} from the end of
-     * {@code str} if it's there, otherwise leave it alone.</p>
+     * Removes {@code separator} from the end of
+     * {@code str} if it's there, otherwise leave it alone.
      *
      * <p>NOTE: This method changed in version 2.0.
      * It now more closely matches Perl chomp.
@@ -754,7 +754,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Remove the last character from a String.</p>
+     * Remove the last character from a String.
      *
      * <p>If the String ends in {@code \r\n}, then remove both
      * of them.</p>
@@ -794,7 +794,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compare two Strings lexicographically, as per {@link String#compareTo(String)}, returning :</p>
+     * Compare two Strings lexicographically, as per {@link String#compareTo(String)}, returning :
      * <ul>
      *  <li>{@code int = 0}, if {@code str1} is equal to {@code str2} (or both {@code null})</li>
      *  <li>{@code int < 0}, if {@code str1} is less than {@code str2}</li>
@@ -830,7 +830,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compare two Strings lexicographically, as per {@link String#compareTo(String)}, returning :</p>
+     * Compare two Strings lexicographically, as per {@link String#compareTo(String)}, returning :
      * <ul>
      *  <li>{@code int = 0}, if {@code str1} is equal to {@code str2} (or both {@code null})</li>
      *  <li>{@code int < 0}, if {@code str1} is less than {@code str2}</li>
@@ -877,8 +877,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compare two Strings lexicographically, ignoring case differences,
-     * as per {@link String#compareToIgnoreCase(String)}, returning :</p>
+     * Compare two Strings lexicographically, ignoring case differences,
+     * as per {@link String#compareToIgnoreCase(String)}, returning :
      * <ul>
      *  <li>{@code int = 0}, if {@code str1} is equal to {@code str2} (or both {@code null})</li>
      *  <li>{@code int < 0}, if {@code str1} is less than {@code str2}</li>
@@ -918,8 +918,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compare two Strings lexicographically, ignoring case differences,
-     * as per {@link String#compareToIgnoreCase(String)}, returning :</p>
+     * Compare two Strings lexicographically, ignoring case differences,
+     * as per {@link String#compareToIgnoreCase(String)}, returning :
      * <ul>
      *  <li>{@code int = 0}, if {@code str1} is equal to {@code str2} (or both {@code null})</li>
      *  <li>{@code int < 0}, if {@code str1} is less than {@code str2}</li>
@@ -970,8 +970,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if CharSequence contains a search CharSequence, handling {@code null}.
-     * This method uses {@link String#indexOf(String)} if possible.</p>
+     * Checks if CharSequence contains a search CharSequence, handling {@code null}.
+     * This method uses {@link String#indexOf(String)} if possible.
      *
      * <p>A {@code null} CharSequence will return {@code false}.</p>
      *
@@ -999,8 +999,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if CharSequence contains a search character, handling {@code null}.
-     * This method uses {@link String#indexOf(int)} if possible.</p>
+     * Checks if CharSequence contains a search character, handling {@code null}.
+     * This method uses {@link String#indexOf(int)} if possible.
      *
      * <p>A {@code null} or empty ("") CharSequence will return {@code false}.</p>
      *
@@ -1026,8 +1026,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains any character in the given
-     * set of characters.</p>
+     * Checks if the CharSequence contains any character in the given
+     * set of characters.
      *
      * <p>A {@code null} CharSequence will return {@code false}.
      * A {@code null} or zero length search array will return {@code false}.</p>
@@ -1080,9 +1080,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Checks if the CharSequence contains any character in the given set of characters.
-     * </p>
      *
      * <p>
      * A {@code null} CharSequence will return {@code false}. A {@code null} search CharSequence will return
@@ -1118,9 +1116,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Checks if the CharSequence contains any of the CharSequences in the given array.
-     * </p>
      *
      * <p>
      * A {@code null} {@code cs} CharSequence will return {@code false}. A {@code null} or zero length search array will
@@ -1137,7 +1133,6 @@ public class StringUtils {
      * StringUtils.containsAny("abc", "d", "abc")  = true
      * </pre>
      *
-     *
      * @param cs The CharSequence to check, may be null
      * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be
      *        null as well.
@@ -1149,9 +1144,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Checks if the CharSequence contains any of the CharSequences in the given array.
-     * </p>
      *
      * <p>
      * A {@code null} {@code cs} CharSequence will return {@code false}. A {@code null} or zero length search array will
@@ -1178,9 +1171,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Checks if the CharSequence contains any of the CharSequences in the given array, ignoring case.
-     * </p>
      *
      * <p>
      * A {@code null} {@code cs} CharSequence will return {@code false}. A {@code null} or zero length search array will
@@ -1199,7 +1190,6 @@ public class StringUtils {
      * StringUtils.containsAny("ABC", "d", "abc")  = true
      * </pre>
      *
-     *
      * @param cs The CharSequence to check, may be null
      * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be
      *        null as well.
@@ -1211,11 +1201,11 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if CharSequence contains a search CharSequence irrespective of case,
+     * Checks if CharSequence contains a search CharSequence irrespective of case,
      * handling {@code null}. Case-insensitivity is defined as by
      * {@link String#equalsIgnoreCase(String)}.
      *
-     * <p>A {@code null} CharSequence will return {@code false}.</p>
+     * <p>A {@code null} CharSequence will return {@code false}.
      *
      * <pre>
      * StringUtils.containsIgnoreCase(null, *) = false
@@ -1249,7 +1239,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks that the CharSequence does not contain certain characters.</p>
+     * Checks that the CharSequence does not contain certain characters.
      *
      * <p>A {@code null} CharSequence will return {@code true}.
      * A {@code null} invalid character array will return {@code true}.
@@ -1301,7 +1291,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks that the CharSequence does not contain certain characters.</p>
+     * Checks that the CharSequence does not contain certain characters.
      *
      * <p>A {@code null} CharSequence will return {@code true}.
      * A {@code null} invalid character array will return {@code true}.
@@ -1331,7 +1321,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only certain characters.</p>
+     * Checks if the CharSequence contains only certain characters.
      *
      * <p>A {@code null} CharSequence will return {@code false}.
      * A {@code null} valid character array will return {@code false}.
@@ -1367,7 +1357,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only certain characters.</p>
+     * Checks if the CharSequence contains only certain characters.
      *
      * <p>A {@code null} CharSequence will return {@code false}.
      * A {@code null} valid character String will return {@code false}.
@@ -1397,7 +1387,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check whether the given CharSequence contains any whitespace characters.</p>
+     * Check whether the given CharSequence contains any whitespace characters.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -1431,7 +1421,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Counts how many times the char appears in the given string.</p>
+     * Counts how many times the char appears in the given string.
      *
      * <p>A {@code null} or empty ("") String input returns {@code 0}.</p>
      *
@@ -1464,8 +1454,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Counts how many times the substring appears in the larger string.
-     * Note that the code only counts non-overlapping matches.</p>
+     * Counts how many times the substring appears in the larger string.
+     * Note that the code only counts non-overlapping matches.
      *
      * <p>A {@code null} or empty ("") String input returns {@code 0}.</p>
      *
@@ -1499,8 +1489,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns either the passed in CharSequence, or if the CharSequence is
-     * whitespace, empty ("") or {@code null}, the value of {@code defaultStr}.</p>
+     * Returns either the passed in CharSequence, or if the CharSequence is
+     * whitespace, empty ("") or {@code null}, the value of {@code defaultStr}.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -1523,8 +1513,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns either the passed in CharSequence, or if the CharSequence is
-     * empty or {@code null}, the value of {@code defaultStr}.</p>
+     * Returns either the passed in CharSequence, or if the CharSequence is
+     * empty or {@code null}, the value of {@code defaultStr}.
      *
      * <pre>
      * StringUtils.defaultIfEmpty(null, "NULL")  = "NULL"
@@ -1545,8 +1535,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns either the passed in String,
-     * or if the String is {@code null}, an empty String ("").</p>
+     * Returns either the passed in String,
+     * or if the String is {@code null}, an empty String ("").
      *
      * <pre>
      * StringUtils.defaultString(null)  = ""
@@ -1588,8 +1578,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Deletes all whitespaces from a String as defined by
-     * {@link Character#isWhitespace(char)}.</p>
+     * Deletes all whitespaces from a String as defined by
+     * {@link Character#isWhitespace(char)}.
      *
      * <pre>
      * StringUtils.deleteWhitespace(null)         = null
@@ -1623,10 +1613,10 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares two Strings, and returns the portion where they differ.
+     * Compares two Strings, and returns the portion where they differ.
      * More precisely, return the remainder of the second String,
      * starting from where it's different from the first. This means that
-     * the difference between "abc" and "ab" is the empty String and not "c". </p>
+     * the difference between "abc" and "ab" is the empty String and not "c".
      *
      * <p>For example,
      * {@code difference("i am a machine", "i am a robot") -> "robot"}.</p>
@@ -1665,7 +1655,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check if a CharSequence ends with a specified suffix.</p>
+     * Check if a CharSequence ends with a specified suffix.
      *
      * <p>{@code null}s are handled without exceptions. Two {@code null}
      * references are considered to be equal. The comparison is case-sensitive.</p>
@@ -1693,7 +1683,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check if a CharSequence ends with a specified suffix (optionally case insensitive).</p>
+     * Check if a CharSequence ends with a specified suffix (optionally case insensitive).
      *
      * @see java.lang.String#endsWith(String)
      * @param str  the CharSequence to check, may be null
@@ -1715,7 +1705,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check if a CharSequence ends with any of the provided case-sensitive suffixes.</p>
+     * Check if a CharSequence ends with any of the provided case-sensitive suffixes.
      *
      * <pre>
      * StringUtils.endsWithAny(null, null)      = false
@@ -1748,7 +1738,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case insensitive check if a CharSequence ends with a specified suffix.</p>
+     * Case insensitive check if a CharSequence ends with a specified suffix.
      *
      * <p>{@code null}s are handled without exceptions. Two {@code null}
      * references are considered to be equal. The comparison is case insensitive.</p>
@@ -1775,8 +1765,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares two CharSequences, returning {@code true} if they represent
-     * equal sequences of characters.</p>
+     * Compares two CharSequences, returning {@code true} if they represent
+     * equal sequences of characters.
      *
      * <p>{@code null}s are handled without exceptions. Two {@code null}
      * references are considered to be equal. The comparison is <strong>case-sensitive</strong>.</p>
@@ -1820,8 +1810,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
-     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}.</p>
+     * Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
+     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}.
      *
      * <pre>
      * StringUtils.equalsAny(null, (CharSequence[]) null) = false
@@ -1850,8 +1840,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
-     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}, ignoring case.</p>
+     * Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
+     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}, ignoring case.
      *
      * <pre>
      * StringUtils.equalsAnyIgnoreCase(null, (CharSequence[]) null) = false
@@ -1880,8 +1870,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares two CharSequences, returning {@code true} if they represent
-     * equal sequences of characters, ignoring case.</p>
+     * Compares two CharSequences, returning {@code true} if they represent
+     * equal sequences of characters, ignoring case.
      *
      * <p>{@code null}s are handled without exceptions. Two {@code null}
      * references are considered equal. The comparison is <strong>case insensitive</strong>.</p>
@@ -1914,8 +1904,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns the first value in the array which is not empty (""),
-     * {@code null} or whitespace only.</p>
+     * Returns the first value in the array which is not empty (""),
+     * {@code null} or whitespace only.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -1951,7 +1941,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns the first value in the array which is not empty.</p>
+     * Returns the first value in the array which is not empty.
      *
      * <p>If all values are empty or the array is {@code null}
      * or empty then {@code null} is returned.</p>
@@ -2013,8 +2003,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares all Strings in an array and returns the initial sequence of
-     * characters that is common to all of them.</p>
+     * Compares all Strings in an array and returns the initial sequence of
+     * characters that is common to all of them.
      *
      * <p>For example,
      * {@code getCommonPrefix(new String[] {"i am a machine", "i am a robot"}) -&gt; "i am a "}</p>
@@ -2066,8 +2056,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if a String {@code str} contains Unicode digits,
-     * if yes then concatenate all the digits in {@code str} and return it as a String.</p>
+     * Checks if a String {@code str} contains Unicode digits,
+     * if yes then concatenate all the digits in {@code str} and return it as a String.
      *
      * <p>An empty ("") String will be returned if no digits found in {@code str}.</p>
      *
@@ -2103,7 +2093,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Find the Fuzzy Distance which indicates the similarity score between two Strings.</p>
+     * Find the Fuzzy Distance which indicates the similarity score between two Strings.
      *
      * <p>This string matching algorithm is similar to the algorithms of editors such as Sublime Text,
      * TextMate, Atom and others. One point is given for every matched character. Subsequent
@@ -2187,8 +2177,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns either the passed in CharSequence, or if the CharSequence is
-     * whitespace, empty ("") or {@code null}, the value supplied by {@code defaultStrSupplier}.</p>
+     * Returns either the passed in CharSequence, or if the CharSequence is
+     * whitespace, empty ("") or {@code null}, the value supplied by {@code defaultStrSupplier}.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -2216,8 +2206,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns either the passed in CharSequence, or if the CharSequence is
-     * empty or {@code null}, the value supplied by {@code defaultStrSupplier}.</p>
+     * Returns either the passed in CharSequence, or if the CharSequence is
+     * empty or {@code null}, the value supplied by {@code defaultStrSupplier}.
      *
      * <p>Caller responsible for thread-safety and exception handling of default value supplier</p>
      *
@@ -2244,7 +2234,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Find the Jaro Winkler Distance which indicates the similarity score between two Strings.</p>
+     * Find the Jaro Winkler Distance which indicates the similarity score between two Strings.
      *
      * <p>The Jaro measure is the weighted sum of percentage of matched characters from each file and transposed characters.
      * Winkler increased this measure for matching initial characters.</p>
@@ -2297,7 +2287,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Find the Levenshtein distance between two Strings.</p>
+     * Find the Levenshtein distance between two Strings.
      *
      * <p>This is the number of changes needed to change one String into
      * another, where each change is a single character modification (deletion,
@@ -2388,8 +2378,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Find the Levenshtein distance between two Strings if it's less than or equal to a given
-     * threshold.</p>
+     * Find the Levenshtein distance between two Strings if it's less than or equal to a given
+     * threshold.
      *
      * <p>This is the number of changes needed to change one String into
      * another, where each change is a single character modification (deletion,
@@ -2558,8 +2548,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the first index within a CharSequence, handling {@code null}.
-     * This method uses {@link String#indexOf(String, int)} if possible.</p>
+     * Finds the first index within a CharSequence, handling {@code null}.
+     * This method uses {@link String#indexOf(String, int)} if possible.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.</p>
      *
@@ -2589,8 +2579,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the first index within a CharSequence, handling {@code null}.
-     * This method uses {@link String#indexOf(String, int)} if possible.</p>
+     * Finds the first index within a CharSequence, handling {@code null}.
+     * This method uses {@link String#indexOf(String, int)} if possible.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A negative start position is treated as zero.
@@ -2673,7 +2663,6 @@ public class StringUtils {
     }
 
     /**
-     *
      * Returns the index within {@code seq} of the first occurrence of the
      * specified character, starting the search at the specified index.
      * <p>
@@ -2733,8 +2722,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Search a CharSequence to find the first index of any
-     * character in the given set of characters.</p>
+     * Search a CharSequence to find the first index of any
+     * character in the given set of characters.
      *
      * <p>A {@code null} String will return {@code -1}.
      * A {@code null} or zero length search array will return {@code -1}.</p>
@@ -2781,7 +2770,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Find the first index of any of a set of potential substrings.</p>
+     * Find the first index of any of a set of potential substrings.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A {@code null} or zero length search array will return {@code -1}.
@@ -2834,8 +2823,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Search a CharSequence to find the first index of any
-     * character in the given set of characters.</p>
+     * Search a CharSequence to find the first index of any
+     * character in the given set of characters.
      *
      * <p>A {@code null} String will return {@code -1}.
      * A {@code null} search string will return {@code -1}.</p>
@@ -2864,8 +2853,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Searches a CharSequence to find the first index of any
-     * character not in the given set of characters.</p>
+     * Searches a CharSequence to find the first index of any
+     * character not in the given set of characters.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A {@code null} or zero length search array will return {@code -1}.</p>
@@ -2914,8 +2903,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Search a CharSequence to find the first index of any
-     * character not in the given set of characters.</p>
+     * Search a CharSequence to find the first index of any
+     * character not in the given set of characters.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A {@code null} or empty search string will return {@code -1}.</p>
@@ -2957,8 +2946,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares all CharSequences in an array and returns the index at which the
-     * CharSequences begin to differ.</p>
+     * Compares all CharSequences in an array and returns the index at which the
+     * CharSequences begin to differ.
      *
      * <p>For example,
      * {@code indexOfDifference(new String[] {"i am a machine", "i am a robot"}) -> 7}</p>
@@ -3047,8 +3036,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Compares two CharSequences, and returns the index at which the
-     * CharSequences begin to differ.</p>
+     * Compares two CharSequences, and returns the index at which the
+     * CharSequences begin to differ.
      *
      * <p>For example,
      * {@code indexOfDifference("i am a machine", "i am a robot") -> 7}</p>
@@ -3091,7 +3080,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case in-sensitive find of the first index within a CharSequence.</p>
+     * Case in-sensitive find of the first index within a CharSequence.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A negative start position is treated as zero.
@@ -3120,8 +3109,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case in-sensitive find of the first index within a CharSequence
-     * from the specified position.</p>
+     * Case in-sensitive find of the first index within a CharSequence
+     * from the specified position.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A negative start position is treated as zero.
@@ -3174,7 +3163,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if all of the CharSequences are empty (""), null or whitespace only.</p>
+     * Checks if all of the CharSequences are empty (""), null or whitespace only.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -3207,7 +3196,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if all of the CharSequences are empty ("") or null.</p>
+     * Checks if all of the CharSequences are empty ("") or null.
      *
      * <pre>
      * StringUtils.isAllEmpty(null)             = true
@@ -3238,7 +3227,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only lowercase characters.</p>
+     * Checks if the CharSequence contains only lowercase characters.
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code false}.</p>
@@ -3273,7 +3262,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only uppercase characters.</p>
+     * Checks if the CharSequence contains only uppercase characters.
      *
      * <p>{@code null} will return {@code false}.
      * An empty String (length()=0) will return {@code false}.</p>
@@ -3308,7 +3297,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only Unicode letters.</p>
+     * Checks if the CharSequence contains only Unicode letters.
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code false}.</p>
@@ -3341,7 +3330,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only Unicode letters or digits.</p>
+     * Checks if the CharSequence contains only Unicode letters or digits.
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code false}.</p>
@@ -3376,8 +3365,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only Unicode letters, digits
-     * or space ({@code ' '}).</p>
+     * Checks if the CharSequence contains only Unicode letters, digits
+     * or space ({@code ' '}).
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code true}.</p>
@@ -3412,8 +3401,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only Unicode letters and
-     * space (' ').</p>
+     * Checks if the CharSequence contains only Unicode letters and
+     * space (' ').
      *
      * <p>{@code null} will return {@code false}
      * An empty CharSequence (length()=0) will return {@code true}.</p>
@@ -3448,7 +3437,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if any of the CharSequences are empty ("") or null or whitespace only.</p>
+     * Checks if any of the CharSequences are empty ("") or null or whitespace only.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -3483,7 +3472,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if any of the CharSequences are empty ("") or null.</p>
+     * Checks if any of the CharSequences are empty ("") or null.
      *
      * <pre>
      * StringUtils.isAnyEmpty((String) null)    = true
@@ -3515,7 +3504,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only ASCII printable characters.</p>
+     * Checks if the CharSequence contains only ASCII printable characters.
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code true}.</p>
@@ -3554,7 +3543,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if a CharSequence is empty (""), null or whitespace only.</p>
+     * Checks if a CharSequence is empty (""), null or whitespace only.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -3585,7 +3574,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if a CharSequence is empty ("") or null.</p>
+     * Checks if a CharSequence is empty ("") or null.
      *
      * <pre>
      * StringUtils.isEmpty(null)      = true
@@ -3608,7 +3597,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains mixed casing of both uppercase and lowercase characters.</p>
+     * Checks if the CharSequence contains mixed casing of both uppercase and lowercase characters.
      *
      * <p>{@code null} will return {@code false}. An empty CharSequence ({@code length()=0}) will return
      * {@code false}.</p>
@@ -3650,7 +3639,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if none of the CharSequences are empty (""), null or whitespace only.</p>
+     * Checks if none of the CharSequences are empty (""), null or whitespace only.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -3677,7 +3666,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if none of the CharSequences are empty ("") or null.</p>
+     * Checks if none of the CharSequences are empty ("") or null.
      *
      * <pre>
      * StringUtils.isNoneEmpty((String) null)    = false
@@ -3701,7 +3690,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if a CharSequence is not empty (""), not null and not whitespace only.</p>
+     * Checks if a CharSequence is not empty (""), not null and not whitespace only.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -3724,7 +3713,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if a CharSequence is not empty ("") and not null.</p>
+     * Checks if a CharSequence is not empty ("") and not null.
      *
      * <pre>
      * StringUtils.isNotEmpty(null)      = false
@@ -3743,8 +3732,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only Unicode digits.
-     * A decimal point is not a Unicode digit and returns false.</p>
+     * Checks if the CharSequence contains only Unicode digits.
+     * A decimal point is not a Unicode digit and returns false.
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code false}.</p>
@@ -3787,9 +3776,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only Unicode digits or space
+     * Checks if the CharSequence contains only Unicode digits or space
      * ({@code ' '}).
-     * A decimal point is not a Unicode digit and returns false.</p>
+     * A decimal point is not a Unicode digit and returns false.
      *
      * <p>{@code null} will return {@code false}.
      * An empty CharSequence (length()=0) will return {@code true}.</p>
@@ -3827,7 +3816,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Checks if the CharSequence contains only whitespace.</p>
+     * Checks if the CharSequence contains only whitespace.
      *
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
@@ -3862,9 +3851,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -3893,9 +3880,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -3939,9 +3924,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -3971,9 +3954,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4018,9 +3999,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4050,9 +4029,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4097,9 +4074,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4129,9 +4104,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4176,9 +4149,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4208,9 +4179,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4255,9 +4224,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4287,9 +4254,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4334,13 +4299,13 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided {@link Iterable} into
-     * a single String containing the provided elements.</p>
+     * Joins the elements of the provided {@link Iterable} into
+     * a single String containing the provided elements.
      *
      * <p>No delimiter is added before or after the list. Null objects or empty
      * strings within the iteration are represented by empty strings.</p>
      *
-     * <p>See the examples here: {@link #join(Object[],char)}. </p>
+     * <p>See the examples here: {@link #join(Object[],char)}.</p>
      *
      * @param iterable  the {@link Iterable} providing the values to join together, may be null
      * @param separator  the separator character to use
@@ -4352,13 +4317,13 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided {@link Iterable} into
-     * a single String containing the provided elements.</p>
+     * Joins the elements of the provided {@link Iterable} into
+     * a single String containing the provided elements.
      *
      * <p>No delimiter is added before or after the list.
      * A {@code null} separator is the same as an empty String ("").</p>
      *
-     * <p>See the examples here: {@link #join(Object[],String)}. </p>
+     * <p>See the examples here: {@link #join(Object[],String)}.</p>
      *
      * @param iterable  the {@link Iterable} providing the values to join together, may be null
      * @param separator  the separator character to use, null treated as ""
@@ -4370,13 +4335,13 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided {@link Iterator} into
-     * a single String containing the provided elements.</p>
+     * Joins the elements of the provided {@link Iterator} into
+     * a single String containing the provided elements.
      *
      * <p>No delimiter is added before or after the list. Null objects or empty
      * strings within the iteration are represented by empty strings.</p>
      *
-     * <p>See the examples here: {@link #join(Object[],char)}. </p>
+     * <p>See the examples here: {@link #join(Object[],char)}.</p>
      *
      * @param iterator  the {@link Iterator} of values to join together, may be null
      * @param separator  the separator character to use
@@ -4395,13 +4360,13 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided {@link Iterator} into
-     * a single String containing the provided elements.</p>
+     * Joins the elements of the provided {@link Iterator} into
+     * a single String containing the provided elements.
      *
      * <p>No delimiter is added before or after the list.
      * A {@code null} separator is the same as an empty String ("").</p>
      *
-     * <p>See the examples here: {@link #join(Object[],String)}. </p>
+     * <p>See the examples here: {@link #join(Object[],String)}.</p>
      *
      * @param iterator  the {@link Iterator} of values to join together, may be null
      * @param separator  the separator character to use, null treated as ""
@@ -4419,8 +4384,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided {@link List} into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided {@link List} into a single String
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * Null objects or empty strings within the array are represented by
@@ -4457,8 +4422,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided {@link List} into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided {@link List} into a single String
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * Null objects or empty strings within the array are represented by
@@ -4496,9 +4461,7 @@ public class StringUtils {
 
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4528,9 +4491,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4575,8 +4536,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided array into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided array into a single String
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * Null objects or empty strings within the array are represented by
@@ -4604,8 +4565,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided array into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided array into a single String
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * Null objects or empty strings within the array are represented by
@@ -4634,8 +4595,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided array into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided array into a single String
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * A {@code null} separator is the same as an empty String ("").
@@ -4661,8 +4622,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided array into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided array into a single String
+     * containing the provided list of elements.
      *
      * <p>No delimiter is added before or after the list.
      * A {@code null} separator is the same as an empty String ("").
@@ -4701,9 +4662,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4733,9 +4692,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Joins the elements of the provided array into a single String containing the provided list of elements.
-     * </p>
      *
      * <p>
      * No delimiter is added before or after the list. Null objects or empty strings within the array are represented
@@ -4780,8 +4737,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided array into a single String
-     * containing the provided list of elements.</p>
+     * Joins the elements of the provided array into a single String
+     * containing the provided list of elements.
      *
      * <p>No separator is added to the joined String.
      * Null objects or empty strings within the array are represented by
@@ -4807,8 +4764,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Joins the elements of the provided varargs into a
-     * single String containing the provided elements.</p>
+     * Joins the elements of the provided varargs into a
+     * single String containing the provided elements.
      *
      * <p>No delimiter is added before or after the list.
      * {@code null} elements and separator are treated as empty Strings ("").</p>
@@ -4834,8 +4791,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the last index within a CharSequence, handling {@code null}.
-     * This method uses {@link String#lastIndexOf(String)} if possible.</p>
+     * Finds the last index within a CharSequence, handling {@code null}.
+     * This method uses {@link String#lastIndexOf(String)} if possible.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.</p>
      *
@@ -4864,8 +4821,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the last index within a CharSequence, handling {@code null}.
-     * This method uses {@link String#lastIndexOf(String, int)} if possible.</p>
+     * Finds the last index within a CharSequence, handling {@code null}.
+     * This method uses {@link String#lastIndexOf(String, int)} if possible.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A negative start position returns {@code -1}.
@@ -4995,7 +4952,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Find the latest index of any substring in a set of potential substrings.</p>
+     * Find the latest index of any substring in a set of potential substrings.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A {@code null} search array will return {@code -1}.
@@ -5039,7 +4996,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case in-sensitive find of the last index within a CharSequence.</p>
+     * Case in-sensitive find of the last index within a CharSequence.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A negative start position returns {@code -1}.
@@ -5069,8 +5026,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case in-sensitive find of the last index within a CharSequence
-     * from the specified position.</p>
+     * Case in-sensitive find of the last index within a CharSequence
+     * from the specified position.
      *
      * <p>A {@code null} CharSequence will return {@code -1}.
      * A negative start position returns {@code -1}.
@@ -5125,8 +5082,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the n-th last index within a String, handling {@code null}.
-     * This method uses {@link String#lastIndexOf(String)}.</p>
+     * Finds the n-th last index within a String, handling {@code null}.
+     * This method uses {@link String#lastIndexOf(String)}.
      *
      * <p>A {@code null} String will return {@code -1}.</p>
      *
@@ -5163,7 +5120,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the leftmost {@code len} characters of a String.</p>
+     * Gets the leftmost {@code len} characters of a String.
      *
      * <p>If {@code len} characters are not available, or the
      * String is {@code null}, the String will be returned without
@@ -5196,7 +5153,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Left pad a String with spaces (' ').</p>
+     * Left pad a String with spaces (' ').
      *
      * <p>The String is padded to the size of {@code size}.</p>
      *
@@ -5219,7 +5176,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Left pad a String with a specified character.</p>
+     * Left pad a String with a specified character.
      *
      * <p>Pad to a size of {@code size}.</p>
      *
@@ -5254,7 +5211,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Left pad a String with a specified String.</p>
+     * Left pad a String with a specified String.
      *
      * <p>Pad to a size of {@code size}.</p>
      *
@@ -5323,7 +5280,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Converts a String to lower case as per {@link String#toLowerCase()}.</p>
+     * Converts a String to lower case as per {@link String#toLowerCase()}.
      *
      * <p>A {@code null} input String returns {@code null}.</p>
      *
@@ -5349,7 +5306,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Converts a String to lower case as per {@link String#toLowerCase(Locale)}.</p>
+     * Converts a String to lower case as per {@link String#toLowerCase(Locale)}.
      *
      * <p>A {@code null} input String returns {@code null}.</p>
      *
@@ -5428,7 +5385,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets {@code len} characters from the middle of a String.</p>
+     * Gets {@code len} characters from the middle of a String.
      *
      * <p>If {@code len} characters are not available, the remainder
      * of the String will be returned without an exception. If the
@@ -5469,11 +5426,10 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Similar to <a
      * href="https://www.w3.org/TR/xpath/#function-normalize-space">https://www.w3.org/TR/xpath/#function-normalize
      * -space</a>
-     * </p>
+     *
      * <p>
      * The function returns the argument string with whitespace normalized by using
      * {@code {@link #trim(String)}} to remove leading and trailing whitespace
@@ -5541,8 +5497,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the n-th index within a CharSequence, handling {@code null}.
-     * This method uses {@link String#indexOf(String)} if possible.</p>
+     * Finds the n-th index within a CharSequence, handling {@code null}.
+     * This method uses {@link String#indexOf(String)} if possible.
      * <p><b>Note:</b> The code starts looking for a match at the start of the target,
      * incrementing the starting index by one after each successful match
      * (unless {@code searchStr} is an empty string in which case the position
@@ -5595,8 +5551,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Finds the n-th index within a String, handling {@code null}.
-     * This method uses {@link String#indexOf(String)} if possible.</p>
+     * Finds the n-th index within a String, handling {@code null}.
+     * This method uses {@link String#indexOf(String)} if possible.
      * <p>Note that matches may overlap<p>
      *
      * <p>A {@code null} CharSequence will return {@code -1}.</p>
@@ -5635,7 +5591,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Overlays part of a String with another String.</p>
+     * Overlays part of a String with another String.
      *
      * <p>A {@code null} string input returns {@code null}.
      * A negative index is treated as zero.
@@ -5795,7 +5751,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes all occurrences of a character from within the source string.</p>
+     * Removes all occurrences of a character from within the source string.
      *
      * <p>A {@code null} source string will return {@code null}.
      * An empty ("") source string will return the empty string.</p>
@@ -5828,7 +5784,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes all occurrences of a substring from within the source string.</p>
+     * Removes all occurrences of a substring from within the source string.
      *
      * <p>A {@code null} source string will return {@code null}.
      * An empty ("") source string will return the empty string.
@@ -5858,7 +5814,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes each substring of the text String that matches the given regular expression.</p>
+     * Removes each substring of the text String that matches the given regular expression.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -5908,8 +5864,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes a substring only if it is at the end of a source string,
-     * otherwise returns the source string.</p>
+     * Removes a substring only if it is at the end of a source string,
+     * otherwise returns the source string.
      *
      * <p>A {@code null} source string will return {@code null}.
      * An empty ("") source string will return the empty string.
@@ -5942,8 +5898,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case insensitive removal of a substring if it is at the end of a source string,
-     * otherwise returns the source string.</p>
+     * Case insensitive removal of a substring if it is at the end of a source string,
+     * otherwise returns the source string.
      *
      * <p>A {@code null} source string will return {@code null}.
      * An empty ("") source string will return the empty string.
@@ -5978,7 +5934,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes the first substring of the text string that matches the given regular expression.</p>
+     * Removes the first substring of the text string that matches the given regular expression.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -6027,10 +5983,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Case insensitive removal of all occurrences of a substring from within
      * the source string.
-     * </p>
      *
      * <p>
      * A {@code null} source string will return {@code null}. An empty ("")
@@ -6064,8 +6018,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes each substring of the source String that matches the given regular expression using the DOTALL option.
-     * </p>
+     * Removes each substring of the source String that matches the given regular expression using the DOTALL option.
      *
      * This call is a {@code null} safe equivalent to:
      * <ul>
@@ -6131,8 +6084,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes a substring only if it is at the beginning of a source string,
-     * otherwise returns the source string.</p>
+     * Removes a substring only if it is at the beginning of a source string,
+     * otherwise returns the source string.
      *
      * <p>A {@code null} source string will return {@code null}.
      * An empty ("") source string will return the empty string.
@@ -6165,8 +6118,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case insensitive removal of a substring if it is at the beginning of a source string,
-     * otherwise returns the source string.</p>
+     * Case insensitive removal of a substring if it is at the beginning of a source string,
+     * otherwise returns the source string.
      *
      * <p>A {@code null} source string will return {@code null}.
      * An empty ("") source string will return the empty string.
@@ -6197,8 +6150,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Returns padding using the specified delimiter repeated
-     * to a given length.</p>
+     * Returns padding using the specified delimiter repeated
+     * to a given length.
      *
      * <pre>
      * StringUtils.repeat('e', 0)  = ""
@@ -6228,8 +6181,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Repeat a String {@code repeat} times to form a
-     * new String.</p>
+     * Repeat a String {@code repeat} times to form a
+     * new String.
      *
      * <pre>
      * StringUtils.repeat(null, 2) = null
@@ -6284,8 +6237,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Repeat a String {@code repeat} times to form a
-     * new String, with a String separator injected each time. </p>
+     * Repeat a String {@code repeat} times to form a
+     * new String, with a String separator injected each time.
      *
      * <pre>
      * StringUtils.repeat(null, null, 2) = null
@@ -6313,7 +6266,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces all occurrences of a String within another String.</p>
+     * Replaces all occurrences of a String within another String.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -6340,8 +6293,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces a String with another String inside a larger String,
-     * for the first {@code max} values of the search String.</p>
+     * Replaces a String with another String inside a larger String,
+     * for the first {@code max} values of the search String.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -6372,9 +6325,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces a String with another String inside a larger String,
+     * Replaces a String with another String inside a larger String,
      * for the first {@code max} values of the search String,
-     * case-sensitively/insensitively based on {@code ignoreCase} value.</p>
+     * case-sensitively/insensitively based on {@code ignoreCase} value.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -6431,8 +6384,8 @@ public class StringUtils {
      }
 
     /**
-     * <p>Replaces each substring of the text String that matches the given regular expression
-     * with the given replacement.</p>
+     * Replaces each substring of the text String that matches the given regular expression
+     * with the given replacement.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -6486,8 +6439,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces all occurrences of a character in a String with another.
-     * This is a null-safe version of {@link String#replace(char, char)}.</p>
+     * Replaces all occurrences of a character in a String with another.
+     * This is a null-safe version of {@link String#replace(char, char)}.
      *
      * <p>A {@code null} string input returns {@code null}.
      * An empty ("") string input returns an empty string.</p>
@@ -6513,8 +6466,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces multiple characters in a String in one go.
-     * This method can also be used to delete characters.</p>
+     * Replaces multiple characters in a String in one go.
+     * This method can also be used to delete characters.
      *
      * <p>For example:<br>
      * {@code replaceChars(&quot;hello&quot;, &quot;ho&quot;, &quot;jy&quot;) = jelly}.</p>
@@ -6578,9 +6531,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Replaces all occurrences of Strings within another String.
-     * </p>
      *
      * <p>
      * A {@code null} reference passed to this method is a no-op, or if
@@ -6621,11 +6572,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Replace all occurrences of Strings within another String.
      * This is a private recursive helper method for {@link #replaceEachRepeatedly(String, String[], String[])} and
      * {@link #replaceEach(String, String[], String[])}
-     * </p>
      *
      * <p>
      * A {@code null} reference passed to this method is a no-op, or if
@@ -6797,9 +6746,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Replaces all occurrences of Strings within another String.
-     * </p>
      *
      * <p>
      * A {@code null} reference passed to this method is a no-op, or if
@@ -6843,8 +6790,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces the first substring of the text string that matches the given regular expression
-     * with the given replacement.</p>
+     * Replaces the first substring of the text string that matches the given regular expression
+     * with the given replacement.
      *
      * This method is a {@code null} safe equivalent to:
      * <ul>
@@ -6896,7 +6843,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case insensitively replaces all occurrences of a String within another String.</p>
+     * Case insensitively replaces all occurrences of a String within another String.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -6924,8 +6871,8 @@ public class StringUtils {
      }
 
     /**
-     * <p>Case insensitively replaces a String with another String inside a larger String,
-     * for the first {@code max} values of the search String.</p>
+     * Case insensitively replaces a String with another String inside a larger String,
+     * for the first {@code max} values of the search String.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -6957,7 +6904,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces a String with another String inside a larger String, once.</p>
+     * Replaces a String with another String inside a larger String, once.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -6984,7 +6931,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case insensitively replaces a String with another String inside a larger String, once.</p>
+     * Case insensitively replaces a String with another String inside a larger String, once.
      *
      * <p>A {@code null} reference passed to this method is a no-op.</p>
      *
@@ -7013,8 +6960,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Replaces each substring of the source String that matches the given regular expression with the given
-     * replacement using the {@link Pattern#DOTALL} option. DOTALL is also known as single-line mode in Perl.</p>
+     * Replaces each substring of the source String that matches the given regular expression with the given
+     * replacement using the {@link Pattern#DOTALL} option. DOTALL is also known as single-line mode in Perl.
      *
      * This call is a {@code null} safe equivalent to:
      * <ul>
@@ -7059,7 +7006,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Reverses a String as per {@link StringBuilder#reverse()}.</p>
+     * Reverses a String as per {@link StringBuilder#reverse()}.
      *
      * <p>A {@code null} String returns {@code null}.</p>
      *
@@ -7080,7 +7027,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Reverses a String that is delimited by a specific character.</p>
+     * Reverses a String that is delimited by a specific character.
      *
      * <p>The Strings between the delimiters are not reversed.
      * Thus java.lang.String becomes String.lang.java (if the delimiter
@@ -7110,7 +7057,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the rightmost {@code len} characters of a String.</p>
+     * Gets the rightmost {@code len} characters of a String.
      *
      * <p>If {@code len} characters are not available, or the String
      * is {@code null}, the String will be returned without an
@@ -7143,7 +7090,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Right pad a String with spaces (' ').</p>
+     * Right pad a String with spaces (' ').
      *
      * <p>The String is padded to the size of {@code size}.</p>
      *
@@ -7166,7 +7113,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Right pad a String with a specified character.</p>
+     * Right pad a String with a specified character.
      *
      * <p>The String is padded to the size of {@code size}.</p>
      *
@@ -7201,7 +7148,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Right pad a String with a specified String.</p>
+     * Right pad a String with a specified String.
      *
      * <p>The String is padded to the size of {@code size}.</p>
      *
@@ -7255,7 +7202,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Rotate (circular shift) a String of {@code shift} characters.</p>
+     * Rotate (circular shift) a String of {@code shift} characters.
      * <ul>
      *  <li>If {@code shift > 0}, right circular shift (ex : ABCDEF =&gt; FABCDE)</li>
      *  <li>If {@code shift < 0}, left circular shift (ex : ABCDEF =&gt; BCDEFA)</li>
@@ -7298,9 +7245,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, using whitespace as the
+     * Splits the provided text into an array, using whitespace as the
      * separator.
-     * Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
+     * Whitespace is defined by {@link Character#isWhitespace(char)}.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as one separator.
@@ -7324,8 +7271,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separator specified.
-     * This is an alternative to using StringTokenizer.</p>
+     * Splits the provided text into an array, separator specified.
+     * This is an alternative to using StringTokenizer.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as one separator.
@@ -7352,8 +7299,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separators specified.
-     * This is an alternative to using StringTokenizer.</p>
+     * Splits the provided text into an array, separators specified.
+     * This is an alternative to using StringTokenizer.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as one separator.
@@ -7381,8 +7328,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array with a maximum length,
-     * separators specified.</p>
+     * Splits the provided text into an array with a maximum length,
+     * separators specified.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as one separator.</p>
@@ -7415,7 +7362,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits a String by Character type as returned by
+     * Splits a String by Character type as returned by
      * {@code java.lang.Character.getType(char)}. Groups of contiguous
      * characters of the same type are returned as complete tokens.
      * <pre>
@@ -7512,7 +7459,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separator string specified.</p>
+     * <p>Splits the provided text into an array, separator string specified.
      *
      * <p>The separator(s) will not be included in the returned String array.
      * Adjacent separators are treated as one separator.</p>
@@ -7539,8 +7486,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separator string specified.
-     * Returns a maximum of {@code max} substrings.</p>
+     * Splits the provided text into an array, separator string specified.
+     * Returns a maximum of {@code max} substrings.
      *
      * <p>The separator(s) will not be included in the returned String array.
      * Adjacent separators are treated as one separator.</p>
@@ -7570,7 +7517,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separator string specified. </p>
+     * Splits the provided text into an array, separator string specified.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as separators for empty tokens.
@@ -7599,8 +7546,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separator string specified.
-     * Returns a maximum of {@code max} substrings.</p>
+     * Splits the provided text into an array, separator string specified.
+     * Returns a maximum of {@code max} substrings.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as separators for empty tokens.
@@ -7712,10 +7659,10 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, using whitespace as the
+     * Splits the provided text into an array, using whitespace as the
      * separator, preserving all tokens, including empty tokens created by
      * adjacent separators. This is an alternative to using StringTokenizer.
-     * Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
+     * Whitespace is defined by {@link Character#isWhitespace(char)}.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as separators for empty tokens.
@@ -7740,9 +7687,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separator specified,
+     * Splits the provided text into an array, separator specified,
      * preserving all tokens, including empty tokens created by adjacent
-     * separators. This is an alternative to using StringTokenizer.</p>
+     * separators. This is an alternative to using StringTokenizer.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as separators for empty tokens.
@@ -7776,9 +7723,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array, separators specified,
+     * Splits the provided text into an array, separators specified,
      * preserving all tokens, including empty tokens created by adjacent
-     * separators. This is an alternative to using StringTokenizer.</p>
+     * separators. This is an alternative to using StringTokenizer.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as separators for empty tokens.
@@ -7813,9 +7760,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Splits the provided text into an array with a maximum length,
+     * Splits the provided text into an array with a maximum length,
      * separators specified, preserving all tokens, including empty tokens
-     * created by adjacent separators.</p>
+     * created by adjacent separators.
      *
      * <p>The separator is not included in the returned String array.
      * Adjacent separators are treated as separators for empty tokens.
@@ -8000,7 +7947,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check if a CharSequence starts with a specified prefix.</p>
+     * Check if a CharSequence starts with a specified prefix.
      *
      * <p>{@code null}s are handled without exceptions. Two {@code null}
      * references are considered to be equal. The comparison is case-sensitive.</p>
@@ -8026,7 +7973,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check if a CharSequence starts with a specified prefix (optionally case insensitive).</p>
+     * Check if a CharSequence starts with a specified prefix (optionally case insensitive).
      *
      * @see java.lang.String#startsWith(String)
      * @param str  the CharSequence to check, may be null
@@ -8049,7 +7996,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Check if a CharSequence starts with any of the provided case-sensitive prefixes.</p>
+     * Check if a CharSequence starts with any of the provided case-sensitive prefixes.
      *
      * <pre>
      * StringUtils.startsWithAny(null, null)      = false
@@ -8083,7 +8030,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Case insensitive check if a CharSequence starts with a specified prefix.</p>
+     * Case insensitive check if a CharSequence starts with a specified prefix.
      *
      * <p>{@code null}s are handled without exceptions. Two {@code null}
      * references are considered to be equal. The comparison is case insensitive.</p>
@@ -8109,7 +8056,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips whitespace from the start and end of a String.</p>
+     * Strips whitespace from the start and end of a String.
      *
      * <p>This is similar to {@link #trim(String)} but removes whitespace.
      * Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
@@ -8135,9 +8082,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips any of a set of characters from the start and end of a String.
+     * Strips any of a set of characters from the start and end of a String.
      * This is similar to {@link String#trim()} but allows the characters
-     * to be stripped to be controlled.</p>
+     * to be stripped to be controlled.
      *
      * <p>A {@code null} input String returns {@code null}.
      * An empty string ("") input returns the empty string.</p>
@@ -8166,7 +8113,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes diacritics (~= accents) from a string. The case will not be altered.</p>
+     * Removes diacritics (~= accents) from a string. The case will not be altered.
      * <p>For instance, '&agrave;' will be replaced by 'a'.</p>
      * <p>Note that ligatures will be left as is.</p>
      *
@@ -8194,8 +8141,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips whitespace from the start and end of every String in an array.
-     * Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
+     * Strips whitespace from the start and end of every String in an array.
+     * Whitespace is defined by {@link Character#isWhitespace(char)}.
      *
      * <p>A new array is returned each time, except for length zero.
      * A {@code null} array will return {@code null}.
@@ -8217,8 +8164,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips any of a set of characters from the start and end of every
-     * String in an array.</p>
+     * Strips any of a set of characters from the start and end of every
+     * String in an array.
      * <p>Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
      *
      * <p>A new array is returned each time, except for length zero.
@@ -8254,7 +8201,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips any of a set of characters from the end of a String.</p>
+     * Strips any of a set of characters from the end of a String.
      *
      * <p>A {@code null} input String returns {@code null}.
      * An empty string ("") input returns the empty string.</p>
@@ -8299,7 +8246,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips any of a set of characters from the start of a String.</p>
+     * Strips any of a set of characters from the start of a String.
      *
      * <p>A {@code null} input String returns {@code null}.
      * An empty string ("") input returns the empty string.</p>
@@ -8343,8 +8290,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips whitespace from the start and end of a String  returning
-     * an empty String if {@code null} input.</p>
+     * Strips whitespace from the start and end of a String  returning
+     * an empty String if {@code null} input.
      *
      * <p>This is similar to {@link #trimToEmpty(String)} but removes whitespace.
      * Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
@@ -8369,8 +8316,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Strips whitespace from the start and end of a String  returning
-     * {@code null} if the String is empty ("") after the strip.</p>
+     * Strips whitespace from the start and end of a String  returning
+     * {@code null} if the String is empty ("") after the strip.
      *
      * <p>This is similar to {@link #trimToNull(String)} but removes whitespace.
      * Whitespace is defined by {@link Character#isWhitespace(char)}.</p>
@@ -8400,7 +8347,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets a substring from the specified String avoiding exceptions.</p>
+     * Gets a substring from the specified String avoiding exceptions.
      *
      * <p>A negative start position can be used to start {@code n}
      * characters from the end of the String.</p>
@@ -8444,7 +8391,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets a substring from the specified String avoiding exceptions.</p>
+     * Gets a substring from the specified String avoiding exceptions.
      *
      * <p>A negative start position can be used to start/end {@code n}
      * characters from the end of the String.</p>
@@ -8512,8 +8459,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the substring after the first occurrence of a separator.
-     * The separator is not returned.</p>
+     * Gets the substring after the first occurrence of a separator.
+     * The separator is not returned.
      *
      * <p>A {@code null} string input will return {@code null}.
      * An empty ("") string input will return the empty string.
@@ -8548,8 +8495,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the substring after the first occurrence of a separator.
-     * The separator is not returned.</p>
+     * Gets the substring after the first occurrence of a separator.
+     * The separator is not returned.
      *
      * <p>A {@code null} string input will return {@code null}.
      * An empty ("") string input will return the empty string.
@@ -8590,8 +8537,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the substring after the last occurrence of a separator.
-     * The separator is not returned.</p>
+     * Gets the substring after the last occurrence of a separator.
+     * The separator is not returned.
      *
      * <p>A {@code null} string input will return {@code null}.
      * An empty ("") string input will return the empty string.
@@ -8627,8 +8574,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the substring after the last occurrence of a separator.
-     * The separator is not returned.</p>
+     * Gets the substring after the last occurrence of a separator.
+     * The separator is not returned.
      *
      * <p>A {@code null} string input will return {@code null}.
      * An empty ("") string input will return the empty string.
@@ -8670,9 +8617,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Gets the substring before the first occurrence of a separator. The separator is not returned.
-     * </p>
      *
      * <p>
      * A {@code null} string input will return {@code null}. An empty ("") string input will return the empty string.
@@ -8708,8 +8653,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the substring before the first occurrence of a separator.
-     * The separator is not returned.</p>
+     * Gets the substring before the first occurrence of a separator.
+     * The separator is not returned.
      *
      * <p>A {@code null} string input will return {@code null}.
      * An empty ("") string input will return the empty string.
@@ -8749,8 +8694,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the substring before the last occurrence of a separator.
-     * The separator is not returned.</p>
+     * Gets the substring before the last occurrence of a separator.
+     * The separator is not returned.
      *
      * <p>A {@code null} string input will return {@code null}.
      * An empty ("") string input will return the empty string.
@@ -8787,8 +8732,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the String that is nested in between two instances of the
-     * same String.</p>
+     * Gets the String that is nested in between two instances of the
+     * same String.
      *
      * <p>A {@code null} input String returns {@code null}.
      * A {@code null} tag returns {@code null}.</p>
@@ -8812,8 +8757,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Gets the String that is nested in between two Strings.
-     * Only the first match is returned.</p>
+     * Gets the String that is nested in between two Strings.
+     * Only the first match is returned.
      *
      * <p>A {@code null} input String returns {@code null}.
      * A {@code null} open/close returns {@code null} (no match).
@@ -8853,8 +8798,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Searches a String for substrings delimited by a start and end tag,
-     * returning all matching substrings in an array.</p>
+     * Searches a String for substrings delimited by a start and end tag,
+     * returning all matching substrings in an array.
      *
      * <p>A {@code null} input String returns {@code null}.
      * A {@code null} open/close returns {@code null} (no match).
@@ -8906,8 +8851,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Swaps the case of a String changing upper and title case to
-     * lower case, and lower case to upper case.</p>
+     * Swaps the case of a String changing upper and title case to
+     * lower case, and lower case to upper case.
      *
      * <ul>
      *  <li>Upper case character converts to Lower case</li>
@@ -8957,7 +8902,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Converts a {@link CharSequence} into an array of code points.</p>
+     * Converts a {@link CharSequence} into an array of code points.
      *
      * <p>Valid pairs of surrogate code units will be converted into a single supplementary
      * code point. Isolated surrogate code units (i.e. a high surrogate not followed by a low surrogate or
@@ -9054,9 +8999,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes control characters (char &lt;= 32) from both
+     * Removes control characters (char &lt;= 32) from both
      * ends of this String, handling {@code null} by returning
-     * {@code null}.</p>
+     * {@code null}.
      *
      * <p>The String is trimmed using {@link String#trim()}.
      * Trim removes start and end characters &lt;= 32.
@@ -9081,13 +9026,13 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes control characters (char &lt;= 32) from both
+     * Removes control characters (char &lt;= 32) from both
      * ends of this String returning an empty String ("") if the String
      * is empty ("") after the trim or if it is {@code null}.
      *
      * <p>The String is trimmed using {@link String#trim()}.
      * Trim removes start and end characters &lt;= 32.
-     * To strip whitespace use {@link #stripToEmpty(String)}.</p>
+     * To strip whitespace use {@link #stripToEmpty(String)}.
      *
      * <pre>
      * StringUtils.trimToEmpty(null)          = ""
@@ -9106,13 +9051,13 @@ public class StringUtils {
     }
 
     /**
-     * <p>Removes control characters (char &lt;= 32) from both
+     * Removes control characters (char &lt;= 32) from both
      * ends of this String returning {@code null} if the String is
      * empty ("") after the trim or if it is {@code null}.
      *
      * <p>The String is trimmed using {@link String#trim()}.
      * Trim removes start and end characters &lt;= 32.
-     * To strip whitespace use {@link #stripToNull(String)}.</p>
+     * To strip whitespace use {@link #stripToNull(String)}.
      *
      * <pre>
      * StringUtils.trimToNull(null)          = null
@@ -9133,8 +9078,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Truncates a String. This will turn
-     * "Now is the time for all good men" into "Now is the time for".</p>
+     * Truncates a String. This will turn
+     * "Now is the time for all good men" into "Now is the time for".
      *
      * <p>Specifically:</p>
      * <ul>
@@ -9169,8 +9114,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Truncates a String. This will turn
-     * "Now is the time for all good men" into "is the time for all".</p>
+     * Truncates a String. This will turn
+     * "Now is the time for all good men" into "is the time for all".
      *
      * <p>Works like {@code truncate(String, int)}, but allows you to specify
      * a "left edge" offset.
@@ -9249,8 +9194,8 @@ public class StringUtils {
     }
 
     /**
-     * <p>Uncapitalizes a String, changing the first character to lower case as
-     * per {@link Character#toLowerCase(int)}. No other characters are changed.</p>
+     * Uncapitalizes a String, changing the first character to lower case as
+     * per {@link Character#toLowerCase(int)}. No other characters are changed.
      *
      * <p>For a word based algorithm, see {@link org.apache.commons.text.WordUtils#uncapitalize(String)}.
      * A {@code null} input String returns {@code null}.</p>
@@ -9294,9 +9239,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Unwraps a given string from a character.
-     * </p>
      *
      * <pre>
      * StringUtils.unwrap(null, null)         = null
@@ -9335,9 +9278,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Unwraps a given string from anther string.
-     * </p>
      *
      * <pre>
      * StringUtils.unwrap(null, null)         = null
@@ -9374,7 +9315,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Converts a String to upper case as per {@link String#toUpperCase()}.</p>
+     * Converts a String to upper case as per {@link String#toUpperCase()}.
      *
      * <p>A {@code null} input String returns {@code null}.</p>
      *
@@ -9400,7 +9341,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>Converts a String to upper case as per {@link String#toUpperCase(Locale)}.</p>
+     * Converts a String to upper case as per {@link String#toUpperCase(Locale)}.
      *
      * <p>A {@code null} input String returns {@code null}.</p>
      *
@@ -9435,9 +9376,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Wraps a string with a char.
-     * </p>
      *
      * <pre>
      * StringUtils.wrap(null, *)        = null
@@ -9465,9 +9404,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Wraps a String with another String.
-     * </p>
      *
      * <p>
      * A {@code null} input String returns {@code null}.
@@ -9503,9 +9440,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Wraps a string with a char if that char is missing from the start or end of the given string.
-     * </p>
      *
      * <p>A new {@link String} will not be created if {@code str} is already wrapped.</p>
      *
@@ -9551,9 +9486,7 @@ public class StringUtils {
     }
 
     /**
-     * <p>
      * Wraps a string with a string if that string is missing from the start or end of the given string.
-     * </p>
      *
      * <p>A new {@link String} will not be created if {@code str} is already wrapped.</p>
      *
@@ -9604,9 +9537,9 @@ public class StringUtils {
     }
 
     /**
-     * <p>{@link StringUtils} instances should NOT be constructed in
+     * {@link StringUtils} instances should NOT be constructed in
      * standard programming. Instead, the class should be used as
-     * {@code StringUtils.trim(" foo ");}.</p>
+     * {@code StringUtils.trim(" foo ");}.
      *
      * <p>This constructor is public to permit tools that require a JavaBean
      * instance to operate.</p>
diff --git a/src/main/java/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java
index 1555051bb..95c6279de 100644
--- a/src/main/java/org/apache/commons/lang3/SystemUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SystemUtils.java
@@ -19,9 +19,8 @@ package org.apache.commons.lang3;
 import java.io.File;
 
 /**
- * <p>
  * Helpers for {@code java.lang.System}.
- * </p>
+ *
  * <p>
  * If a system property cannot be read due to security restrictions, the corresponding field in this class will be set
  * to {@code null} and a message will be written to {@code System.err}.
@@ -69,9 +68,8 @@ public class SystemUtils {
     private static final String JAVA_HOME_KEY = "java.home";
 
     /**
-     * <p>
      * The {@code awt.toolkit} System Property.
-     * </p>
+     *
      * <p>
      * Holds a class name, on Windows XP this is {@code sun.awt.windows.WToolkit}.
      * </p>
@@ -93,9 +91,8 @@ public class SystemUtils {
     public static final String AWT_TOOLKIT = getSystemProperty("awt.toolkit");
 
     /**
-     * <p>
      * The {@code file.encoding} System Property.
-     * </p>
+     *
      * <p>
      * File encoding, such as {@code Cp1252}.
      * </p>
@@ -115,10 +112,9 @@ public class SystemUtils {
     public static final String FILE_ENCODING = getSystemProperty("file.encoding");
 
     /**
-     * <p>
      * The {@code file.separator} System Property.
      * The file separator is:
-     * </p>
+     *
      * <ul>
      * <li>{@code "/"} on UNIX</li>
      * <li>{@code "\"} on Windows.</li>
@@ -142,9 +138,8 @@ public class SystemUtils {
     public static final String FILE_SEPARATOR = getSystemProperty("file.separator");
 
     /**
-     * <p>
      * The {@code java.awt.fonts} System Property.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -160,9 +155,8 @@ public class SystemUtils {
     public static final String JAVA_AWT_FONTS = getSystemProperty("java.awt.fonts");
 
     /**
-     * <p>
      * The {@code java.awt.graphicsenv} System Property.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -178,10 +172,9 @@ public class SystemUtils {
     public static final String JAVA_AWT_GRAPHICSENV = getSystemProperty("java.awt.graphicsenv");
 
     /**
-     * <p>
      * The {@code java.awt.headless} System Property. The value of this property is the String {@code "true"} or
      * {@code "false"}.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -199,9 +192,8 @@ public class SystemUtils {
     public static final String JAVA_AWT_HEADLESS = getSystemProperty("java.awt.headless");
 
     /**
-     * <p>
      * The {@code java.awt.printerjob} System Property.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -217,9 +209,8 @@ public class SystemUtils {
     public static final String JAVA_AWT_PRINTERJOB = getSystemProperty("java.awt.printerjob");
 
     /**
-     * <p>
      * The {@code java.class.path} System Property. Java class path.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -235,9 +226,8 @@ public class SystemUtils {
     public static final String JAVA_CLASS_PATH = getSystemProperty("java.class.path");
 
     /**
-     * <p>
      * The {@code java.class.version} System Property. Java class format version number.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -253,10 +243,9 @@ public class SystemUtils {
     public static final String JAVA_CLASS_VERSION = getSystemProperty("java.class.version");
 
     /**
-     * <p>
      * The {@code java.compiler} System Property. Name of JIT compiler to use. First in JDK version 1.2. Not used in Sun
      * JDKs after 1.2.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -272,9 +261,8 @@ public class SystemUtils {
     public static final String JAVA_COMPILER = getSystemProperty("java.compiler");
 
     /**
-     * <p>
      * The {@code java.endorsed.dirs} System Property. Path of endorsed directory or directories.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -290,9 +278,8 @@ public class SystemUtils {
     public static final String JAVA_ENDORSED_DIRS = getSystemProperty("java.endorsed.dirs");
 
     /**
-     * <p>
      * The {@code java.ext.dirs} System Property. Path of extension directory or directories.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -308,9 +295,8 @@ public class SystemUtils {
     public static final String JAVA_EXT_DIRS = getSystemProperty("java.ext.dirs");
 
     /**
-     * <p>
      * The {@code java.home} System Property. Java installation directory.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -326,9 +312,8 @@ public class SystemUtils {
     public static final String JAVA_HOME = getSystemProperty(JAVA_HOME_KEY);
 
     /**
-     * <p>
      * The {@code java.io.tmpdir} System Property. Default temp file path.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -344,9 +329,8 @@ public class SystemUtils {
     public static final String JAVA_IO_TMPDIR = getSystemProperty(JAVA_IO_TMPDIR_KEY);
 
     /**
-     * <p>
      * The {@code java.library.path} System Property. List of paths to search when loading libraries.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -362,9 +346,8 @@ public class SystemUtils {
     public static final String JAVA_LIBRARY_PATH = getSystemProperty("java.library.path");
 
     /**
-     * <p>
      * The {@code java.runtime.name} System Property. Java Runtime Environment name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -381,9 +364,8 @@ public class SystemUtils {
     public static final String JAVA_RUNTIME_NAME = getSystemProperty("java.runtime.name");
 
     /**
-     * <p>
      * The {@code java.runtime.version} System Property. Java Runtime Environment version.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -400,9 +382,8 @@ public class SystemUtils {
     public static final String JAVA_RUNTIME_VERSION = getSystemProperty("java.runtime.version");
 
     /**
-     * <p>
      * The {@code java.specification.name} System Property. Java Runtime Environment specification name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -418,9 +399,8 @@ public class SystemUtils {
     public static final String JAVA_SPECIFICATION_NAME = getSystemProperty("java.specification.name");
 
     /**
-     * <p>
      * The {@code java.specification.vendor} System Property. Java Runtime Environment specification vendor.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -436,9 +416,8 @@ public class SystemUtils {
     public static final String JAVA_SPECIFICATION_VENDOR = getSystemProperty("java.specification.vendor");
 
     /**
-     * <p>
      * The {@code java.specification.version} System Property. Java Runtime Environment specification version.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -455,9 +434,8 @@ public class SystemUtils {
     private static final JavaVersion JAVA_SPECIFICATION_VERSION_AS_ENUM = JavaVersion.get(JAVA_SPECIFICATION_VERSION);
 
     /**
-     * <p>
      * The {@code java.util.prefs.PreferencesFactory} System Property. A class name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -475,9 +453,8 @@ public class SystemUtils {
         getSystemProperty("java.util.prefs.PreferencesFactory");
 
     /**
-     * <p>
      * The {@code java.vendor} System Property. Java vendor-specific string.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -493,9 +470,8 @@ public class SystemUtils {
     public static final String JAVA_VENDOR = getSystemProperty("java.vendor");
 
     /**
-     * <p>
      * The {@code java.vendor.url} System Property. Java vendor URL.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -511,9 +487,8 @@ public class SystemUtils {
     public static final String JAVA_VENDOR_URL = getSystemProperty("java.vendor.url");
 
     /**
-     * <p>
      * The {@code java.version} System Property. Java version number.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -529,9 +504,8 @@ public class SystemUtils {
     public static final String JAVA_VERSION = getSystemProperty("java.version");
 
     /**
-     * <p>
      * The {@code java.vm.info} System Property. Java Virtual Machine implementation info.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -548,9 +522,8 @@ public class SystemUtils {
     public static final String JAVA_VM_INFO = getSystemProperty("java.vm.info");
 
     /**
-     * <p>
      * The {@code java.vm.name} System Property. Java Virtual Machine implementation name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -566,9 +539,8 @@ public class SystemUtils {
     public static final String JAVA_VM_NAME = getSystemProperty("java.vm.name");
 
     /**
-     * <p>
      * The {@code java.vm.specification.name} System Property. Java Virtual Machine specification name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -584,9 +556,8 @@ public class SystemUtils {
     public static final String JAVA_VM_SPECIFICATION_NAME = getSystemProperty("java.vm.specification.name");
 
     /**
-     * <p>
      * The {@code java.vm.specification.vendor} System Property. Java Virtual Machine specification vendor.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -602,9 +573,8 @@ public class SystemUtils {
     public static final String JAVA_VM_SPECIFICATION_VENDOR = getSystemProperty("java.vm.specification.vendor");
 
     /**
-     * <p>
      * The {@code java.vm.specification.version} System Property. Java Virtual Machine specification version.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -620,9 +590,8 @@ public class SystemUtils {
     public static final String JAVA_VM_SPECIFICATION_VERSION = getSystemProperty("java.vm.specification.version");
 
     /**
-     * <p>
      * The {@code java.vm.vendor} System Property. Java Virtual Machine implementation vendor.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -638,9 +607,8 @@ public class SystemUtils {
     public static final String JAVA_VM_VENDOR = getSystemProperty("java.vm.vendor");
 
     /**
-     * <p>
      * The {@code java.vm.version} System Property. Java Virtual Machine implementation version.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -656,9 +624,8 @@ public class SystemUtils {
     public static final String JAVA_VM_VERSION = getSystemProperty("java.vm.version");
 
     /**
-     * <p>
      * The {@code line.separator} System Property. Line separator ({@code &quot;\n&quot;} on UNIX).
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -676,9 +643,8 @@ public class SystemUtils {
     public static final String LINE_SEPARATOR = getSystemProperty("line.separator");
 
     /**
-     * <p>
      * The {@code os.arch} System Property. Operating system architecture.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -694,9 +660,8 @@ public class SystemUtils {
     public static final String OS_ARCH = getSystemProperty("os.arch");
 
     /**
-     * <p>
      * The {@code os.name} System Property. Operating system name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -712,9 +677,8 @@ public class SystemUtils {
     public static final String OS_NAME = getSystemProperty("os.name");
 
     /**
-     * <p>
      * The {@code os.version} System Property. Operating system version.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -730,9 +694,8 @@ public class SystemUtils {
     public static final String OS_VERSION = getSystemProperty("os.version");
 
     /**
-     * <p>
      * The {@code path.separator} System Property. Path separator ({@code &quot;:&quot;} on UNIX).
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -751,10 +714,9 @@ public class SystemUtils {
     public static final String PATH_SEPARATOR = getSystemProperty("path.separator");
 
     /**
-     * <p>
      * The {@code user.country} or {@code user.region} System Property. User's country code, such as {@code "GB"}. First
      * in Java version 1.2 as {@code user.region}. Renamed to {@code user.country} in 1.4
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -772,9 +734,8 @@ public class SystemUtils {
             getSystemProperty("user.region") : getSystemProperty("user.country");
 
     /**
-     * <p>
      * The {@code user.dir} System Property. User's current working directory.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -790,9 +751,8 @@ public class SystemUtils {
     public static final String USER_DIR = getSystemProperty(USER_DIR_KEY);
 
     /**
-     * <p>
      * The {@code user.home} System Property. User's home directory.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -808,9 +768,8 @@ public class SystemUtils {
     public static final String USER_HOME = getSystemProperty(USER_HOME_KEY);
 
     /**
-     * <p>
      * The {@code user.language} System Property. User's language code, such as {@code "en"}.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -827,9 +786,8 @@ public class SystemUtils {
     public static final String USER_LANGUAGE = getSystemProperty("user.language");
 
     /**
-     * <p>
      * The {@code user.name} System Property. User's account name.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -845,9 +803,8 @@ public class SystemUtils {
     public static final String USER_NAME = getSystemProperty(USER_NAME_KEY);
 
     /**
-     * <p>
      * The {@code user.timezone} System Property. For example: {@code "America/Los_Angeles"}.
-     * </p>
+     *
      * <p>
      * Defaults to {@code null} if the runtime does not have security access to read this property or the property does
      * not exist.
@@ -868,9 +825,8 @@ public class SystemUtils {
     // values being set up
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.1 (also 1.1.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -878,9 +834,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_1 = getJavaVersionMatches("1.1");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.2 (also 1.2.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -888,9 +843,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_2 = getJavaVersionMatches("1.2");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.3 (also 1.3.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -898,9 +852,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_3 = getJavaVersionMatches("1.3");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.4 (also 1.4.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -908,9 +861,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_4 = getJavaVersionMatches("1.4");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.5 (also 1.5.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -918,9 +870,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_5 = getJavaVersionMatches("1.5");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.6 (also 1.6.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -928,9 +879,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_6 = getJavaVersionMatches("1.6");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.7 (also 1.7.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -940,9 +890,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_7 = getJavaVersionMatches("1.7");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.8 (also 1.8.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -952,9 +901,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_8 = getJavaVersionMatches("1.8");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 1.9 (also 1.9.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -967,9 +915,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_1_9 = getJavaVersionMatches("9");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 9 (also 9.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -979,9 +926,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_9 = getJavaVersionMatches("9");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 10 (also 10.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -991,9 +937,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_10 = getJavaVersionMatches("10");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 11 (also 11.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -1003,9 +948,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_11 = getJavaVersionMatches("11");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 12 (also 12.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -1015,9 +959,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_12 = getJavaVersionMatches("12");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 13 (also 13.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -1027,9 +970,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_13 = getJavaVersionMatches("13");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 14 (also 14.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -1039,9 +981,8 @@ public class SystemUtils {
     public static final boolean IS_JAVA_14 = getJavaVersionMatches("14");
 
     /**
-     * <p>
      * Is {@code true} if this is Java version 15 (also 15.x versions).
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@link #JAVA_VERSION} is {@code null}.
      * </p>
@@ -1088,9 +1029,8 @@ public class SystemUtils {
     // or a mistake corrected
 
     /**
-     * <p>
      * Is {@code true} if this is AIX.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1100,9 +1040,8 @@ public class SystemUtils {
     public static final boolean IS_OS_AIX = getOsMatchesName("AIX");
 
     /**
-     * <p>
      * Is {@code true} if this is HP-UX.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1112,9 +1051,8 @@ public class SystemUtils {
     public static final boolean IS_OS_HP_UX = getOsMatchesName("HP-UX");
 
     /**
-     * <p>
      * Is {@code true} if this is IBM OS/400.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1124,9 +1062,8 @@ public class SystemUtils {
     public static final boolean IS_OS_400 = getOsMatchesName("OS/400");
 
     /**
-     * <p>
      * Is {@code true} if this is Irix.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1136,9 +1073,8 @@ public class SystemUtils {
     public static final boolean IS_OS_IRIX = getOsMatchesName("Irix");
 
     /**
-     * <p>
      * Is {@code true} if this is Linux.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1148,9 +1084,8 @@ public class SystemUtils {
     public static final boolean IS_OS_LINUX = getOsMatchesName("Linux") || getOsMatchesName("LINUX");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1160,9 +1095,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC = getOsMatchesName("Mac");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1172,9 +1106,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX = getOsMatchesName("Mac OS X");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Cheetah.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1184,9 +1117,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_CHEETAH = getOsMatches("Mac OS X", "10.0");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Puma.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1196,9 +1128,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_PUMA = getOsMatches("Mac OS X", "10.1");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Jaguar.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1208,9 +1139,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_JAGUAR = getOsMatches("Mac OS X", "10.2");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Panther.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1220,9 +1150,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_PANTHER = getOsMatches("Mac OS X", "10.3");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Tiger.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1232,9 +1161,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_TIGER = getOsMatches("Mac OS X", "10.4");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Leopard.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1244,9 +1172,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_LEOPARD = getOsMatches("Mac OS X", "10.5");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Snow Leopard.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1256,9 +1183,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_SNOW_LEOPARD = getOsMatches("Mac OS X", "10.6");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Lion.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1268,9 +1194,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_LION = getOsMatches("Mac OS X", "10.7");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Mountain Lion.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1280,9 +1205,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_MOUNTAIN_LION = getOsMatches("Mac OS X", "10.8");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Mavericks.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1292,9 +1216,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_MAVERICKS = getOsMatches("Mac OS X", "10.9");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Yosemite.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1304,9 +1227,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_YOSEMITE = getOsMatches("Mac OS X", "10.10");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X El Capitan.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1316,9 +1238,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_EL_CAPITAN = getOsMatches("Mac OS X", "10.11");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Sierra.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1328,9 +1249,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_SIERRA = getOsMatches("Mac OS X", "10.12");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X High Sierra.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1340,9 +1260,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_HIGH_SIERRA = getOsMatches("Mac OS X", "10.13");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Mojave.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1352,9 +1271,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_MOJAVE = getOsMatches("Mac OS X", "10.14");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Catalina.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1364,9 +1282,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_CATALINA = getOsMatches("Mac OS X", "10.15");
 
     /**
-     * <p>
      * Is {@code true} if this is Mac OS X Big Sur.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1376,9 +1293,8 @@ public class SystemUtils {
     public static final boolean IS_OS_MAC_OSX_BIG_SUR = getOsMatches("Mac OS X", "10.16");
 
     /**
-     * <p>
      * Is {@code true} if this is FreeBSD.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1388,9 +1304,8 @@ public class SystemUtils {
     public static final boolean IS_OS_FREE_BSD = getOsMatchesName("FreeBSD");
 
     /**
-     * <p>
      * Is {@code true} if this is OpenBSD.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1400,9 +1315,8 @@ public class SystemUtils {
     public static final boolean IS_OS_OPEN_BSD = getOsMatchesName("OpenBSD");
 
     /**
-     * <p>
      * Is {@code true} if this is NetBSD.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1412,9 +1326,8 @@ public class SystemUtils {
     public static final boolean IS_OS_NET_BSD = getOsMatchesName("NetBSD");
 
     /**
-     * <p>
      * Is {@code true} if this is OS/2.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1424,9 +1337,8 @@ public class SystemUtils {
     public static final boolean IS_OS_OS2 = getOsMatchesName("OS/2");
 
     /**
-     * <p>
      * Is {@code true} if this is Solaris.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1436,9 +1348,8 @@ public class SystemUtils {
     public static final boolean IS_OS_SOLARIS = getOsMatchesName("Solaris");
 
     /**
-     * <p>
      * Is {@code true} if this is SunOS.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1448,9 +1359,8 @@ public class SystemUtils {
     public static final boolean IS_OS_SUN_OS = getOsMatchesName("SunOS");
 
     /**
-     * <p>
      * Is {@code true} if this is a UNIX like system, as in any of AIX, HP-UX, Irix, Linux, MacOSX, Solaris or SUN OS.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1461,9 +1371,8 @@ public class SystemUtils {
             || IS_OS_SOLARIS || IS_OS_SUN_OS || IS_OS_FREE_BSD || IS_OS_OPEN_BSD || IS_OS_NET_BSD;
 
     /**
-     * <p>
      * Is {@code true} if this is Windows.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1473,9 +1382,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS = getOsMatchesName(OS_NAME_WINDOWS_PREFIX);
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 2000.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1485,9 +1393,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_2000 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 2000");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 2003.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1497,9 +1404,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_2003 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 2003");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows Server 2008.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1509,9 +1415,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_2008 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " Server 2008");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows Server 2012.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1521,9 +1426,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_2012 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " Server 2012");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 95.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1533,9 +1437,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_95 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 95");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 98.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1545,9 +1448,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_98 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 98");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows ME.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1557,9 +1459,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_ME = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " Me");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows NT.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1569,9 +1470,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_NT = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " NT");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows XP.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1581,9 +1481,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_XP = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " XP");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows Vista.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1593,9 +1492,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_VISTA = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " Vista");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 7.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1605,9 +1503,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_7 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 7");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 8.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1617,9 +1514,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_8 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 8");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 10.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1629,9 +1525,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_10 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 10");
 
     /**
-     * <p>
      * Is {@code true} if this is Windows 11.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1648,9 +1543,8 @@ public class SystemUtils {
     public static final boolean IS_OS_WINDOWS_11 = getOsMatchesName(OS_NAME_WINDOWS_PREFIX + " 11");
 
     /**
-     * <p>
      * Is {@code true} if this is z/OS.
-     * </p>
+     *
      * <p>
      * The field will return {@code false} if {@code OS_NAME} is {@code null}.
      * </p>
@@ -1665,9 +1559,8 @@ public class SystemUtils {
     public static final boolean IS_OS_ZOS = getOsMatchesName("z/OS");
 
     /**
-     * <p>
      * Gets an environment variable, defaulting to {@code defaultValue} if the variable cannot be read.
-     * </p>
+     *
      * <p>
      * If a {@link SecurityException} is caught, the return value is {@code defaultValue} and a message is written to
      * {@code System.err}.
@@ -1707,9 +1600,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets the Java home directory as a {@link File}.
-     * </p>
      *
      * @return a directory
      * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow
@@ -1722,9 +1613,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets the Java IO temporary directory as a {@link File}.
-     * </p>
      *
      * @return a directory
      * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow
@@ -1737,9 +1626,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Decides if the Java version matches.
-     * </p>
      *
      * @param versionPrefix the prefix for the java version
      * @return true if matches, or false if not or can't determine
@@ -1770,9 +1657,8 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets a System property, defaulting to {@code null} if the property cannot be read.
-     * </p>
+     *
      * <p>
      * If a {@link SecurityException} is caught, the return value is {@code null} and a message is written to
      * {@code System.err}.
@@ -1793,9 +1679,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets the user directory as a {@link File}.
-     * </p>
      *
      * @return a directory
      * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow
@@ -1808,9 +1692,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets the user home directory as a {@link File}.
-     * </p>
      *
      * @return a directory
      * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow
@@ -1823,9 +1705,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets the user name.
-     * </p>
      *
      * @return a name
      * @throws SecurityException if a security manager exists and its {@code checkPropertyAccess} method doesn't allow
@@ -1838,9 +1718,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Gets the user name.
-     * </p>
      *
      * @param defaultValue A default value.
      * @return a name
@@ -1866,9 +1744,7 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Is the Java version at least the requested version.
-     * </p>
      *
      * @param requiredVersion the required version, for example 1.31f
      * @return {@code true} if the actual version is equal or greater than the required version
@@ -1878,9 +1754,8 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Is the Java version at most the requested version.
-     * </p>
+     *
      * <p>
      * Example input:
      * </p>
@@ -1894,9 +1769,8 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * Decides if the Java version matches.
-     * </p>
+     *
      * <p>
      * This method is package private instead of private to support unit test invocation.
      * </p>
@@ -1975,10 +1849,9 @@ public class SystemUtils {
     }
 
     /**
-     * <p>
      * SystemUtils instances should NOT be constructed in standard programming. Instead, the class should be used as
      * {@code SystemUtils.FILE_SEPARATOR}.
-     * </p>
+     *
      * <p>
      * This constructor is public to permit tools that require a JavaBean instance to operate.
      * </p>
diff --git a/src/main/java/org/apache/commons/lang3/ThreadUtils.java b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
index 048842d21..d602793f2 100644
--- a/src/main/java/org/apache/commons/lang3/ThreadUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
@@ -28,9 +28,8 @@ import java.util.stream.Stream;
 import org.apache.commons.lang3.time.DurationUtils;
 
 /**
- * <p>
  * Helpers for {@code java.lang.Thread} and {@code java.lang.ThreadGroup}.
- * </p>
+ *
  * <p>
  * #ThreadSafe#
  * </p>
@@ -571,10 +570,9 @@ public class ThreadUtils {
     }
 
     /**
-     * <p>
      * ThreadUtils instances should NOT be constructed in standard programming. Instead, the class should be used as
      * {@code ThreadUtils.getAllThreads()}
-     * </p>
+     *
      * <p>
      * This constructor is public to permit tools that require a JavaBean instance to operate.
      * </p>
diff --git a/src/main/java/org/apache/commons/lang3/Validate.java b/src/main/java/org/apache/commons/lang3/Validate.java
index c194f8882..370641a0c 100644
--- a/src/main/java/org/apache/commons/lang3/Validate.java
+++ b/src/main/java/org/apache/commons/lang3/Validate.java
@@ -23,7 +23,7 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
- * <p>This class assists in validating arguments. The validation methods are
+ * This class assists in validating arguments. The validation methods are
  * based along the following principles:
  * <ul>
  *   <li>An invalid {@code null} argument causes a {@link NullPointerException}.</li>
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
  *
  * <p>All exceptions messages are
  * <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html#syntax">format strings</a>
- * as defined by the Java platform. For example:</p>
+ * as defined by the Java platform. For example:
  *
  * <pre>
  * Validate.isTrue(i &gt; 0, "The value must be greater than zero: %d", i);
@@ -83,10 +83,10 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the argument condition is {@code true}; otherwise
+     * Validate that the argument condition is {@code true}; otherwise
      * throwing an exception with the specified message. This method is useful when
      * validating according to an arbitrary boolean expression, such as validating a
-     * primitive number or using your own custom validation expression.</p>
+     * primitive number or using your own custom validation expression.
      *
      * <pre>Validate.isTrue(i &gt; 0.0, "The value must be greater than zero: &#37;d", i);</pre>
      *
@@ -108,10 +108,10 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the argument condition is {@code true}; otherwise
+     * Validate that the argument condition is {@code true}; otherwise
      * throwing an exception with the specified message. This method is useful when
      * validating according to an arbitrary boolean expression, such as validating a
-     * primitive number or using your own custom validation expression.</p>
+     * primitive number or using your own custom validation expression.
      *
      * <pre>Validate.isTrue(d &gt; 0.0, "The value must be greater than zero: &#37;s", d);</pre>
      *
@@ -133,10 +133,10 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the argument condition is {@code true}; otherwise
+     * Validate that the argument condition is {@code true}; otherwise
      * throwing an exception with the specified message. This method is useful when
      * validating according to an arbitrary boolean expression, such as validating a
-     * primitive number or using your own custom validation expression.</p>
+     * primitive number or using your own custom validation expression.
      *
      * <pre>
      * Validate.isTrue(i &gt;= min &amp;&amp; i &lt;= max, "The value must be between &#37;d and &#37;d", min, max);
@@ -157,10 +157,10 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the argument condition is {@code true}; otherwise
+     * Validate that the argument condition is {@code true}; otherwise
      * throwing an exception. This method is useful when validating according
      * to an arbitrary boolean expression, such as validating a
-     * primitive number or using your own custom validation expression.</p>
+     * primitive number or using your own custom validation expression.
      *
      * <pre>
      * Validate.isTrue(i &gt; 0);
@@ -182,13 +182,13 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument is not {@code null};
+     * Validate that the specified argument is not {@code null};
      * otherwise throwing an exception.
      *
      * <pre>Validate.notNull(myObject, "The object must not be null");</pre>
      *
      * <p>The message of the exception is &quot;The validated object is
-     * null&quot;.</p>
+     * null&quot;.
      *
      * @param <T> the object type
      * @param object  the object to check
@@ -203,7 +203,7 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument is not {@code null};
+     * Validate that the specified argument is not {@code null};
      * otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.notNull(myObject, "The object must not be null");</pre>
@@ -295,7 +295,7 @@ public class Validate {
      * <pre>Validate.notEmpty(myCollection);</pre>
      *
      * <p>The message in the exception is &quot;The validated collection is
-     * empty&quot;.</p>
+     * empty&quot;.
      *
      * @param <T> the collection type
      * @param collection  the collection to check, validated not null by this method
@@ -309,7 +309,7 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument map is neither {@code null}
+     * Validate that the specified argument map is neither {@code null}
      * nor a size of zero (no elements); otherwise throwing an exception
      * with the specified message.
      *
@@ -339,7 +339,7 @@ public class Validate {
      * <pre>Validate.notEmpty(myMap);</pre>
      *
      * <p>The message in the exception is &quot;The validated map is
-     * empty&quot;.</p>
+     * empty&quot;.
      *
      * @param <T> the map type
      * @param map  the map to check, validated not null by this method
@@ -353,7 +353,7 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument character sequence is
+     * Validate that the specified argument character sequence is
      * neither {@code null} nor a length of zero (no characters);
      * otherwise throwing an exception with the specified message.
      *
@@ -384,7 +384,7 @@ public class Validate {
      * <pre>Validate.notEmpty(myString);</pre>
      *
      * <p>The message in the exception is &quot;The validated
-     * character sequence is empty&quot;.</p>
+     * character sequence is empty&quot;.
      *
      * @param <T> the character sequence type
      * @param chars  the character sequence to check, validated not null by this method
@@ -398,7 +398,7 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument character sequence is
+     * Validate that the specified argument character sequence is
      * neither {@code null}, a length of zero (no characters), empty
      * nor whitespace; otherwise throwing an exception with the specified
      * message.
@@ -432,7 +432,7 @@ public class Validate {
      * <pre>Validate.notBlank(myString);</pre>
      *
      * <p>The message in the exception is &quot;The validated character
-     * sequence is blank&quot;.</p>
+     * sequence is blank&quot;.
      *
      * @param <T> the character sequence type
      * @param chars  the character sequence to check, validated not null by this method
@@ -448,14 +448,14 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument array is neither
+     * Validate that the specified argument array is neither
      * {@code null} nor contains any elements that are {@code null};
      * otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.noNullElements(myArray, "The array contain null at position %d");</pre>
      *
      * <p>If the array is {@code null}, then the message in the exception
-     * is &quot;The validated object is null&quot;.</p>
+     * is &quot;The validated object is null&quot;.
      *
      * <p>If the array has a {@code null} element, then the iteration
      * index of the invalid element is appended to the {@code values}
@@ -482,9 +482,9 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument array is neither
+     * Validate that the specified argument array is neither
      * {@code null} nor contains any elements that are {@code null};
-     * otherwise throwing an exception.</p>
+     * otherwise throwing an exception.
      *
      * <pre>Validate.noNullElements(myArray);</pre>
      *
@@ -507,14 +507,14 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument iterable is neither
+     * Validate that the specified argument iterable is neither
      * {@code null} nor contains any elements that are {@code null};
      * otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.noNullElements(myCollection, "The collection contains null at position %d");</pre>
      *
      * <p>If the iterable is {@code null}, then the message in the exception
-     * is &quot;The validated object is null&quot;.</p>
+     * is &quot;The validated object is null&quot;.
      *
      * <p>If the iterable has a {@code null} element, then the iteration
      * index of the invalid element is appended to the {@code values}
@@ -542,14 +542,14 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument iterable is neither
+     * Validate that the specified argument iterable is neither
      * {@code null} nor contains any elements that are {@code null};
      * otherwise throwing an exception.
      *
      * <pre>Validate.noNullElements(myCollection);</pre>
      *
      * <p>If the iterable is {@code null}, then the message in the exception
-     * is &quot;The validated object is null&quot;.</p>
+     * is &quot;The validated object is null&quot;.
      *
      * <p>If the array has a {@code null} element, then the message in the
      * exception is &quot;The validated iterable contains null element at index:
@@ -567,8 +567,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the index is within the bounds of the argument
-     * array; otherwise throwing an exception with the specified message.</p>
+     * Validates that the index is within the bounds of the argument
+     * array; otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.validIndex(myArray, 2, "The array index is invalid: ");</pre>
      *
@@ -596,8 +596,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the index is within the bounds of the argument
-     * array; otherwise throwing an exception.</p>
+     * Validates that the index is within the bounds of the argument
+     * array; otherwise throwing an exception.
      *
      * <pre>Validate.validIndex(myArray, 2);</pre>
      *
@@ -623,8 +623,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the index is within the bounds of the argument
-     * collection; otherwise throwing an exception with the specified message.</p>
+     * Validates that the index is within the bounds of the argument
+     * collection; otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.validIndex(myCollection, 2, "The collection index is invalid: ");</pre>
      *
@@ -652,8 +652,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the index is within the bounds of the argument
-     * collection; otherwise throwing an exception.</p>
+     * Validates that the index is within the bounds of the argument
+     * collection; otherwise throwing an exception.
      *
      * <pre>Validate.validIndex(myCollection, 2);</pre>
      *
@@ -676,9 +676,9 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the index is within the bounds of the argument
+     * Validates that the index is within the bounds of the argument
      * character sequence; otherwise throwing an exception with the
-     * specified message.</p>
+     * specified message.
      *
      * <pre>Validate.validIndex(myStr, 2, "The string index is invalid: ");</pre>
      *
@@ -706,8 +706,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the index is within the bounds of the argument
-     * character sequence; otherwise throwing an exception.</p>
+     * Validates that the index is within the bounds of the argument
+     * character sequence; otherwise throwing an exception.
      *
      * <pre>Validate.validIndex(myStr, 2);</pre>
      *
@@ -734,10 +734,10 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the stateful condition is {@code true}; otherwise
+     * Validate that the stateful condition is {@code true}; otherwise
      * throwing an exception. This method is useful when validating according
      * to an arbitrary boolean expression, such as validating a
-     * primitive number or using your own custom validation expression.</p>
+     * primitive number or using your own custom validation expression.
      *
      * <pre>
      * Validate.validState(field &gt; 0);
@@ -759,10 +759,10 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the stateful condition is {@code true}; otherwise
+     * Validate that the stateful condition is {@code true}; otherwise
      * throwing an exception with the specified message. This method is useful when
      * validating according to an arbitrary boolean expression, such as validating a
-     * primitive number or using your own custom validation expression.</p>
+     * primitive number or using your own custom validation expression.
      *
      * <pre>Validate.validState(this.isOk(), "The state is not OK: %s", myObject);</pre>
      *
@@ -781,8 +781,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument character sequence matches the specified regular
-     * expression pattern; otherwise throwing an exception.</p>
+     * Validate that the specified argument character sequence matches the specified regular
+     * expression pattern; otherwise throwing an exception.
      *
      * <pre>Validate.matchesPattern("hi", "[a-z]*");</pre>
      *
@@ -803,8 +803,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument character sequence matches the specified regular
-     * expression pattern; otherwise throwing an exception with the specified message.</p>
+     * Validate that the specified argument character sequence matches the specified regular
+     * expression pattern; otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.matchesPattern("hi", "[a-z]*", "%s does not match %s", "hi" "[a-z]*");</pre>
      *
@@ -827,8 +827,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the specified argument is not Not-a-Number (NaN); otherwise
-     * throwing an exception.</p>
+     * Validates that the specified argument is not Not-a-Number (NaN); otherwise
+     * throwing an exception.
      *
      * <pre>Validate.notNaN(myDouble);</pre>
      *
@@ -846,8 +846,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the specified argument is not Not-a-Number (NaN); otherwise
-     * throwing an exception with the specified message.</p>
+     * Validates that the specified argument is not Not-a-Number (NaN); otherwise
+     * throwing an exception with the specified message.
      *
      * <pre>Validate.notNaN(myDouble, "The value must be a number");</pre>
      *
@@ -866,8 +866,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the specified argument is not infinite or Not-a-Number (NaN);
-     * otherwise throwing an exception.</p>
+     * Validates that the specified argument is not infinite or Not-a-Number (NaN);
+     * otherwise throwing an exception.
      *
      * <pre>Validate.finite(myDouble);</pre>
      *
@@ -884,8 +884,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validates that the specified argument is not infinite or Not-a-Number (NaN);
-     * otherwise throwing an exception with the specified message.</p>
+     * Validates that the specified argument is not infinite or Not-a-Number (NaN);
+     * otherwise throwing an exception with the specified message.
      *
      * <pre>Validate.finite(myDouble, "The argument must contain a numeric value");</pre>
      *
@@ -904,8 +904,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument object fall between the two
-     * inclusive values specified; otherwise, throws an exception.</p>
+     * Validate that the specified argument object fall between the two
+     * inclusive values specified; otherwise, throws an exception.
      *
      * <pre>Validate.inclusiveBetween(0, 2, 1);</pre>
      *
@@ -926,9 +926,9 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument object fall between the two
+     * Validate that the specified argument object fall between the two
      * inclusive values specified; otherwise, throws an exception with the
-     * specified message.</p>
+     * specified message.
      *
      * <pre>Validate.inclusiveBetween(0, 2, 1, "Not in boundaries");</pre>
      *
@@ -1039,8 +1039,8 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument object fall between the two
-     * exclusive values specified; otherwise, throws an exception.</p>
+     * Validate that the specified argument object fall between the two
+     * exclusive values specified; otherwise, throws an exception.
      *
      * <pre>Validate.exclusiveBetween(0, 2, 1);</pre>
      *
@@ -1061,9 +1061,9 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the specified argument object fall between the two
+     * Validate that the specified argument object fall between the two
      * exclusive values specified; otherwise, throws an exception with the
-     * specified message.</p>
+     * specified message.
      *
      * <pre>Validate.exclusiveBetween(0, 2, 1, "Not in boundaries");</pre>
      *
@@ -1198,9 +1198,9 @@ public class Validate {
     }
 
     /**
-     * <p>Validate that the argument is an instance of the specified class; otherwise
+     * Validate that the argument is an instance of the specified class; otherwise
      * throwing an exception with the specified message. This method is useful when
-     * validating according to an arbitrary class</p>
+     * validating according to an arbitrary class
      *
      * <pre>Validate.isInstanceOf(OkClass.class, object, "Wrong class, object is of class %s",
      *   object.getClass().getName());</pre>
diff --git a/src/main/java/org/apache/commons/lang3/builder/Builder.java b/src/main/java/org/apache/commons/lang3/builder/Builder.java
index ad4edce90..5146830f3 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Builder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Builder.java
@@ -17,12 +17,10 @@
 package org.apache.commons.lang3.builder;
 
 /**
- * <p>
  * The Builder interface is designed to designate a class as a <em>builder</em>
  * object in the Builder design pattern. Builders are capable of creating and
  * configuring objects or results that normally take multiple steps to construct
  * or are very complex to derive.
- * </p>
  *
  * <p>
  * The builder interface defines a single method, {@link #build()}, that
@@ -71,7 +69,6 @@ package org.apache.commons.lang3.builder;
  *                                                              .build();
  * </code></pre>
  *
- *
  * @param <T> the type of object that the builder will construct or compute.
  *
  * @since 3.0
diff --git a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
index bd93a37aa..f3dd7df0e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/CompareToBuilder.java
@@ -102,7 +102,7 @@ public class CompareToBuilder implements Builder<Integer> {
     private int comparison;
 
     /**
-     * <p>Constructor for CompareToBuilder.</p>
+     * Constructor for CompareToBuilder.
      *
      * <p>Starts off assuming that the objects are equal. Multiple calls are
      * then made to the various append methods, followed by a call to
@@ -113,7 +113,7 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Compares two {@link Object}s via reflection.</p>
+     * Compares two {@link Object}s via reflection.
      *
      * <p>Fields can be private, thus {@code AccessibleObject.setAccessible}
      * is used to bypass normal access control checks. This will fail under a
@@ -143,7 +143,7 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Compares two {@link Object}s via reflection.</p>
+     * Compares two {@link Object}s via reflection.
      *
      * <p>Fields can be private, thus {@code AccessibleObject.setAccessible}
      * is used to bypass normal access control checks. This will fail under a
@@ -175,7 +175,7 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Compares two {@link Object}s via reflection.</p>
+     * Compares two {@link Object}s via reflection.
      *
      * <p>Fields can be private, thus {@code AccessibleObject.setAccessible}
      * is used to bypass normal access control checks. This will fail under a
@@ -208,7 +208,7 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Compares two {@link Object}s via reflection.</p>
+     * Compares two {@link Object}s via reflection.
      *
      * <p>Fields can be private, thus {@code AccessibleObject.setAccessible}
      * is used to bypass normal access control checks. This will fail under a
@@ -241,7 +241,7 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Compares two {@link Object}s via reflection.</p>
+     * Compares two {@link Object}s via reflection.
      *
      * <p>Fields can be private, thus {@code AccessibleObject.setAccessible}
      * is used to bypass normal access control checks. This will fail under a
@@ -299,8 +299,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to {@code builder} the comparison of {@code lhs}
-     * to {@code rhs} using the fields defined in {@code clazz}.</p>
+     * Appends to {@code builder} the comparison of {@code lhs}
+     * to {@code rhs} using the fields defined in {@code clazz}.
      *
      * @param lhs  left-hand object
      * @param rhs  right-hand object
@@ -337,8 +337,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the {@code compareTo(Object)}
-     * result of the superclass.</p>
+     * Appends to the {@code builder} the {@code compareTo(Object)}
+     * result of the superclass.
      *
      * @param superCompareTo  result of calling {@code super.compareTo(Object)}
      * @return this - used to chain append calls
@@ -353,8 +353,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the comparison of
-     * two {@link Object}s.</p>
+     * Appends to the {@code builder} the comparison of
+     * two {@link Object}s.
      *
      * <ol>
      * <li>Check if {@code lhs == rhs}</li>
@@ -376,8 +376,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the comparison of
-     * two {@link Object}s.</p>
+     * Appends to the {@code builder} the comparison of
+     * two {@link Object}s.
      *
      * <ol>
      * <li>Check if {@code lhs == rhs}</li>
@@ -539,8 +539,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the comparison of
-     * two {@code double}s.</p>
+     * Appends to the {@code builder} the comparison of
+     * two {@code double}s.
      *
      * <p>This handles NaNs, Infinities, and {@code -0.0}.</p>
      *
@@ -560,8 +560,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the comparison of
-     * two {@code float}s.</p>
+     * Appends to the {@code builder} the comparison of
+     * two {@code float}s.
      *
      * <p>This handles NaNs, Infinities, and {@code -0.0}.</p>
      *
@@ -604,8 +604,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@link Object} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@link Object} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -628,8 +628,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@link Object} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@link Object} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -676,8 +676,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code long} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code long} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -716,8 +716,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code int} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code int} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -756,8 +756,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code short} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code short} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -796,8 +796,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code char} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code char} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -836,8 +836,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code byte} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code byte} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -876,8 +876,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code double} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code double} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -916,8 +916,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code float} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code float} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
@@ -956,8 +956,8 @@ public class CompareToBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>Appends to the {@code builder} the deep comparison of
-     * two {@code boolean} arrays.</p>
+     * Appends to the {@code builder} the deep comparison of
+     * two {@code boolean} arrays.
      *
      * <ol>
      *  <li>Check if arrays are the same using {@code ==}</li>
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diff.java b/src/main/java/org/apache/commons/lang3/builder/Diff.java
index b7d78b915..763cd9ae0 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diff.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diff.java
@@ -23,17 +23,14 @@ import org.apache.commons.lang3.reflect.TypeUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 /**
- * <p>
  * A {@link Diff} contains the differences between two {@link Diffable} class
  * fields.
- * </p>
  *
  * <p>
  * Typically, {@link Diff}s are retrieved by using a {@link DiffBuilder} to
  * produce a {@link DiffResult}, containing the differences between two objects.
  * </p>
  *
- *
  * @param <T>
  *            The type of object contained within this {@link Diff}. Differences
  *            between primitive objects are stored as their Object wrapper
@@ -51,9 +48,7 @@ public abstract class Diff<T> extends Pair<T, T> {
     private final String fieldName;
 
     /**
-     * <p>
      * Constructs a new {@link Diff} for the given field name.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -66,9 +61,7 @@ public abstract class Diff<T> extends Pair<T, T> {
     }
 
     /**
-     * <p>
      * Gets the type of the field.
-     * </p>
      *
      * @return the field type
      */
@@ -77,9 +70,7 @@ public abstract class Diff<T> extends Pair<T, T> {
     }
 
     /**
-     * <p>
      * Gets the name of the field.
-     * </p>
      *
      * @return the field name
      */
@@ -88,15 +79,13 @@ public abstract class Diff<T> extends Pair<T, T> {
     }
 
     /**
-     * <p>
      * Returns a {@link String} representation of the {@link Diff}, with the
-     * following format:</p>
+     * following format:
      *
      * <pre>
      * [fieldname: left-value, right-value]
      * </pre>
      *
-     *
      * @return the string representation
      */
     @Override
@@ -105,9 +94,7 @@ public abstract class Diff<T> extends Pair<T, T> {
     }
 
     /**
-     * <p>
      * Throws {@link UnsupportedOperationException}.
-     * </p>
      *
      * @param value
      *            ignored
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
index b2dd21269..013e323e2 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
@@ -26,9 +26,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.Validate;
 
 /**
- * <p>
  * Assists in implementing {@link Diffable#diff(Object)} methods.
- * </p>
  *
  * <p>
  * To use this class, write code as follows:
@@ -76,9 +74,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     private final ToStringStyle style;
 
     /**
-     * <p>
      * Constructs a builder for the specified objects with the specified style.
-     * </p>
      *
      * <p>
      * If {@code lhs == rhs} or {@code lhs.equals(rhs)} then the builder will
@@ -119,9 +115,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Constructs a builder for the specified objects with the specified style.
-     * </p>
      *
      * <p>
      * If {@code lhs == rhs} or {@code lhs.equals(rhs)} then the builder will
@@ -151,9 +145,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code boolean}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -191,9 +183,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code boolean[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -230,9 +220,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code byte}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -269,9 +257,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code byte[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -309,9 +295,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code char}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -349,9 +333,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code char[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -389,9 +371,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code double}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -429,9 +409,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code double[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -469,9 +447,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code float}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -509,9 +485,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code float[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -549,9 +523,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code int}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -589,9 +561,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code int[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -629,9 +599,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code long}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -669,9 +637,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code long[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -709,9 +675,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code short}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -749,9 +713,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code short[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -789,9 +751,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@link Objects}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -873,9 +833,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Test if two {@code Object[]}s are equal.
-     * </p>
      *
      * @param fieldName
      *            the field name
@@ -914,9 +872,7 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Append diffs from another {@link DiffResult}.
-     * </p>
      *
      * <p>
      * This method is useful if you want to compare properties which are
@@ -959,10 +915,8 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
     }
 
     /**
-     * <p>
      * Builds a {@link DiffResult} based on the differences appended to this
      * builder.
-     * </p>
      *
      * @return a {@link DiffResult} containing the differences between the two
      *         objects.
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
index 9c3f5fcf3..cb969bd16 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
@@ -23,12 +23,11 @@ import java.util.List;
 import org.apache.commons.lang3.Validate;
 
 /**
- * <p>
  * A {@link DiffResult} contains a collection of the differences between two
  * {@link Diffable} objects. Typically these differences are displayed using
  * {@link #toString()} method, which returns a string describing the fields that
  * differ between the objects.
- * </p>
+ *
  * <p>
  * Use a {@link DiffBuilder} to build a {@link DiffResult} comparing two objects.
  * </p>
@@ -39,10 +38,9 @@ import org.apache.commons.lang3.Validate;
 public class DiffResult<T> implements Iterable<Diff<?>> {
 
     /**
-     * <p>
      * The {@link String} returned when the objects have no differences:
      * {@value}
-     * </p>
+     *
      */
     public static final String OBJECTS_SAME_STRING = "";
 
@@ -54,10 +52,8 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     private final ToStringStyle style;
 
     /**
-     * <p>
      * Creates a {@link DiffResult} containing the differences between two
      * objects.
-     * </p>
      *
      * @param lhs
      *            the left-hand object
@@ -89,7 +85,7 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>Returns the object the right object has been compared to.</p>
+     * Returns the object the right object has been compared to.
      *
      * @return the left object of the diff
      * @since 3.10
@@ -99,7 +95,7 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>Returns the object the left object has been compared to.</p>
+     * Returns the object the left object has been compared to.
      *
      * @return the right object of the diff
      * @since 3.10
@@ -109,10 +105,8 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>
      * Returns an unmodifiable list of {@link Diff}s. The list may be empty if
      * there were no differences between the objects.
-     * </p>
      *
      * @return an unmodifiable list of {@link Diff}s
      */
@@ -121,9 +115,7 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>
      * Returns the number of differences between the two objects.
-     * </p>
      *
      * @return the number of differences
      */
@@ -132,9 +124,7 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>
      * Returns the style used by the {@link #toString()} method.
-     * </p>
      *
      * @return the style
      */
@@ -143,12 +133,10 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>
      * Builds a {@link String} description of the differences contained within
      * this {@link DiffResult}. A {@link ToStringBuilder} is used for each object
      * and the style of the output is governed by the {@link ToStringStyle}
      * passed to the constructor.
-     * </p>
      *
      * <p>
      * If there are no differences stored in this list, the method will return
@@ -179,10 +167,8 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>
      * Builds a {@link String} description of the differences contained within
      * this {@link DiffResult}, using the supplied {@link ToStringStyle}.
-     * </p>
      *
      * @param style
      *            the {@link ToStringStyle} to use when outputting the objects
@@ -206,9 +192,7 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
     }
 
     /**
-     * <p>
      * Returns an iterator over the {@link Diff} objects contained in this list.
-     * </p>
      *
      * @return the iterator
      */
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diffable.java b/src/main/java/org/apache/commons/lang3/builder/Diffable.java
index ef2065516..cf4b33f0e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diffable.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diffable.java
@@ -17,9 +17,9 @@
 package org.apache.commons.lang3.builder;
 
 /**
- * <p>{@link Diffable} classes can be compared with other objects
+ * {@link Diffable} classes can be compared with other objects
  * for differences. The {@link DiffResult} object retrieved can be queried
- * for a list of differences or printed using the {@link DiffResult#toString()}.</p>
+ * for a list of differences or printed using the {@link DiffResult#toString()}.
  *
  * <p>The calculation of the differences is <i>consistent with equals</i> if
  * and only if {@code d1.equals(d2)} implies {@code d1.diff(d2) == ""}.
@@ -43,8 +43,8 @@ package org.apache.commons.lang3.builder;
 public interface Diffable<T> {
 
     /**
-     * <p>Retrieves a list of the differences between
-     * this object and the supplied object.</p>
+     * Retrieves a list of the differences between
+     * this object and the supplied object.
      *
      * @param obj the object to diff against, can be {@code null}
      * @return a list of differences
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
index f0e6862ec..3727be769 100644
--- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
@@ -30,7 +30,7 @@ import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 /**
- * <p>Assists in implementing {@link Object#equals(Object)} methods.</p>
+ * Assists in implementing {@link Object#equals(Object)} methods.
  *
  * <p> This class provides methods to build a good equals method for any
  * class. It follows rules laid out in
@@ -89,9 +89,7 @@ import org.apache.commons.lang3.tuple.Pair;
 public class EqualsBuilder implements Builder<Boolean> {
 
     /**
-     * <p>
      * A registry of objects used by reflection methods to detect cyclical object references and avoid infinite loops.
-     * </p>
      *
      * @since 3.0
      */
@@ -115,10 +113,8 @@ public class EqualsBuilder implements Builder<Boolean> {
      */
 
     /**
-     * <p>
      * Returns the registry of object pairs being traversed by the reflection
      * methods in the current thread.
-     * </p>
      *
      * @return Set the registry of objects being traversed
      * @since 3.0
@@ -128,9 +124,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>
      * Converters value pair into a register pair.
-     * </p>
      *
      * @param lhs {@code this} object
      * @param rhs the other object
@@ -144,12 +138,10 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>
      * Returns {@code true} if the registry contains the given object pair.
      * Used by the reflection methods to avoid infinite loops.
      * Objects might be swapped therefore a check is needed if the object pair
      * is registered in given or swapped order.
-     * </p>
      *
      * @param lhs {@code this} object to lookup in registry
      * @param rhs the other object to lookup on registry
@@ -166,10 +158,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>
      * Registers the given object pair.
      * Used by the reflection methods to avoid infinite loops.
-     * </p>
      *
      * @param lhs {@code this} object to register
      * @param rhs the other object to register
@@ -185,9 +175,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>
      * Unregisters the given object pair.
-     * </p>
      *
      * <p>
      * Used by the reflection methods to avoid infinite loops.
@@ -220,7 +208,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     private String[] excludeFields;
 
     /**
-     * <p>Constructor for EqualsBuilder.</p>
+     * Constructor for EqualsBuilder.
      *
      * <p>Starts off assuming that equals is {@code true}.</p>
      * @see Object#equals(Object)
@@ -257,8 +245,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Set {@link Class}es whose instances should be compared by calling their {@code equals}
-     * although being in recursive mode. So the fields of theses classes will not be compared recursively by reflection.</p>
+     * Set {@link Class}es whose instances should be compared by calling their {@code equals}
+     * although being in recursive mode. So the fields of theses classes will not be compared recursively by reflection.
      *
      * <p>Here you should name classes having non-transient fields which are cache fields being set lazily.<br>
      * Prominent example being {@link String} class with its hash code cache field. Due to the importance
@@ -298,8 +286,8 @@ public class EqualsBuilder implements Builder<Boolean> {
 
 
     /**
-     * <p>This method uses reflection to determine if the two {@link Object}s
-     * are equal.</p>
+     * This method uses reflection to determine if the two {@link Object}s
+     * are equal.
      *
      * <p>It uses {@code AccessibleObject.setAccessible} to gain access to private
      * fields. This means that it will throw a security exception if run under
@@ -324,8 +312,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>This method uses reflection to determine if the two {@link Object}s
-     * are equal.</p>
+     * This method uses reflection to determine if the two {@link Object}s
+     * are equal.
      *
      * <p>It uses {@code AccessibleObject.setAccessible} to gain access to private
      * fields. This means that it will throw a security exception if run under
@@ -350,8 +338,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>This method uses reflection to determine if the two {@link Object}s
-     * are equal.</p>
+     * This method uses reflection to determine if the two {@link Object}s
+     * are equal.
      *
      * <p>It uses {@code AccessibleObject.setAccessible} to gain access to private
      * fields. This means that it will throw a security exception if run under
@@ -377,8 +365,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>This method uses reflection to determine if the two {@link Object}s
-     * are equal.</p>
+     * This method uses reflection to determine if the two {@link Object}s
+     * are equal.
      *
      * <p>It uses {@code AccessibleObject.setAccessible} to gain access to private
      * fields. This means that it will throw a security exception if run under
@@ -411,8 +399,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>This method uses reflection to determine if the two {@link Object}s
-     * are equal.</p>
+     * This method uses reflection to determine if the two {@link Object}s
+     * are equal.
      *
      * <p>It uses {@code AccessibleObject.setAccessible} to gain access to private
      * fields. This means that it will throw a security exception if run under
@@ -464,7 +452,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Tests if two {@code objects} by using reflection.</p>
+     * Tests if two {@code objects} by using reflection.
      *
      * <p>It uses {@code AccessibleObject.setAccessible} to gain access to private
      * fields. This means that it will throw a security exception if run under
@@ -553,8 +541,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Appends the fields and values defined by the given object of the
-     * given Class.</p>
+     * Appends the fields and values defined by the given object of the
+     * given Class.
      *
      * @param lhs  the left-hand object
      * @param rhs  the right-hand object
@@ -595,7 +583,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Adds the result of {@code super.equals()} to this builder.</p>
+     * Adds the result of {@code super.equals()} to this builder.
      *
      * @param superEquals  the result of calling {@code super.equals()}
      * @return EqualsBuilder - used to chain calls.
@@ -610,11 +598,11 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@link Object}s are equal using either
+     * Test if two {@link Object}s are equal using either
      * #{@link #reflectionAppend(Object, Object)}, if object are non
      * primitives (or wrapper of primitives) or if field {@code testRecursive}
      * is set to {@code false}. Otherwise, using their
-     * {@code equals} method.</p>
+     * {@code equals} method.
      *
      * @param lhs  the left-hand object
      * @param rhs  the right-hand object
@@ -646,7 +634,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if an {@link Object} is equal to an array.</p>
+     * Test if an {@link Object} is equal to an array.
      *
      * @param lhs  the left-hand object, an array
      * @param rhs  the right-hand object
@@ -680,9 +668,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>
      * Test if two {@code long} s are equal.
-     * </p>
      *
      * @param lhs
      *                  the left-hand {@code long}
@@ -699,7 +685,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code int}s are equal.</p>
+     * Test if two {@code int}s are equal.
      *
      * @param lhs  the left-hand {@code int}
      * @param rhs  the right-hand {@code int}
@@ -714,7 +700,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code short}s are equal.</p>
+     * Test if two {@code short}s are equal.
      *
      * @param lhs  the left-hand {@code short}
      * @param rhs  the right-hand {@code short}
@@ -729,7 +715,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code char}s are equal.</p>
+     * Test if two {@code char}s are equal.
      *
      * @param lhs  the left-hand {@code char}
      * @param rhs  the right-hand {@code char}
@@ -744,7 +730,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code byte}s are equal.</p>
+     * Test if two {@code byte}s are equal.
      *
      * @param lhs  the left-hand {@code byte}
      * @param rhs  the right-hand {@code byte}
@@ -759,8 +745,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code double}s are equal by testing that the
-     * pattern of bits returned by {@code doubleToLong} are equal.</p>
+     * Test if two {@code double}s are equal by testing that the
+     * pattern of bits returned by {@code doubleToLong} are equal.
      *
      * <p>This handles NaNs, Infinities, and {@code -0.0}.</p>
      *
@@ -779,8 +765,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code float}s are equal by testing that the
-     * pattern of bits returned by doubleToLong are equal.</p>
+     * Test if two {@code float}s are equal by testing that the
+     * pattern of bits returned by doubleToLong are equal.
      *
      * <p>This handles NaNs, Infinities, and {@code -0.0}.</p>
      *
@@ -799,7 +785,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Test if two {@code booleans}s are equal.</p>
+     * Test if two {@code booleans}s are equal.
      *
      * @param lhs  the left-hand {@code boolean}
      * @param rhs  the right-hand {@code boolean}
@@ -814,7 +800,7 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Performs a deep comparison of two {@link Object} arrays.</p>
+     * Performs a deep comparison of two {@link Object} arrays.
      *
      * <p>This also will be called for the top level of
      * multi-dimensional, ragged, and multi-typed arrays.</p>
@@ -848,8 +834,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code long}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code long}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(long, long)} is used.</p>
      *
@@ -879,8 +865,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code int}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code int}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(int, int)} is used.</p>
      *
@@ -910,8 +896,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code short}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code short}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(short, short)} is used.</p>
      *
@@ -941,8 +927,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code char}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code char}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(char, char)} is used.</p>
      *
@@ -972,8 +958,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code byte}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code byte}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(byte, byte)} is used.</p>
      *
@@ -1003,8 +989,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code double}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code double}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(double, double)} is used.</p>
      *
@@ -1034,8 +1020,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code float}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code float}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(float, float)} is used.</p>
      *
@@ -1065,8 +1051,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Deep comparison of array of {@code boolean}. Length and all
-     * values are compared.</p>
+     * Deep comparison of array of {@code boolean}. Length and all
+     * values are compared.
      *
      * <p>The method {@link #append(boolean, boolean)} is used.</p>
      *
@@ -1096,8 +1082,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Returns {@code true} if the fields that have been checked
-     * are all equal.</p>
+     * Returns {@code true} if the fields that have been checked
+     * are all equal.
      *
      * @return boolean
      */
@@ -1106,8 +1092,8 @@ public class EqualsBuilder implements Builder<Boolean> {
     }
 
     /**
-     * <p>Returns {@code true} if the fields that have been checked
-     * are all equal.</p>
+     * Returns {@code true} if the fields that have been checked
+     * are all equal.
      *
      * @return {@code true} if all of the fields that have been checked
      *         are equal, {@code false} otherwise.
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index c2556fa41..02765282d 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -31,9 +31,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.Validate;
 
 /**
- * <p>
  * Assists in implementing {@link Object#hashCode()} methods.
- * </p>
  *
  * <p>
  * This class enables a good {@code hashCode} method to be built for any class. It follows the rules laid out in
@@ -115,9 +113,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     private static final int DEFAULT_MULTIPLIER_VALUE = 37;
 
     /**
-     * <p>
      * A registry of objects used by reflection methods to detect cyclical object references and avoid infinite loops.
-     * </p>
      *
      * @since 2.3
      */
@@ -141,9 +137,7 @@ public class HashCodeBuilder implements Builder<Integer> {
      */
 
     /**
-     * <p>
      * Returns the registry of objects being traversed by the reflection methods in the current thread.
-     * </p>
      *
      * @return Set the registry of objects being traversed
      * @since 2.3
@@ -153,10 +147,8 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Returns {@code true} if the registry contains the given object. Used by the reflection methods to avoid
      * infinite loops.
-     * </p>
      *
      * @param value
      *            The object to lookup in the registry.
@@ -169,9 +161,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Appends the fields and values defined by the given object of the given {@link Class}.
-     * </p>
      *
      * @param object
      *            the object to append details of
@@ -216,9 +206,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Uses reflection to build a valid hash code from the fields of {@code object}.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -260,9 +248,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Uses reflection to build a valid hash code from the fields of {@code object}.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -307,9 +293,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Uses reflection to build a valid hash code from the fields of {@code object}.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -370,9 +354,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Uses reflection to build a valid hash code from the fields of {@code object}.
-     * </p>
      *
      * <p>
      * This constructor uses two hard coded choices for the constants needed to build a hash code.
@@ -410,9 +392,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Uses reflection to build a valid hash code from the fields of {@code object}.
-     * </p>
      *
      * <p>
      * This constructor uses two hard coded choices for the constants needed to build a hash code.
@@ -449,9 +429,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Uses reflection to build a valid hash code from the fields of {@code object}.
-     * </p>
      *
      * <p>
      * This constructor uses two hard coded choices for the constants needed to build a hash code.
@@ -489,9 +467,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Registers the given object. Used by the reflection methods to avoid infinite loops.
-     * </p>
      *
      * @param value
      *            The object to register.
@@ -506,9 +482,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Unregisters the given object.
-     * </p>
      *
      * <p>
      * Used by the reflection methods to avoid infinite loops.
@@ -538,9 +512,8 @@ public class HashCodeBuilder implements Builder<Integer> {
     private int iTotal;
 
     /**
-     * <p>
      * Uses two hard coded choices for the constants needed to build a {@code hashCode}.
-     * </p>
+     *
      */
     public HashCodeBuilder() {
         iConstant = 37;
@@ -548,10 +521,8 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Two randomly chosen, odd numbers must be passed in. Ideally these should be different for each class,
      * however this is not vital.
-     * </p>
      *
      * <p>
      * Prime numbers are preferred, especially for the multiplier.
@@ -572,9 +543,8 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code boolean}.
-     * </p>
+     *
      * <p>
      * This adds {@code 1} when true, and {@code 0} when false to the {@code hashCode}.
      * </p>
@@ -598,9 +568,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code boolean} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -618,9 +586,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code byte}.
-     * </p>
      *
      * @param value
      *            the byte to add to the {@code hashCode}
@@ -632,9 +598,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code byte} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -652,9 +616,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code char}.
-     * </p>
      *
      * @param value
      *            the char to add to the {@code hashCode}
@@ -666,9 +628,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code char} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -686,9 +646,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code double}.
-     * </p>
      *
      * @param value
      *            the double to add to the {@code hashCode}
@@ -699,9 +657,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code double} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -719,9 +675,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code float}.
-     * </p>
      *
      * @param value
      *            the float to add to the {@code hashCode}
@@ -733,9 +687,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code float} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -753,9 +705,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for an {@code int}.
-     * </p>
      *
      * @param value
      *            the int to add to the {@code hashCode}
@@ -767,9 +717,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for an {@code int} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -787,9 +735,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code long}.
-     * </p>
      *
      * @param value
      *            the long to add to the {@code hashCode}
@@ -805,9 +751,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code long} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -825,9 +769,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for an {@link Object}.
-     * </p>
      *
      * @param object
      *            the Object to add to the {@code hashCode}
@@ -848,9 +790,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for an array.
-     * </p>
      *
      * @param object
      *            the array to add to the {@code hashCode}
@@ -881,9 +821,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for an {@link Object} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -901,9 +839,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code short}.
-     * </p>
      *
      * @param value
      *            the short to add to the {@code hashCode}
@@ -915,9 +851,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Append a {@code hashCode} for a {@code short} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code hashCode}
@@ -935,9 +869,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Adds the result of super.hashCode() to this builder.
-     * </p>
      *
      * @param superHashCode
      *            the result of calling {@code super.hashCode()}
@@ -950,9 +882,7 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * Returns the computed {@code hashCode}.
-     * </p>
      *
      * @return {@code hashCode} based on the fields appended
      */
@@ -973,10 +903,9 @@ public class HashCodeBuilder implements Builder<Integer> {
     }
 
     /**
-     * <p>
      * The computed {@code hashCode} from toHashCode() is returned due to the likelihood
      * of bugs in mis-calling toHashCode() and the unlikeliness of it mattering what the hashCode for
-     * HashCodeBuilder itself is.</p>
+     * HashCodeBuilder itself is.
      *
      * @return {@code hashCode} based on the fields appended
      * @since 2.5
diff --git a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
index 6ff7c8d3a..443282cd1 100644
--- a/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/MultilineRecursiveToStringStyle.java
@@ -20,9 +20,9 @@ package org.apache.commons.lang3.builder;
 import org.apache.commons.lang3.ClassUtils;
 
 /**
- * <p>Works with {@link ToStringBuilder} to create a "deep" {@code toString}.
+ * Works with {@link ToStringBuilder} to create a "deep" {@code toString}.
  * But instead a single line like the {@link RecursiveToStringStyle} this creates a multiline String
- * similar to the {@link ToStringStyle#MULTI_LINE_STYLE}.</p>
+ * similar to the {@link ToStringStyle#MULTI_LINE_STYLE}.
  *
  * <p>To use this class write code as follows:</p>
  *
diff --git a/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
index 9a805a308..01b5e350c 100644
--- a/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/RecursiveToStringStyle.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import org.apache.commons.lang3.ClassUtils;
 
 /**
- * <p>Works with {@link ToStringBuilder} to create a "deep" {@code toString}.</p>
+ * Works with {@link ToStringBuilder} to create a "deep" {@code toString}.
  *
  * <p>To use this class write code as follows:</p>
  *
@@ -60,7 +60,7 @@ public class RecursiveToStringStyle extends ToStringStyle {
     private static final long serialVersionUID = 1L;
 
     /**
-     * <p>Constructor.</p>
+     * Constructor.
      */
     public RecursiveToStringStyle() {
     }
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
index a0395e236..ba1cdb360 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
@@ -25,9 +25,8 @@ import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 /**
- * <p>
  * Assists in implementing {@link Diffable#diff(Object)} methods.
- * </p>
+ *
  * <p>
  * All non-static, non-transient fields (including inherited fields)
  * of the objects to diff are discovered using reflection and compared
@@ -74,9 +73,7 @@ public class ReflectionDiffBuilder<T> implements Builder<DiffResult<T>> {
     private final DiffBuilder<T> diffBuilder;
 
     /**
-     * <p>
      * Constructs a builder for the specified objects with the specified style.
-     * </p>
      *
      * <p>
      * If {@code lhs == rhs} or {@code lhs.equals(rhs)} then the builder will
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index 919a6e82c..46faf3b55 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -32,9 +32,8 @@ import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.stream.Streams;
 
 /**
- * <p>
  * Assists in implementing {@link Object#toString()} methods using reflection.
- * </p>
+ *
  * <p>
  * This class uses reflection to determine the fields to append. Because these fields are usually private, the class
  * uses {@link java.lang.reflect.AccessibleObject#setAccessible(java.lang.reflect.AccessibleObject[], boolean)} to
@@ -136,9 +135,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Builds a {@code toString} value using the default {@link ToStringStyle} through reflection.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -165,9 +162,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Builds a {@code toString} value through reflection.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -200,9 +195,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Builds a {@code toString} value through reflection.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -241,9 +234,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Builds a {@code toString} value through reflection.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -290,9 +281,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Builds a {@code toString} value through reflection.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -349,9 +338,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Builds a {@code toString} value through reflection.
-     * </p>
      *
      * <p>
      * It uses {@code AccessibleObject.setAccessible} to gain access to private fields. This means that it will
@@ -496,9 +483,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     private Class<?> upToClass;
 
     /**
-     * <p>
      * Constructs a new instance.
-     * </p>
      *
      * <p>
      * This constructor outputs using the default style set with {@code setDefaultStyle}.
@@ -514,9 +499,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Constructs a new instance.
-     * </p>
      *
      * <p>
      * If the style is {@code null}, the default style is used.
@@ -534,9 +517,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Constructs a new instance.
-     * </p>
      *
      * <p>
      * If the style is {@code null}, the default style is used.
@@ -660,9 +641,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Appends the fields and values defined by the given object of the given Class.
-     * </p>
      *
      * <p>
      * If a cycle is detected as an object is &quot;toString()'ed&quot;, such an object is rendered as if
@@ -718,9 +697,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Gets the last super class to stop appending fields for.
-     * </p>
      *
      * @return The last super class to stop appending fields for.
      */
@@ -729,9 +706,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Calls {@code java.lang.reflect.Field.get(Object)}.
-     * </p>
      *
      * @param field
      *            The Field to query.
@@ -749,9 +724,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Gets whether or not to append static fields.
-     * </p>
      *
      * @return Whether or not to append static fields.
      * @since 2.1
@@ -761,9 +734,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Gets whether or not to append transient fields.
-     * </p>
      *
      * @return Whether or not to append transient fields.
      */
@@ -772,9 +743,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Gets whether or not to append fields whose values are null.
-     * </p>
      *
      * @return Whether or not to append fields whose values are null.
      * @since 3.6
@@ -784,9 +753,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Appends to the {@code toString} an {@link Object} array.
-     * </p>
      *
      * @param array
      *            the array to add to the {@code toString}
@@ -798,9 +765,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Sets whether or not to append static fields.
-     * </p>
      *
      * @param appendStatics
      *            Whether or not to append static fields.
@@ -811,9 +776,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Sets whether or not to append transient fields.
-     * </p>
      *
      * @param appendTransients
      *            Whether or not to append transient fields.
@@ -840,9 +803,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Sets whether or not to append fields whose values are null.
-     * </p>
      *
      * @param excludeNullValues
      *            Whether or not to append fields whose values are null.
@@ -871,9 +832,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
-     * <p>
      * Sets the last super class to stop appending fields for.
-     * </p>
      *
      * @param clazz
      *            The last super class to stop appending fields for.
@@ -889,9 +848,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
     }
 
     /**
... 7388 lines suppressed ...


[commons-lang] 01/03: Add a main test class to prints out the difference time working with MutableInt AtomicInteger.

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git

commit 21da81bb4d9d1080716fe4f75eddc96a8a4e27a7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 23 09:42:13 2022 -0400

    Add a main test class to prints out the difference time working with
    MutableInt AtomicInteger.
---
 .../lang3/mutable/PrintAtomicVsMutable.java        | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java b/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java
new file mode 100644
index 000000000..de9555f60
--- /dev/null
+++ b/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.lang3.mutable;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.commons.lang3.time.DurationUtils;
+
+/**
+ * Prints out the difference time working with {@link MutableInt} and {@link AtomicInteger}.
+ */
+public class PrintAtomicVsMutable {
+
+    public static void main(String[] args) {
+        MutableInt mInt = new MutableInt();
+        final int max = 100_000_000;
+        System.out.println("MutableInt " + DurationUtils.of(() -> {
+            for (int i = 0; i < max; i++) {
+                mInt.incrementAndGet();
+            }
+        }));
+        AtomicInteger aInt = new AtomicInteger();
+        System.out.println("AtomicInteger " + DurationUtils.of(() -> {
+            for (int i = 0; i < max; i++) {
+                aInt.incrementAndGet();
+            }
+        }));
+    }
+}


[commons-lang] 03/03: Normalize Javadoc paragraph tags "p" (lower case)

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git

commit 34e4ef7eaa03cdb4e5c87f447c0b42c81e24b0c2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 23 10:49:00 2022 -0400

    Normalize Javadoc paragraph tags "p" (lower case)
---
 src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java     | 2 +-
 .../java/org/apache/commons/lang3/builder/StandardToStringStyle.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index 02765282d..bf33b850e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -366,7 +366,7 @@ public class HashCodeBuilder implements Builder<Integer> {
      * also not as efficient as testing explicitly.
      * </p>
      *
-     * <P>
+     * <p>
      * If the TestTransients parameter is set to {@code true}, transient members will be tested, otherwise they
      * are ignored, as they are likely derived fields, and not part of the value of the {@link Object}.
      * </p>
diff --git a/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
index 0c11e3ab5..085e61943 100644
--- a/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/StandardToStringStyle.java
@@ -463,7 +463,7 @@ public class StandardToStringStyle extends ToStringStyle {
      * Gets the start text to output when an {@link Object} is
      * output in summary mode.
      *
-     * <P>This is output before the size value.</p>
+     * <p>This is output before the size value.</p>
      *
      * @return the current start of summary text
      */