Author: michaelo Date: Tue Jul 4 19:39:16 2017 New Revision: 1800811 URL: http://svn.apache.org/viewvc?rev=1800811&view=rev Log: [DOXIA-558] Upgrade to Commons Lang 3
Philippe Marschall <[email protected]> This closes #3 Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=1800811&r1=1800810&r2=1800811&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-core/pom.xml Tue Jul 4 19:39:16 2017 @@ -55,9 +55,9 @@ under the License. <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> Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=1800811&r1=1800810&r2=1800811&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java Tue Jul 4 19:39:16 2017 @@ -27,7 +27,7 @@ import java.util.Map; 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 @@ public class HtmlTools } 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; Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java?rev=1800811&r1=1800810&r2=1800811&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java Tue Jul 4 19:39:16 2017 @@ -19,7 +19,7 @@ package org.apache.maven.doxia.sink.impl * 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 Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1800811&r1=1800810&r2=1800811&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java Tue Jul 4 19:39:16 2017 @@ -28,8 +28,8 @@ import com.vladsch.flexmark.html.HtmlRen 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;
