Switch surefire forkmode as fix/workaround for PAXEXAM-818
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fd9ceb73 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fd9ceb73 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fd9ceb73 Branch: refs/heads/master Commit: fd9ceb7384d4bd978c87fde8865f5e8a6f12df6a Parents: 0582c87 Author: Christian Schneider <[email protected]> Authored: Fri May 19 16:41:09 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Fri May 19 16:41:09 2017 +0200 ---------------------------------------------------------------------- itests/pom.xml | 14 ++++++++------ .../KarafMinimalMonitoredTestSupport.java | 9 ++------- 2 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/fd9ceb73/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 6926953..92d9695 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -111,12 +111,12 @@ <artifactId>pax-exam-container-karaf</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId> - org.apache.felix.configadmin - </artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId> + org.apache.felix.configadmin + </artifactId> + </exclusion> </exclusions> </dependency> @@ -256,6 +256,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <systemPropertyVariables> <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level> <spring31.version>${spring31.version}</spring31.version> http://git-wip-us.apache.org/repos/asf/karaf/blob/fd9ceb73/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java index 8dfb59a..570f74b 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java @@ -53,7 +53,7 @@ import org.osgi.framework.ServiceEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// don't extend, because we don't want @Rule Retry +// Don't extend KarafTestSupport, because we don't want @Rule Retry public abstract class KarafMinimalMonitoredTestSupport { public static Logger LOG = LoggerFactory.getLogger(KarafMinimalMonitoredTestSupport.class); @@ -63,12 +63,7 @@ public abstract class KarafMinimalMonitoredTestSupport { @ProbeBuilder public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { - /** - * We need to import the package to be able to access the service inside the test. - * The optional import is necessary because of a bug in pax exam - */ - - probe.setHeader(Constants.IMPORT_PACKAGE, ServiceMonitor.class.getPackage().getName() + ";resolution:=optional"); + probe.setHeader(Constants.IMPORT_PACKAGE, ServiceMonitor.class.getPackage().getName()); return probe; }
