[BROOKLYN-183] Karaf feature for brooklyn-rest-api
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9b633bd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9b633bd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9b633bd7 Branch: refs/heads/master Commit: 9b633bd7d3f2a1202b4ed8d2be290a6939925957 Parents: cc56bb2 Author: Ciprian Ciubotariu <[email protected]> Authored: Fri Oct 16 12:41:06 2015 +0300 Committer: Ciprian Ciubotariu <[email protected]> Committed: Thu Nov 12 18:11:42 2015 +0200 ---------------------------------------------------------------------- karaf/apache-brooklyn/pom.xml | 1 + karaf/features/src/main/feature/feature.xml | 63 +++++++++++++++++++- .../features/src/main/history/dependencies.xml | 28 ++++++++- karaf/pom.xml | 6 ++ 4 files changed, 94 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/apache-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml index e478e78..bf80915 100755 --- a/karaf/apache-brooklyn/pom.xml +++ b/karaf/apache-brooklyn/pom.xml @@ -114,6 +114,7 @@ <bootFeature>wrap</bootFeature> <!-- brooklyn features --> <bootFeature>brooklyn-core</bootFeature> + <bootFeature>brooklyn-rest-api</bootFeature> </bootFeatures> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/features/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index c6cfed6..d5a5622 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -21,7 +21,27 @@ <repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository> <repository>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</repository> <repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository> - + + + <feature name="swagger" version="${swagger.version}" description="Swagger Annotations+Core+JAXRS+Models"> + <bundle>mvn:io.swagger/swagger-annotations/${swagger.version}</bundle> + <bundle>wrap:mvn:io.swagger/swagger-core/${swagger.version}</bundle> + <bundle>wrap:mvn:io.swagger/swagger-jaxrs/${swagger.version}</bundle> + <bundle>mvn:io.swagger/swagger-models/${swagger.version}</bundle> + + <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>--> + <!--<bundle dependency='true'>mvn:com.google.guava/guava/${guava.version}</bundle>--> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${fasterxml.jackson.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle> + <!--<bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>--> + <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>--> + <!--<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>--> + </feature> + <feature name="brooklyn-utils-common" version="${project.version}" description="Brooklyn Common Utils"> <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version}</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/${project.version}</bundle> @@ -41,6 +61,41 @@ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version}</bundle> </feature> + <feature name="brooklyn-utils-rest-swagger" version="${project.version}" description="Brooklyn REST Swagger Apidoc Utilities"> + <feature>brooklyn-utils-common</feature> + <feature version="${swagger.version}">swagger</feature> + + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/${project.version}</bundle> + + <!-- TODO: jersey osgi feature --> + <bundle dependency="true">mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle> + <bundle dependency="true">mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle> + <!--<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet-api.version}</bundle>--> + <bundle dependency="true">mvn:org.eclipse.jetty.orbit/javax.servlet/${jetty-orbit-javax-servlet.version}</bundle> + + </feature> + + <feature name="brooklyn-rest-api" version="${project.version}" description="Brooklyn REST API"> + <feature>brooklyn-utils-rest-swagger</feature> + <feature>brooklyn-api</feature> + + <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/${project.version}</bundle> + + <bundle dependency="true">mvn:com.sun.jersey.contribs/jersey-multipart/${jersey.version}</bundle> + <bundle dependency="true">mvn:org.jvnet.mimepull/mimepull/1.9.3</bundle> + <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle> + + <!-- TODO: version 1.1.0.Final has OSGi manifest; check if upgrade doesn't get rid of wrap --> + <bundle dependency="true">wrap:mvn:javax.validation/validation-api/${validation-api.version}</bundle> + + <!--<feature>jersey</feature>--> + <bundle dependency="true">mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle> + <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle> + <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle> + <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle> + + </feature> + <feature name="brooklyn-api" version="${project.version}" description="Brooklyn API"> <feature>brooklyn-utils-common</feature> <bundle>mvn:org.apache.brooklyn/brooklyn-api/${project.version}</bundle> @@ -74,11 +129,13 @@ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle> <bundle dependency="true">mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version}</bundle> - <!-- TODO: don't use wrap: --> + + <!-- TODO: don't use wrap --> <bundle dependency="true">wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <!-- from geoip --> <bundle dependency="true">wrap:mvn:com.maxmind.geoip2/geoip2/${maxmind.version}</bundle> <!-- from geoip2 --> <bundle dependency="true">wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle> <!-- from com.thoughtworks.xstream/xstream --> - <bundle dependency="true">wrap:mvn:org.reflections/reflections/${reflections.version}</bundle> + + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle> </feature> <feature name="brooklyn-commands" version="${project.version}" description="Brooklyn Shell Commands"> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/features/src/main/history/dependencies.xml ---------------------------------------------------------------------- diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml index 3940190..1a1740f 100644 --- a/karaf/features/src/main/history/dependencies.xml +++ b/karaf/features/src/main/history/dependencies.xml @@ -2,19 +2,36 @@ <features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"; name="org.apache.brooklyn-0.9.0-SNAPSHOT"> <feature version="0.0.0"> <feature prerequisite="false" dependency="false">brooklyn-api</feature> + <feature prerequisite="false" dependency="false">brooklyn-api</feature> + <feature prerequisite="false" dependency="false">brooklyn-utils-common</feature> <feature prerequisite="false" dependency="false">brooklyn-utils-common</feature> <feature prerequisite="false" dependency="false">brooklyn-utils-common</feature> + <feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature> + <feature prerequisite="false" dependency="false">swagger</feature> <bundle>mvn:ch.qos.logback/logback-classic/1.0.7</bundle> <bundle>mvn:ch.qos.logback/logback-core/1.0.7</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.5</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.5</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.5</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.5</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.5</bundle> + <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.5</bundle> + <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.4.5</bundle> + <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.4.5</bundle> + <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.4.5</bundle> <bundle>mvn:com.google.code.gson/gson/2.3</bundle> <bundle>mvn:com.google.guava/guava/17.0</bundle> <bundle>mvn:com.jayway.jsonpath/json-path/2.0.0</bundle> + <bundle>mvn:com.sun.jersey.contribs/jersey-multipart/1.18.1</bundle> + <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle> + <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle> + <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle> <bundle>mvn:com.thoughtworks.xstream/xstream/1.4.7</bundle> <bundle>mvn:commons-codec/commons-codec/1.9</bundle> <bundle>mvn:commons-io/commons-io/2.4</bundle> + <bundle>mvn:commons-lang/commons-lang/2.4</bundle> + <bundle>mvn:io.swagger/swagger-annotations/1.5.3</bundle> + <bundle>mvn:io.swagger/swagger-models/1.5.3</bundle> <bundle>mvn:net.minidev/asm/1.0.2</bundle> <bundle>mvn:net.minidev/json-smart/2.1.1</bundle> <bundle>mvn:net.schmizz/sshj/0.8.1</bundle> @@ -22,26 +39,35 @@ <bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.0-SNAPSHOT</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.0-SNAPSHOT</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.0-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.0-SNAPSHOT</bundle> + <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle> <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle> <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.4.1</bundle> <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.4.1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2</bundle> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/0.9.9_1</bundle> <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/1.49</bundle> <bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/1.49</bundle> <bundle>mvn:org.codehaus.groovy/groovy-all/2.3.7</bundle> <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle> <bundle>mvn:org.codehaus.jackson/jackson-jaxrs/1.9.13</bundle> <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle> + <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle> + <bundle>mvn:org.eclipse.jetty.orbit/javax.servlet/3.0.0.v201112011016</bundle> <bundle>mvn:org.freemarker/freemarker/2.3.22</bundle> + <bundle>mvn:org.jvnet.mimepull/mimepull/1.9.3</bundle> <bundle>mvn:org.slf4j/jul-to-slf4j/1.6.6</bundle> <bundle>mvn:org.yaml/snakeyaml/1.11</bundle> <bundle>wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <bundle>wrap:mvn:com.maxmind.geoip2/geoip2/0.8.1</bundle> - <bundle>wrap:mvn:org.reflections/reflections/0.9.9-RC1</bundle> + <bundle>wrap:mvn:io.swagger/swagger-core/1.5.3</bundle> + <bundle>wrap:mvn:io.swagger/swagger-jaxrs/1.5.3</bundle> + <bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle> <bundle>wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle> </feature> </features> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/pom.xml b/karaf/pom.xml index 25f909f..ecacf2d 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -37,11 +37,17 @@ <lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version> + <javax-servlet-api.version>3.1.0</javax-servlet-api.version> + <!-- pax-exam --> <pax.exam.version>4.5.0</pax.exam.version> <pax.url.version>2.4.1</pax.url.version> <ops4j.base.version>1.5.0</ops4j.base.version> + <!-- feature repositories --> + <servicemix.version>6.0.0</servicemix.version> + <reflections.bundle.version>0.9.9_1</reflections.bundle.version> <!-- see reflections.version --> + <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> </properties>
