Author: cziegeler Date: Wed Aug 9 16:18:56 2017 New Revision: 1804573 URL: http://svn.apache.org/viewvc?rev=1804573&view=rev Log: SLING-7040 : Update commons lang 2.x to 3.5
Modified: sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/JavaEscapeUtils.java sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/JavaSource.java sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java Modified: sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml?rev=1804573&r1=1804572&r2=1804573&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml Wed Aug 9 16:18:56 2017 @@ -157,7 +157,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.scripting.sightly.compiler</artifactId> - <version>1.0.4</version> + <version>1.0.11-SNAPSHOT</version> <scope>provided</scope> </dependency> @@ -170,9 +170,9 @@ <!-- Apache Commons --> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/JavaEscapeUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/JavaEscapeUtils.java?rev=1804573&r1=1804572&r2=1804573&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/JavaEscapeUtils.java (original) +++ sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/JavaEscapeUtils.java Wed Aug 9 16:18:56 2017 @@ -19,7 +19,7 @@ package org.apache.sling.scripting.sight import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The {@code JavaEscapeUtils} provides useful methods for escaping or transforming invalid Java tokens to valid ones that could be used in Modified: sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/JavaSource.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/JavaSource.java?rev=1804573&r1=1804572&r2=1804573&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/JavaSource.java (original) +++ sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/JavaSource.java Wed Aug 9 16:18:56 2017 @@ -16,7 +16,7 @@ ******************************************************************************/ package org.apache.sling.scripting.sightly.java.compiler.impl; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; /** * Builder object for a Java class printing method. Modified: sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java?rev=1804573&r1=1804572&r2=1804573&view=diff ============================================================================== --- sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java (original) +++ sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java Wed Aug 9 16:18:56 2017 @@ -34,8 +34,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.sling.scripting.sightly.Record; import org.slf4j.Logger; import org.slf4j.LoggerFactory;