Author: cziegeler
Date: Wed Aug  9 15:46:30 2017
New Revision: 1804559

URL: http://svn.apache.org/viewvc?rev=1804559&view=rev
Log:
SLING-7040 : Update commons lang 2.x to 3.5

Modified:
    sling/trunk/bundles/scripting/jsp-taglib/pom.xml
    
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/EncodeTag.java
    
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
    
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
    
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
    
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/package-info.java

Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=1804559&r1=1804558&r2=1804559&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Wed Aug  9 15:46:30 2017
@@ -15,7 +15,7 @@
        <parent>
                <groupId>org.apache.sling</groupId>
                <artifactId>sling</artifactId>
-               <version>26</version>
+               <version>31</version>
                <relativePath />
        </parent>
 
@@ -84,7 +84,7 @@
        <dependencies>
                <dependency>
                        <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
+                       <artifactId>javax.servlet-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -115,11 +115,7 @@
                </dependency>
                <dependency>
                        <groupId>org.osgi</groupId>
-                       <artifactId>org.osgi.core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.osgi</groupId>
-                       <artifactId>org.osgi.compendium</artifactId>
+                       <artifactId>osgi.core</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
@@ -128,25 +124,12 @@
                        <scope>compile</scope>
                </dependency>
                <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <version>2.4</version>
-                       <scope>compile</scope>
-               </dependency>
-               <dependency>
                        <groupId>org.owasp.esapi</groupId>
                        <artifactId>esapi</artifactId>
                        <version>2.1.0</version>
                        <scope>compile</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>biz.aQute.bnd</groupId>
-                       <artifactId>bndlib</artifactId>
-                       <version>2.4.0</version>
-                       <scope>provided</scope>
-               </dependency>
-
                <!-- Testing Dependencies -->
                <dependency>
                        <groupId>junit</groupId>

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/EncodeTag.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/EncodeTag.java?rev=1804559&r1=1804558&r2=1804559&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/EncodeTag.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/EncodeTag.java
 Wed Aug  9 15:46:30 2017
@@ -21,7 +21,6 @@ import java.io.IOException;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.sling.scripting.jsp.taglib.helpers.XSSSupport;
 import org.apache.sling.scripting.jsp.taglib.helpers.XSSSupport.ENCODING_MODE;
 import org.slf4j.Logger;
@@ -43,7 +42,7 @@ public class EncodeTag extends BodyTagSu
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see javax.servlet.jsp.tagext.TagSupport#doEndTag()
         */
        @Override
@@ -62,7 +61,7 @@ public class EncodeTag extends BodyTagSu
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see javax.servlet.jsp.tagext.BodyTagSupport#doStartTag()
         */
        @Override
@@ -130,13 +129,13 @@ public class EncodeTag extends BodyTagSu
 
        /**
         * Writes the encoded text to the response.
-        * 
+        *
         * @param encoded
         *            the encoded text to write to the page
         * @throws JspException
         */
        private void write(String encoded) throws JspException {
-               if (!StringUtils.isEmpty(encoded)) {
+               if (encoded != null && !encoded.isEmpty()) {
                        try {
                                pageContext.getOut().write(encoded);
                        } catch (IOException e) {

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java?rev=1804559&r1=1804558&r2=1804559&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
 Wed Aug  9 15:46:30 2017
@@ -16,7 +16,6 @@
  */
 package org.apache.sling.scripting.jsp.taglib.helpers;
 
-import org.apache.commons.lang.StringUtils;
 import org.owasp.esapi.ESAPI;
 
 /**
@@ -38,7 +37,7 @@ public class XSSSupport {
        /**
         * Encodes the unencoded string using the specified mode. This will be
         * deferred to the corresponding OWASP ESAPI encoding method.
-        * 
+        *
         * @param unencoded
         *            the unencoded string
         * @param mode
@@ -74,12 +73,12 @@ public class XSSSupport {
         * Retrieves the encoding mode associated with the specified string. 
Will
         * throw an IllegalArgumentException if the mode string is not a valid 
mode
         * and will throw a NullPointerException if the mode string is null.
-        * 
+        *
         * @param modeStr
         *            the mode string
         * @return the encoding mode
         */
        public static ENCODING_MODE getEncodingMode(String modeStr) {
-               return ENCODING_MODE.valueOf(StringUtils.upperCase(modeStr));
+               return ENCODING_MODE.valueOf(modeStr.toUpperCase());
        }
 }

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java?rev=1804559&r1=1804558&r2=1804559&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
 Wed Aug  9 15:46:30 2017
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@Version("2.2.0")
+@org.osgi.annotation.versioning.Version("2.2.0")
 package org.apache.sling.scripting.jsp.taglib.helpers;
 
-import aQute.bnd.annotation.Version;
\ No newline at end of file

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java?rev=1804559&r1=1804558&r2=1804559&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
 Wed Aug  9 15:46:30 2017
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@Version("2.2.0")
+@org.osgi.annotation.versioning.Version("2.2.0")
 package org.apache.sling.scripting.jsp.taglib;
 
-import aQute.bnd.annotation.Version;
\ No newline at end of file

Modified: 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/package-info.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/package-info.java?rev=1804559&r1=1804558&r2=1804559&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/package-info.java
 (original)
+++ 
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/tei/package-info.java
 Wed Aug  9 15:46:30 2017
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@Version("2.2.0")
+@org.osgi.annotation.versioning.Version("2.2.0")
 package org.apache.sling.scripting.jsp.taglib.tei;
 
-import aQute.bnd.annotation.Version;
\ No newline at end of file


Reply via email to