- removed the deprecated jcl104-over-slf4j module
- minor corrections
diff --git a/jcl104-over-slf4j/pom.xml b/jcl104-over-slf4j/pom.xml
deleted file mode 100644
index f26a645..0000000
--- a/jcl104-over-slf4j/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
- <version>1.6.0-RC0</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <packaging>pom</packaging>
- <name>DEPRECATED - JCL 1.0.4 implemented over SLF4J</name>
-
- <url>http://www.slf4j.org</url>
- <description>
- DEPRECATED - JCL implemented over SLF4J
- </description>
-
- <distributionManagement>
- <relocation>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
-
- <message>As it now supports JCL versions 1.0.4, 1.1 and 1.1.1, the jcl104-over-slf4j module has been renamed as jcl-over-slf4j.</message>
- </relocation>
- </distributionManagement>
-
-
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5be04a4..ce53b6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
<module>slf4j-jcl</module>
<module>slf4j-ext</module>
<module>jcl-over-slf4j</module>
- <module>jcl104-over-slf4j</module>
<module>log4j-over-slf4j</module>
<module>jul-to-slf4j</module>
<module>integration</module>
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
index c32ef16..7242e56 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@@ -208,7 +208,6 @@
sbuf.append(messagePattern.substring(i, messagePattern.length()));
return new FormattingTuple(sbuf.toString(), argArray,
throwableCandidate);
- ;
}
} else {
if (isEscapedDelimeter(messagePattern, j)) {
diff --git a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
index ae43ceb..60c0135 100644
--- a/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
@@ -33,7 +33,6 @@
package org.slf4j.helpers;
-import java.text.NumberFormat;
import java.util.Arrays;
import junit.framework.TestCase;
@@ -356,14 +355,4 @@
assertTrue(Arrays.equals(ia, ft.getArgArray()));
assertNull(ft.getThrowable());
}
-
- public void testx() {
- String s = "Hello world";
- try {
- Integer i = Integer.valueOf(s);
- } catch (NumberFormatException e) {
- System.out.println(e);
- }
- }
-
}
