[maven-javadoc-plugin] 02/03: change to use StringEscapeUtils in commons-text 1.3 also change the length check to escapedValue instead of raw value.

[rf...@apache.org]

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

rfscholte pushed a commit to branch MJAVADOC-662
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 0f4ba75a4e6c5d507e4301e25cbaa9557804423f
Author: XenoAmess <xe...@gmail.com>
AuthorDate: Sat Aug 29 22:57:00 2020 +0800

    change to use StringEscapeUtils in commons-text 1.3 also change the length check to escapedValue instead of raw value.
---
 pom.xml                                                          | 5 +++++
 .../org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d7edee..ca3c59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,11 @@ under the License.
       <version>3.8.1</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.5.13</version>
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
index c6e31e0..fac56cc 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
@@ -39,7 +39,7 @@ import com.thoughtworks.qdox.parser.ParseException;
 import com.thoughtworks.qdox.type.TypeResolver;
 
 import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -1409,15 +1409,16 @@ public abstract class AbstractFixJavadocMojo
                 }
 
                 sb.append( "=\"" );
+                String escapedValue = StringEscapeUtils.escapeHtml4( value.toString() );
                 // reduce the size
                 // CHECKSTYLE_OFF: MagicNumber
-                if ( value.length() < 40 )
+                if ( escapedValue.length() < 40 )
                 {
-                    sb.append( StringEscapeUtils.escapeHtml4( value.toString() ) ).append( "\"" );
+                    sb.append( escapedValue ).append( "\"" );
                 }
                 else
                 {
-                    sb.append( StringEscapeUtils.escapeHtml4( value.toString() ), 0, 39 ).append( "\"{trunked}" );
+                    sb.append( escapedValue, 0, 39 ).append( "\"{trunked}" );
                 }
                 // CHECKSTYLE_ON: MagicNumber
             }