RAT-244: Update to old commons-lang3
diff --git a/apache-rat-core/pom.xml b/apache-rat-core/pom.xml
index 5cbd8c1..1031248 100644
--- a/apache-rat-core/pom.xml
+++ b/apache-rat-core/pom.xml
@@ -85,8 +85,8 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/apache-rat-core/src/main/java/org/apache/rat/Report.java b/apache-rat-core/src/main/java/org/apache/rat/Report.java
index de4a2e7..1e0377b 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/Report.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/Report.java
@@ -21,7 +21,7 @@
import org.apache.commons.cli.*;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.*;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rat.api.RatException;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
@@ -34,6 +34,8 @@
import javax.xml.transform.TransformerConfigurationException;
import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.regex.PatternSyntaxException;
@@ -85,7 +87,7 @@
} else if (cl.hasOption(EXCLUDE_FILE_CLI)) {
String excludeFileName = cl.getOptionValue(EXCLUDE_FILE_CLI);
if (excludeFileName != null) {
- final FilenameFilter filter = parseExclusions(FileUtils.readLines(new File(excludeFileName)));
+ final FilenameFilter filter = parseExclusions(FileUtils.readLines(new File(excludeFileName), Charset.forName("UTF-8")));
report.setInputFileFilter(filter);
}
}
diff --git a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
index d56a672..d6b7f4d 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java
@@ -20,7 +20,7 @@
import java.util.Locale;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class GuessUtils {
diff --git a/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java b/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
index 02e21d6..5001dff 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
@@ -18,7 +18,7 @@
*/
package org.apache.rat.report.claim.impl.xml;
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.RatException;
diff --git a/pom.xml b/pom.xml
index 0e7f903..97d1501 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,10 +110,10 @@
<version>2.5</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <!-- commons-lang3 versions require Java 1.6+ -->
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <!-- later versions require Java 1.6+ -->
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
