Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-text into 1.5
diff --git a/pom.xml b/pom.xml
index cc1969b..6b8ce0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.11.0</version>
+ <version>3.11.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -459,6 +459,8 @@
<properties>
<!-- jacoco does not work with java 11 yet, see https://github.com/jacoco/jacoco/issues/663 -->
<jacoco.skip>true</jacoco.skip>
+ <!-- spotbugs maven plugin does not work with java 11 yet, see https://github.com/spotbugs/spotbugs-maven-plugin/issues/83 -->
+ <spotbugs.skip>true</spotbugs.skip>
</properties>
</profile>
</profiles>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index 257df6e..a2256af 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -27,7 +27,7 @@
<include>checkstyle.xml</include>
<include>checkstyle-suppressions.xml</include>
<include>CONTRIBUTING.md</include>
- <include>fb-excludes.xml</include>
+ <include>sb-excludes.xml</include>
<include>LICENSE.txt</include>
<include>license-header.txt</include>
<include>NOTICE.txt</include>
diff --git a/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java b/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java
index 466e471..0dce838 100644
--- a/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/ConstantStringLookup.java
@@ -17,7 +17,6 @@
package org.apache.commons.text.lookup;
-import java.lang.reflect.Field;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java b/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
index 4402a66..d044b7d 100644
--- a/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/JavaPlatformStringLookup.java
@@ -61,7 +61,7 @@
*
* @param args the standard java main method parameter which is unused for our running of this class.
*/
- public static void main(String[] args) {
+ public static void main(final String[] args) {
System.out.println(JavaPlatformStringLookup.class);
System.out.printf("%s = %s%n", KEY_VERSION, JavaPlatformStringLookup.INSTANCE.lookup(KEY_VERSION));
System.out.printf("%s = %s%n", KEY_RUNTIME, JavaPlatformStringLookup.INSTANCE.lookup(KEY_RUNTIME));
diff --git a/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java b/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java
index edae89a..cb6f345 100644
--- a/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java
+++ b/src/main/java/org/apache/commons/text/lookup/PropertiesStringLookup.java
@@ -78,7 +78,7 @@
final String propertyKey = substringAfter(key, "::");
try {
final Properties properties = new Properties();
- try (final InputStream inputStream = Files.newInputStream(Paths.get(documentPath))) {
+ try (InputStream inputStream = Files.newInputStream(Paths.get(documentPath))) {
properties.load(inputStream);
}
return properties.getProperty(propertyKey);
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index e9abe7b..3cecfb8 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -636,7 +636,7 @@
@Test
public void testDeleteCharacter() {
- String deleteString = "Delete: \u007F";
+ final String deleteString = "Delete: \u007F";
assertEquals("Delete: \\u007F", StringEscapeUtils.escapeJson(deleteString));
}
}
