diff --git a/pom.xml b/pom.xml index 07dad4b..3cb4c62 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ under the License. commons-logging commons-logging Apache Commons Logging - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT Apache Commons Logging is a thin adapter allowing configurable bridging to other, well-known logging systems. https://commons.apache.org/proper/commons-logging/ @@ -237,6 +237,7 @@ under the License. org.slf4j:* + org/apache/commons/logging/log4j/log4j12/** org/apache/commons/logging/log4j2/** org/apache/commons/logging/slf4j/** org/apache/commons/logging/serviceloader/** @@ -248,13 +249,13 @@ under the License. - ${log4j:log4j:jar} - ${logkit:logkit:jar} - ${javax.servlet:servlet-api:jar} - target/${project.build.finalName}.jar - target/${project.build.finalName}-api.jar - target/${project.build.finalName}-adapters.jar - target/${project.build.finalName}-tests.jar + ${org.apache.logging.log4j:log4j-1.2-api:jar} + ${logkit:logkit:jar} + ${javax.servlet:servlet-api:jar} + target/${project.build.finalName}.jar + target/${project.build.finalName}-api.jar + target/${project.build.finalName}-adapters.jar + target/${project.build.finalName}-tests.jar @@ -277,7 +278,7 @@ under the License. log4j-test @@ -305,6 +306,53 @@ under the License. + + + log4j12-test + + integration-test + + + + + org.apache.logging.log4j + log4j-1.2-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + + org/apache/commons/logging/log4j/log4j12/*TestCase.java + + + + org.apache.logging.log4j.core.impl.ReusableLogEventFactory + ${org.apache.logging.log4j:log4j-1.2-api:jar} + ${org.apache.logging.log4j:log4j-api:jar} + ${org.apache.logging.log4j:log4j-core:jar} + target/${project.build.finalName}.jar + target/${project.build.finalName}-api.jar + target/${project.build.finalName}-tests.jar + + org.apache.commons.logging.impl.LogFactoryImpl + + + @@ -477,9 +525,9 @@ under the License. true - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-1.2-api + ${log4j2.version} true @@ -603,9 +651,9 @@ under the License. ${commons.logging.javaversion} logging org.apache.commons.logging - 1.3.0 - 1.3.1 - 1.2 + 1.4.0 + 1.4.1 + 1.3.0 true LOGGING 12310484 diff --git a/src/test/java/org/apache/commons/logging/log4j/StandardTests.java b/src/test/java/org/apache/commons/logging/log4j/StandardTests.java index 4bb2f5c..7bb6922 100644 --- a/src/test/java/org/apache/commons/logging/log4j/StandardTests.java +++ b/src/test/java/org/apache/commons/logging/log4j/StandardTests.java @@ -147,9 +147,7 @@ public abstract class StandardTests extends TestCase { public void testCreateFactory() { final LogFactory factory = LogFactory.getFactory(); assertNotNull("LogFactory exists", factory); - assertEquals("LogFactory class", - "org.apache.commons.logging.impl.LogFactoryImpl", - factory.getClass().getName()); + assertEquals("LogFactory class", "org.apache.commons.logging.impl.LogFactoryImpl", factory.getClass().getName()); final String[] names = factory.getAttributeNames(); assertNotNull("Names exists", names); diff --git a/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java index ae914bb..9d555a5 100644 --- a/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java +++ b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java @@ -45,6 +45,8 @@ public class ApiClasspathStandardTestCase extends TestCase { final PathableClassLoader child = new PathableClassLoader(parent); child.addLogicalLib("log4j12"); + child.addLogicalLib("log4j2-api"); + child.addLogicalLib("log4j2-core"); child.addLogicalLib("commons-logging"); child.addLogicalLib("testclasses"); diff --git a/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java index 2f348ab..cd9d402 100644 --- a/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java +++ b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java @@ -42,6 +42,8 @@ public class AppClasspathStandardTestCase extends TestCase { loader.useExplicitLoader("junit.", Test.class.getClassLoader()); loader.addLogicalLib("testclasses"); loader.addLogicalLib("log4j12"); + loader.addLogicalLib("log4j2-api"); + loader.addLogicalLib("log4j2-core"); loader.addLogicalLib("commons-logging"); final Class testClass = loader.loadClass( diff --git a/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java index b78b7ea..600e1ce 100644 --- a/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java +++ b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java @@ -44,6 +44,8 @@ public class ChildClasspathStandardTestCase extends TestCase { final PathableClassLoader child = new PathableClassLoader(parent); child.addLogicalLib("testclasses"); child.addLogicalLib("log4j12"); + child.addLogicalLib("log4j2-api"); + child.addLogicalLib("log4j2-core"); child.addLogicalLib("commons-logging"); final Class testClass = child.loadClass( diff --git a/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java index 5c30cac..8343d10 100644 --- a/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java +++ b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java @@ -42,6 +42,8 @@ public class ParentClasspathStandardTestCase extends TestCase { parent.useExplicitLoader("junit.", Test.class.getClassLoader()); parent.addLogicalLib("commons-logging"); parent.addLogicalLib("log4j12"); + parent.addLogicalLib("log4j2-api"); + parent.addLogicalLib("log4j2-core"); final PathableClassLoader child = new PathableClassLoader(parent); child.addLogicalLib("testclasses");