You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2015/04/30 18:25:40 UTC
cxf git commit: [CXF-6381] Update to pax exam 4.5 and make tests
compatible to karaf 4
Repository: cxf
Updated Branches:
refs/heads/master 77a632d30 -> ffb10f12d
[CXF-6381] Update to pax exam 4.5 and make tests compatible to karaf 4
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ffb10f12
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ffb10f12
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ffb10f12
Branch: refs/heads/master
Commit: ffb10f12d5b84cef8fbd411da3d3fd54729f4893
Parents: 77a632d
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Apr 30 18:25:18 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Apr 30 18:25:26 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 3 +--
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffb10f12/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index 67ae39c..9be4b45 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -39,7 +39,6 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
-
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
@@ -94,8 +93,8 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[] {
cxfBaseConfig(),
+ features(cxfUrl, "cxf-core", "cxf-wsdl", "cxf-jaxrs", "http"),
testUtils(),
- features(cxfUrl, "cxf-core", "cxf-jaxrs", "http"),
logLevel(LogLevel.INFO),
provision(serviceBundle())
};
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffb10f12/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 83d554e..e138bb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,7 +165,7 @@
<cxf.osgi.version>4.2.0</cxf.osgi.version>
<cxf.karaf.version>3.0.2</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
- <cxf.pax.exam.version>3.4.0</cxf.pax.exam.version>
+ <cxf.pax.exam.version>4.5.0</cxf.pax.exam.version>
<cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
<cxf.xmlbeans.bundle.version>2.6.0_2</cxf.xmlbeans.bundle.version>