[DOXIA-558] Upgrade to Commons Lang 3
Philippe Marschall <philippe.marschall@gmail.com>
This closes #3
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia/trunk@1800811 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-core/pom.xml b/doxia-core/pom.xml
index 7d523c8..7b3ce1f 100644
--- a/doxia-core/pom.xml
+++ b/doxia-core/pom.xml
@@ -55,9 +55,9 @@
<artifactId>plexus-component-annotations</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
index 26fd92f..4cb50db 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
@@ -27,7 +27,7 @@
import javax.swing.text.html.HTML.Tag;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.maven.doxia.markup.HtmlMarkup;
import org.codehaus.plexus.util.StringUtils;
@@ -249,8 +249,8 @@
}
else
{
- // StringEscapeUtils.unescapeHtml returns entities it doesn't recognize unchanged
- unescaped = StringEscapeUtils.unescapeHtml( text );
+ // StringEscapeUtils.unescapeHtml4 returns entities it doesn't recognize unchanged
+ unescaped = StringEscapeUtils.unescapeHtml4( text );
}
String tmp = unescaped;
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
index 25e7719..d4403db 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
/**
* A single sink event, used for testing purposes in order to check
diff --git a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
index 5cb9a43..0b477f9 100644
--- a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
+++ b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
@@ -28,8 +28,8 @@
import com.vladsch.flexmark.profiles.pegdown.Extensions;
import com.vladsch.flexmark.profiles.pegdown.PegdownOptionsAdapter;
import com.vladsch.flexmark.util.options.MutableDataHolder;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.module.xhtml.XhtmlParser;
import org.apache.maven.doxia.parser.AbstractParser;
