SLING-9298 : Switch to commons.text
diff --git a/pom.xml b/pom.xml
index 8bb35c6..5a039e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
- <includeArtifactIds>osgi.core,commons-lang,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli,slf4j-api,slf4j-simple</includeArtifactIds>
+ <includeArtifactIds>osgi.core,commons-text,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli,slf4j-api,slf4j-simple</includeArtifactIds>
</configuration>
</execution>
</executions>
@@ -89,9 +89,9 @@
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.8</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
index f5668be..197f360 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java
@@ -23,8 +23,8 @@
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.commons.lang.text.StrLookup;
-import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.commons.text.StringSubstitutor;
+import org.apache.commons.text.lookup.StringLookup;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.launcher.spi.Launcher;
@@ -50,15 +50,15 @@
*/
@Override
public int run(final LauncherRunContext context, final ClassLoader cl) throws Exception {
- StrSubstitutor ss = new StrSubstitutor(new StrLookup() {
+ StringSubstitutor ss = new StringSubstitutor(new StringLookup() {
+
@Override
- public String lookup(String key) {
+ public String lookup(final String key) {
// Normally if a variable cannot be found, StrSubstitutor will
// leave the raw variable in place. We need to replace it with
// nothing in that case.
-
- String val = context.getFrameworkProperties().get(key);
- return val != null ? val : "";
+ final String value = context.getFrameworkProperties().get(key);
+ return value == null ? "" : value;
}
});
ss.setEnableSubstitutionInVariables(true);
diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
index 0f12761..f31a8a2 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java
@@ -16,7 +16,6 @@
*/
package org.apache.sling.feature.launcher.impl.launchers;
-import java.io.File;
import java.net.URL;
import java.util.List;
import java.util.Map;