svn commit: r1742106 - in /sling/trunk/bundles/commons/fsclassloader: pom.xml src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java

[ol...@apache.org]

Author: olli
Date: Tue May  3 11:51:12 2016
New Revision: 1742106

URL: http://svn.apache.org/viewvc?rev=1742106&view=rev
Log:
SLING-5603 Upgrade Commons Lang to 3.4

Modified:
    sling/trunk/bundles/commons/fsclassloader/pom.xml
    sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java

Modified: sling/trunk/bundles/commons/fsclassloader/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/fsclassloader/pom.xml?rev=1742106&r1=1742105&r2=1742106&view=diff
==============================================================================
--- sling/trunk/bundles/commons/fsclassloader/pom.xml (original)
+++ sling/trunk/bundles/commons/fsclassloader/pom.xml Tue May  3 11:51:12 2016
@@ -109,9 +109,9 @@
             <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.5</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java?rev=1742106&r1=1742105&r2=1742106&view=diff
==============================================================================
--- sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java (original)
+++ sling/trunk/bundles/commons/fsclassloader/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java Tue May  3 11:51:12 2016
@@ -33,8 +33,8 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-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.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Properties;
@@ -365,7 +365,7 @@ public class FSClassLoaderWebConsole ext
                     is = new FileInputStream(toView);
                     String contents = IOUtils.toString(is);
                     w.write("<pre class=\"prettyprint linenums\">");
-                    StringEscapeUtils.escapeHtml(w, contents);
+                    w.write(StringEscapeUtils.escapeHtml4(contents));
                     w.write("</pre>");
                 } finally {
                     IOUtils.closeQuietly(is);