Repository: cxf Updated Branches: refs/heads/master d62b480a1 -> 4a7236266
Fix karaf features Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4a723626 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4a723626 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4a723626 Branch: refs/heads/master Commit: 4a72362668b14f92f1a0252b723436fc86b681bf Parents: d62b480 Author: Guillaume Nodet <[email protected]> Authored: Mon Jan 30 15:11:42 2017 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Mon Jan 30 15:12:01 2017 +0100 ---------------------------------------------------------------------- osgi/karaf/features/pom.xml | 53 ++++++++++++++++++-- .../features/src/main/resources/features.xml | 18 ++++--- 2 files changed, 62 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4a723626/osgi/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml index 36407c2..8a275d0 100644 --- a/osgi/karaf/features/pom.xml +++ b/osgi/karaf/features/pom.xml @@ -46,6 +46,52 @@ <type>xml</type> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.apache.cxf.karaf</groupId> + <artifactId>cxf-karaf-commands</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.services.wsn</groupId> + <artifactId>cxf-services-wsn-osgi</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.services.sts</groupId> + <artifactId>cxf-services-sts-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf.services.ws-discovery</groupId> + <artifactId>cxf-services-ws-discovery-service</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-addr</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-rm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-mex</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> <resources> @@ -106,6 +152,7 @@ <descriptor>mvn:org.apache.karaf.features/framework/${cxf.karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/standard/${cxf.karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/spring/${cxf.karaf.version}/xml/features</descriptor> + <descriptor>mvn:org.ops4j.pax.web/pax-web-features/6.0.2/xml/features</descriptor> <descriptor>file:${project.build.directory}/classes/features.xml</descriptor> </descriptors> <distribution>org.apache.karaf.features:framework</distribution> @@ -114,9 +161,9 @@ <feature>framework</feature> </framework> <features> - <!--<feature>cxf-*</feature>--> - <feature>cxf-management-web</feature> - <feature>cxf-wsn</feature> + <feature>cxf-*</feature> + <!-- <feature>cxf-management-web</feature> --> + <!-- <feature>cxf-wsn</feature> --> </features> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/cxf/blob/4a723626/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 a7da8a9..a6e4ac4 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -268,19 +268,25 @@ </feature> <feature name="cxf-jackson" version="${project.version}"> <!-- Required by jackson-dataformat-yaml --> - <bundle start-level="35">mvn:org.yaml/snakeyaml/1.15</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m1/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10" dependency="true">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle> + <bundle start-level="35">mvn:org.yaml/snakeyaml/1.17</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle> <bundle start-level="35">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}</bundle> - <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle> - <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle> + <!-- <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle> --> + <!-- <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle> --> + <feature prerequisite="true">wrap</feature> + <bundle>wrap:mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}$overwrite=merge&Import-Package=javax.ws.rs*;version="[2.0,3)",com.fasterxml.jackson*;version="[2.8,3)"</bundle> + <bundle>wrap:mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}$overwrite=merge&Import-Package=javax.ws.rs*;version="[2.0,3)",com.fasterxml.jackson.module.jaxb;resolution:=optional;version="[2.8,3)",com.fasterxml.jackson*;version="[2.8,3)"</bundle> </feature> <feature name="cxf-jsr-json" version="${project.version}"> <bundle start-level="35">mvn:javax.json/javax.json-api/${cxf.json.api.version}</bundle> <bundle start-level="35">mvn:org.apache.johnzon/johnzon-core/${cxf.johnzon.version}</bundle> </feature> <feature name="cxf-tracing-brave" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> <bundle start-level="35">mvn:io.zipkin.java/zipkin/1.16.2</bundle> <bundle start-level="35">mvn:io.zipkin.reporter/zipkin-reporter/0.6.9</bundle> <bundle start-level="35">mvn:io.zipkin.brave/brave-core/${cxf.brave.version}</bundle> @@ -391,9 +397,9 @@ <feature version="${project.version}">cxf-jaxrs</feature> <feature version="${project.version}">cxf-jaxws</feature> <feature version="${project.version}">cxf-javascript</feature> - <bundle start-level="35">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> - <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle> - <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle> + <bundle start-level="35" dependency="true">mvn:commons-lang/commons-lang/2.4</bundle> + <bundle dependency="true">mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle> + <bundle dependency="true">mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle> <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle> <bundle>mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}</bundle> <bundle>mvn:org.apache.cxf/cxf-tools-misctools/${project.version}</bundle>
