Remove the keepRuntimeFolder call again
Conflicts:
osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0ff2ca6a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0ff2ca6a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0ff2ca6a
Branch: refs/heads/3.0.x-fixes
Commit: 0ff2ca6a7aa0fde9d0cf22d2d2fdee228974d73c
Parents: 43fe432
Author: Daniel Kulp <[email protected]>
Authored: Thu Oct 30 14:33:14 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Fri Nov 7 13:49:50 2014 -0500
----------------------------------------------------------------------
.../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0ff2ca6a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index e98ca8e..94fbf6d 100644
---
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -138,6 +138,8 @@ public class CXFOSGiTestSupport {
.name("Apache Karaf")
.useDeployFolder(false)
.unpackDirectory(new File("target/paxexam/")),
+ //DO NOT COMMIT WITH THIS LINE ENABLED!!!
+
//org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder(),
features(cxfUrl, "cxf-core", "cxf-jaxws"),
systemProperty("java.awt.headless").value("true"),
when(testUtils).useOptions(mavenBundle()
