This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-dynamic-include.git
The following commit(s) were added to refs/heads/master by this push:
new e125ac5 SLING-8613 - Migrate to commons-lang 3
e125ac5 is described below
commit e125ac5880cacea858e324999f1af8f109a89889
Author: Robert Munteanu <[email protected]>
AuthorDate: Mon Aug 5 20:41:05 2019 +0300
SLING-8613 - Migrate to commons-lang 3
---
pom.xml | 6 +++---
src/main/java/org/apache/sling/dynamicinclude/Configuration.java | 5 +++--
src/main/java/org/apache/sling/dynamicinclude/IncludeTagFilter.java | 6 +++---
.../org/apache/sling/dynamicinclude/SyntheticResourceFilter.java | 2 +-
.../apache/sling/dynamicinclude/generator/types/EsiGenerator.java | 4 ++--
.../apache/sling/dynamicinclude/generator/types/JsiGenerator.java | 4 ++--
src/main/java/org/apache/sling/dynamicinclude/impl/UrlBuilder.java | 2 +-
.../apache/sling/dynamicinclude/pathmatcher/PrefixPathMatcher.java | 2 +-
.../apache/sling/dynamicinclude/pathmatcher/RegexPathMatcher.java | 2 +-
.../java/org/apache/sling/dynamicinclude/impl/UrlBuilderTest.java | 2 +-
10 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 615a657..842b587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,9 +132,9 @@
<!-- commons -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.0</version>
<scope>provided</scope>
</dependency>
diff --git a/src/main/java/org/apache/sling/dynamicinclude/Configuration.java
b/src/main/java/org/apache/sling/dynamicinclude/Configuration.java
index 72579f6..51f3823 100755
--- a/src/main/java/org/apache/sling/dynamicinclude/Configuration.java
+++ b/src/main/java/org/apache/sling/dynamicinclude/Configuration.java
@@ -23,8 +23,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+
+import org.apache.commons.lang3.ArrayUtils;
+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.ConfigurationPolicy;
diff --git
a/src/main/java/org/apache/sling/dynamicinclude/IncludeTagFilter.java
b/src/main/java/org/apache/sling/dynamicinclude/IncludeTagFilter.java
index ccbf2bd..66bdba8 100644
--- a/src/main/java/org/apache/sling/dynamicinclude/IncludeTagFilter.java
+++ b/src/main/java/org/apache/sling/dynamicinclude/IncludeTagFilter.java
@@ -33,8 +33,8 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-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.Reference;
import org.apache.felix.scr.annotations.sling.SlingFilter;
import org.apache.felix.scr.annotations.sling.SlingFilterScope;
@@ -87,7 +87,7 @@ public class IncludeTagFilter implements Filter {
}
if (config.getAddComment()) {
- writer.append(String.format(COMMENT,
StringEscapeUtils.escapeHtml(url), resourceType));
+ writer.append(String.format(COMMENT,
StringEscapeUtils.escapeHtml4(url), resourceType));
}
// Only write the includes markup if the required, configurable request
diff --git
a/src/main/java/org/apache/sling/dynamicinclude/SyntheticResourceFilter.java
b/src/main/java/org/apache/sling/dynamicinclude/SyntheticResourceFilter.java
index 0f2ac1b..5d6c993 100644
--- a/src/main/java/org/apache/sling/dynamicinclude/SyntheticResourceFilter.java
+++ b/src/main/java/org/apache/sling/dynamicinclude/SyntheticResourceFilter.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
diff --git
a/src/main/java/org/apache/sling/dynamicinclude/generator/types/EsiGenerator.java
b/src/main/java/org/apache/sling/dynamicinclude/generator/types/EsiGenerator.java
index 81f8b10..0e89283 100755
---
a/src/main/java/org/apache/sling/dynamicinclude/generator/types/EsiGenerator.java
+++
b/src/main/java/org/apache/sling/dynamicinclude/generator/types/EsiGenerator.java
@@ -19,7 +19,7 @@
package org.apache.sling.dynamicinclude.generator.types;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.dynamicinclude.generator.IncludeGenerator;
@@ -41,7 +41,7 @@ public class EsiGenerator implements IncludeGenerator {
public String getInclude(String url) {
StringBuffer buf = new StringBuffer();
buf.append("<esi:include src=\"");
- buf.append(StringEscapeUtils.escapeHtml(url));
+ buf.append(StringEscapeUtils.escapeHtml4(url));
buf.append("\"/>");
return buf.toString();
}
diff --git
a/src/main/java/org/apache/sling/dynamicinclude/generator/types/JsiGenerator.java
b/src/main/java/org/apache/sling/dynamicinclude/generator/types/JsiGenerator.java
index 695ec30..a251a24 100755
---
a/src/main/java/org/apache/sling/dynamicinclude/generator/types/JsiGenerator.java
+++
b/src/main/java/org/apache/sling/dynamicinclude/generator/types/JsiGenerator.java
@@ -26,7 +26,7 @@ import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
@@ -81,7 +81,7 @@ public class JsiGenerator implements IncludeGenerator {
divName = "dynamic_include_filter_div_" + divId++;
}
- return template.replace(UUID_FIELD, divName).replace(URL_FIELD,
StringEscapeUtils.escapeJavaScript(url));
+ return template.replace(UUID_FIELD, divName).replace(URL_FIELD,
StringEscapeUtils.escapeEcmaScript(url));
}
private void readTemplateFromUrl(URL url) {
diff --git a/src/main/java/org/apache/sling/dynamicinclude/impl/UrlBuilder.java
b/src/main/java/org/apache/sling/dynamicinclude/impl/UrlBuilder.java
index 1182a63..cc262ab 100644
--- a/src/main/java/org/apache/sling/dynamicinclude/impl/UrlBuilder.java
+++ b/src/main/java/org/apache/sling/dynamicinclude/impl/UrlBuilder.java
@@ -21,7 +21,7 @@ package org.apache.sling.dynamicinclude.impl;
import java.util.Arrays;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.dynamicinclude.Configuration;
diff --git
a/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/PrefixPathMatcher.java
b/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/PrefixPathMatcher.java
index cdd1077..551b4c1 100644
---
a/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/PrefixPathMatcher.java
+++
b/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/PrefixPathMatcher.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.dynamicinclude.pathmatcher;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class PrefixPathMatcher implements PathMatcher {
diff --git
a/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/RegexPathMatcher.java
b/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/RegexPathMatcher.java
index e52008b..97ee623 100644
---
a/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/RegexPathMatcher.java
+++
b/src/main/java/org/apache/sling/dynamicinclude/pathmatcher/RegexPathMatcher.java
@@ -19,7 +19,7 @@
package org.apache.sling.dynamicinclude.pathmatcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class RegexPathMatcher implements PathMatcher {
diff --git
a/src/test/java/org/apache/sling/dynamicinclude/impl/UrlBuilderTest.java
b/src/test/java/org/apache/sling/dynamicinclude/impl/UrlBuilderTest.java
index e477efe..8257547 100644
--- a/src/test/java/org/apache/sling/dynamicinclude/impl/UrlBuilderTest.java
+++ b/src/test/java/org/apache/sling/dynamicinclude/impl/UrlBuilderTest.java
@@ -19,7 +19,7 @@
package org.apache.sling.dynamicinclude.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.dynamicinclude.Configuration;
import org.junit.Before;
