You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/02/24 14:09:30 UTC
cxf git commit: [CXF-7238] Re-enabling JAXRS OSGI tests with thanks
to JB
Repository: cxf
Updated Branches:
refs/heads/master 9e118864a -> b667f5b29
[CXF-7238] Re-enabling JAXRS OSGI tests with thanks to JB
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b667f5b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b667f5b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b667f5b2
Branch: refs/heads/master
Commit: b667f5b29b97a96985bd3d2b9d63b2d3d2d7c27e
Parents: 9e11886
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Feb 24 14:09:11 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Feb 24 14:09:11 2017 +0000
----------------------------------------------------------------------
osgi/itests/pom.xml | 9 ---------
osgi/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b667f5b2/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index c0094d9..a1143fe 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -201,15 +201,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/JaxRsServiceTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/cxf/blob/b667f5b2/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index bea9f62..613c5a1 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -28,7 +28,7 @@
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
- <bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m1/${cxf.servicemix.specs.version}</bundle>
+ <bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m4/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle start-level="20">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
<bundle start-level="20">mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}</bundle>