You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:21:32 UTC

[sling-org-apache-sling-commons-fsclassloader] 11/20: SLING-5603 Upgrade Commons Lang to 3.4

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

rombert pushed a commit to annotated tag org.apache.sling.commons.fsclassloader-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-fsclassloader.git

commit 75cebadc6020ae06fb768acaf222ca212b267027
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 3 11:51:12 2016 +0000

    SLING-5603 Upgrade Commons Lang to 3.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/fsclassloader@1742106 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                             | 6 +++---
 .../sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 775f0cc..80ff9a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java b/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java
index f635bfe..359fe71 100644
--- a/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java
+++ b/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderWebConsole.java
@@ -33,8 +33,8 @@ import javax.servlet.http.HttpServletRequest;
 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 extends AbstractWebConsolePlugin {
                     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);

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.