Repository: cxf Updated Branches: refs/heads/master 9edf90a69 -> a4e5a8ba3
use the resource filter to update cxf version of the swagger2 sample features.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a4e5a8ba Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4e5a8ba Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4e5a8ba Branch: refs/heads/master Commit: a4e5a8ba31b7713dbbc9dae3e90dcab9e6800f98 Parents: 9edf90a Author: Akitoshi Yoshida <[email protected]> Authored: Fri Sep 18 21:16:30 2015 +0200 Committer: Akitoshi Yoshida <[email protected]> Committed: Fri Sep 18 21:16:30 2015 +0200 ---------------------------------------------------------------------- .../jax_rs/description_swagger2_osgi/README.txt | 4 +- .../jax_rs/description_swagger2_osgi/pom.xml | 6 +++ .../src/test/features/features.xml | 47 -------------------- .../src/test/resources/features/features.xml | 47 ++++++++++++++++++++ 4 files changed, 55 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a4e5a8ba/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt index 678ae30..f17859e 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt @@ -36,7 +36,7 @@ Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start Install this demo feature using the local features.xml file that is located in -samples/jax_rs/description_swagger2_osgi/src/test/features, you +samples/jax_rs/description_swagger2_osgi/target/test-classes/features/features.xml, you can directly use this file or copy it to somewhere. Assuming you have put this features.xml file at /Users/me/work/cxf/samples/features.xml @@ -79,7 +79,7 @@ You can verify if the CXF JAX-RS Swagger2 Blueprint Demo is installed and starte 119 | Active | 80 | 2.4.6 | Jackson-JAXRS-base 120 | Active | 80 | 2.4.6 | Jackson-JAXRS-JSON 121 | Active | 80 | 1.5.4.SNAPSHOT | swagger-jaxrs - 122 | Active | 80 | 3.1.3.SNAPSHOT | CXF JAX-RS Swagger2 Blueprint Demo + 122 | Active | 80 | 3.1.3 | CXF JAX-RS Swagger2 Blueprint Demo karaf@root()> http://git-wip-us.apache.org/repos/asf/cxf/blob/a4e5a8ba/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml index dae6d4c..9e9dbfc 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml @@ -35,6 +35,12 @@ under the License. </properties> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/a4e5a8ba/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/features/features.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/features/features.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/features/features.xml deleted file mode 100644 index a88932b..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/features/features.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="demo-cxf-swagger-sample-1.0.0"> - <repository>mvn:org.apache.cxf.karaf/apache-cxf/3.1.3/xml/features</repository> - - <!-- Note demo-swagger-core and demo-swagger-jaxrs features may be published by swagger as - features swagger-core and swagger-jaxrs, respectively --> - <feature name="demo-swagger-core" version="1.0.0" resolver="(obr)"> - <bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle> - <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle> - - <!-- jackson --> - <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.4.6</bundle> - <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.6</bundle> - <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.4.6</bundle> - <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.4.6</bundle> - - <!-- swagger --> - <bundle dependency="true">mvn:io.swagger/swagger-annotations/1.5.4-SNAPSHOT</bundle> - <bundle dependency="true">mvn:io.swagger/swagger-models/1.5.4-SNAPSHOT</bundle> - <bundle dependency="true">mvn:io.swagger/swagger-core/1.5.4-SNAPSHOT</bundle> - </feature> - - <feature name="demo-swagger-jaxrs" version="1.0.0" resolver="(obr)"> - <!-- this feature can work with jsr-311 or jsr-339, so let the jaxrs provider decide which one install --> - - <bundle dependency="true">mvn:com.google.guava/guava/18.0</bundle> - <bundle dependency="true">mvn:org.javassist/javassist/3.19.0-GA</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/0.9.9_2</bundle> - - <!-- jackson --> - <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.4.6</bundle> - <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.4.6</bundle> - - <!-- swagger --> - <feature version='1.0.0'>demo-swagger-core</feature> - <bundle dependency="true">mvn:io.swagger/swagger-jaxrs/1.5.4-SNAPSHOT</bundle> - </feature> - - - <!-- this is the feature definition for this cxf jaxrs swagger blueprint sample demo --> - <feature name="demo-cxf-swagger-jaxrs-sample" version="1.0.0" resolver="(obr)"> - <feature version='[3.0,4)'>cxf-jaxrs</feature> - <feature version='1.0.0'>demo-swagger-jaxrs</feature> - - <bundle dependency="true">mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi/3.1.3</bundle> - </feature> -</features> http://git-wip-us.apache.org/repos/asf/cxf/blob/a4e5a8ba/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml new file mode 100644 index 0000000..98d97ea --- /dev/null +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/test/resources/features/features.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; name="demo-cxf-swagger-sample-1.0.0"> + <repository>mvn:org.apache.cxf.karaf/apache-cxf/${project.version}/xml/features</repository> + + <!-- Note demo-swagger-core and demo-swagger-jaxrs features may be published by swagger as + features swagger-core and swagger-jaxrs, respectively --> + <feature name="demo-swagger-core" version="1.0.0" resolver="(obr)"> + <bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle> + <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle> + + <!-- jackson --> + <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.4.6</bundle> + <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.6</bundle> + <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.4.6</bundle> + <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.4.6</bundle> + + <!-- swagger --> + <bundle dependency="true">mvn:io.swagger/swagger-annotations/1.5.4-SNAPSHOT</bundle> + <bundle dependency="true">mvn:io.swagger/swagger-models/1.5.4-SNAPSHOT</bundle> + <bundle dependency="true">mvn:io.swagger/swagger-core/1.5.4-SNAPSHOT</bundle> + </feature> + + <feature name="demo-swagger-jaxrs" version="1.0.0" resolver="(obr)"> + <!-- this feature can work with jsr-311 or jsr-339, so let the jaxrs provider decide which one install --> + + <bundle dependency="true">mvn:com.google.guava/guava/18.0</bundle> + <bundle dependency="true">mvn:org.javassist/javassist/3.19.0-GA</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/0.9.9_2</bundle> + + <!-- jackson --> + <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.4.6</bundle> + <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.4.6</bundle> + + <!-- swagger --> + <feature version='1.0.0'>demo-swagger-core</feature> + <bundle dependency="true">mvn:io.swagger/swagger-jaxrs/1.5.4-SNAPSHOT</bundle> + </feature> + + + <!-- this is the feature definition for this cxf jaxrs swagger blueprint sample demo --> + <feature name="demo-cxf-swagger-jaxrs-sample" version="1.0.0" resolver="(obr)"> + <feature version='[3.0,4)'>cxf-jaxrs</feature> + <feature version='1.0.0'>demo-swagger-jaxrs</feature> + + <bundle dependency="true">mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi/${project.version}</bundle> + </feature> +</features>
