Repository: logging-log4j2 Updated Branches: refs/heads/master 9bc1756e1 -> 8a74e2288
[LOG4J2-1664] Improve OSGi unit tests. Applied patch https://issues.apache.org/jira/secure/attachment/12844808/patch-log4j2-1664-4.diff Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8a74e228 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8a74e228 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8a74e228 Branch: refs/heads/master Commit: 8a74e228840d932eb72d8a931b002fe970731aeb Parents: 9bc1756 Author: Ludovic HOCHET <[email protected]> Authored: Fri Dec 30 14:16:21 2016 -0800 Committer: Gary Gregory <[email protected]> Committed: Fri Dec 30 14:16:21 2016 -0800 ---------------------------------------------------------------------- log4j-osgi/pom.xml | 13 ------------- .../log4j/osgi/tests/AbstractLoadBundleTest.java | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8a74e228/log4j-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml index 2308e7d..defb6cd 100644 --- a/log4j-osgi/pom.xml +++ b/log4j-osgi/pom.xml @@ -33,19 +33,6 @@ <projectDir>/osgi</projectDir> </properties> <dependencies> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j.samples</groupId> - <artifactId>log4j-samples-configuration</artifactId> - <version>${project.version}</version> - </dependency> <!-- Place Felix before Equinox because Felix is signed. / also place it before org.osgi.core so that its versions of the OSGi classes are used --> <dependency> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8a74e228/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java ---------------------------------------------------------------------- diff --git a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java index 96a7166..c72ebf1 100644 --- a/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java +++ b/log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java @@ -98,9 +98,9 @@ public abstract class AbstractLoadBundleTest { final Class<?> loggerClass = dummy.loadClass("org.apache.logging.log4j.configuration.CustomConfiguration"); final Object logger = getLoggerMethod.invoke(null, loggerClass); - final Method infoMethod = logger.getClass().getMethod("error", Object.class); + final Method errorMethod = logger.getClass().getMethod("error", Object.class); - infoMethod.invoke(logger, "Test OK"); + errorMethod.invoke(logger, "Test OK"); } private PrintStream setupStream(final Bundle api, final PrintStream newStream) throws ReflectiveOperationException {
