You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2017/12/09 18:00:39 UTC
[karaf] branch KARAF-5528 updated: [KARAF-5528] Fix a test that
relies on log:* commands. installation of jansi stops pax-logging-log4j2
bundle too early
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch KARAF-5528
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/KARAF-5528 by this push:
new 9a7e954 [KARAF-5528] Fix a test that relies on log:* commands. installation of jansi stops pax-logging-log4j2 bundle too early
9a7e954 is described below
commit 9a7e95499a61d30a8e86efde9b7bd2354efa4e55
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Sat Dec 9 19:00:31 2017 +0100
[KARAF-5528] Fix a test that relies on log:* commands. installation of jansi stops pax-logging-log4j2 bundle too early
---
itests/pom.xml | 6 ++++--
itests/src/test/java/org/apache/karaf/itests/LogTest.java | 11 +++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/itests/pom.xml b/itests/pom.xml
index c58e418..dcd74ea 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -266,6 +266,7 @@
<spring42.version>${spring42.version}</spring42.version>
<spring43.version>${spring43.version}</spring43.version>
<activemq.version>${activemq.version}</activemq.version>
+ <jansi.version>${jansi.version}</jansi.version>
</systemPropertyVariables>
<excludes>
<exclude>MavenTest</exclude>
@@ -314,13 +315,14 @@
</excludes>
<systemPropertyVariables>
<org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository>
- <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<spring31.version>${spring31.version}</spring31.version>
<spring32.version>${spring32.version}</spring32.version>
<spring40.version>${spring40.version}</spring40.version>
<spring41.version>${spring41.version}</spring41.version>
<activemq.version>${activemq.version}</activemq.version>
- </systemPropertyVariables>
+ <jansi.version>${jansi.version}</jansi.version>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
diff --git a/itests/src/test/java/org/apache/karaf/itests/LogTest.java b/itests/src/test/java/org/apache/karaf/itests/LogTest.java
index 0ad808b..b9fde69 100644
--- a/itests/src/test/java/org/apache/karaf/itests/LogTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/LogTest.java
@@ -15,6 +15,7 @@ package org.apache.karaf.itests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import javax.management.Attribute;
import javax.management.MBeanServer;
@@ -22,6 +23,9 @@ import javax.management.ObjectName;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
@@ -35,6 +39,13 @@ import java.lang.management.ManagementFactory;
public class LogTest extends KarafTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(LogTest.class);
+ @Configuration
+ public Option[] config() {
+ return OptionUtils.combine(super.config(),
+ editConfigurationFilePut("etc/startup.properties", "mvn:org.fusesource.jansi/jansi/" + System.getProperty("jansi.version"), "8")
+ );
+ }
+
@Test
public void setDebugAndDisplay() throws Exception {
assertSetLevel("DEBUG");
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].