[BROOKLYN-183] Completed brooklyn-core as karaf feature * also split brooklyn-* bundles into different standalone features * clean up bundle dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dadf87ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dadf87ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dadf87ac Branch: refs/heads/master Commit: dadf87ac6ec765244573f0edb4ab8d0d66a9a52a Parents: 04bb1f2 Author: Ciprian Ciubotariu <[email protected]> Authored: Sat Oct 10 23:43:19 2015 +0300 Committer: Ciprian Ciubotariu <[email protected]> Committed: Sun Oct 25 01:04:51 2015 +0300 ---------------------------------------------------------------------- karaf/features/src/main/feature/feature.xml | 45 +++++++++++++++++--- .../features/src/main/history/dependencies.xml | 24 +++++++++++ 2 files changed, 64 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dadf87ac/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 d308bce..c6cfed6 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -22,15 +22,37 @@ <repository>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</repository> <repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository> - <!-- TODO: complete the features set --> + <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> + + <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle> + <bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle> + <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle> + <bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/${slf4j.version}</bundle> + <bundle dependency="true">mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle> + + <bundle dependency="true">mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> + <bundle dependency="true">mvn:ch.qos.logback/logback-core/${logback.version}</bundle> + </feature> + + <feature name="brooklyn-utils-groovy" version="${project.version}" description="Brooklyn Groovy Utils"> + <feature>brooklyn-utils-common</feature> + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/${project.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> + </feature> + <feature name="brooklyn-core" version="${project.version}" description="Brooklyn Core"> + <feature>brooklyn-api</feature> + <bundle>mvn:org.apache.brooklyn/brooklyn-core/${project.version}</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-api/${project.version}</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version}</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/${project.version}</bundle> <bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/${project.version}</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/${project.version}</bundle> - <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle> <bundle dependency="true">mvn:com.google.code.gson/gson/${gson.version}</bundle> <bundle dependency="true">mvn:com.jayway.jsonpath/json-path/${jsonPath.version}</bundle> <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle> @@ -39,11 +61,24 @@ <bundle dependency="true">mvn:net.minidev/json-smart/${jsonSmart.version}</bundle> <bundle dependency="true">mvn:net.minidev/asm/${minidev.asm.version}</bundle> <bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle> + <bundle dependency="true">mvn:org.freemarker/freemarker/${freemarker.version}</bundle> + <bundle dependency="true">mvn:net.schmizz/sshj/${sshj.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2</bundle> <!-- jzlib version is 1.1.3, but bundle is 1.1.3_2 --> + <bundle dependency="true">mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle> + <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle> + <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> + <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.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> + <bundle dependency="true">mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version}</bundle> <!-- 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> </feature> <feature name="brooklyn-commands" version="${project.version}" description="Brooklyn Shell Commands"> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dadf87ac/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 d90b75f..a77e8ad 100644 --- a/karaf/features/src/main/history/dependencies.xml +++ b/karaf/features/src/main/history/dependencies.xml @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <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-utils-common</feature> + <feature prerequisite="false" dependency="false">brooklyn-utils-common</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.2</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.2</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.2</bundle> @@ -8,16 +13,35 @@ <bundle>mvn:com.google.guava/guava/17.0</bundle> <bundle>mvn:com.jayway.jsonpath/json-path/2.0.0</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: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> <bundle>mvn:org.apache.brooklyn/brooklyn-api/0.9.0-SNAPSHOT</bundle> <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-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.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.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.4</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.freemarker/freemarker/2.3.22</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:xpp3/xpp3_min/1.1.4c</bundle> </feature> </features>
