[BROOKLYN-183] Finalize feature brooklyn-rest-server
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/05a2c5fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/05a2c5fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/05a2c5fc Branch: refs/heads/master Commit: 05a2c5fc3d092cf92c33f14606cfdaf639a65466 Parents: badf6df Author: Ciprian Ciubotariu <[email protected]> Authored: Fri Nov 6 15:56:38 2015 +0200 Committer: Ciprian Ciubotariu <[email protected]> Committed: Thu Nov 12 18:11:42 2015 +0200 ---------------------------------------------------------------------- karaf/features/src/main/feature/feature.xml | 10 +++++++--- karaf/features/src/main/history/dependencies.xml | 6 ++++++ parent/pom.xml | 10 ++++++++++ pom.xml | 2 ++ 4 files changed, 25 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/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 cf95ff7..f426ee2 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -131,7 +131,6 @@ <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 --> @@ -142,6 +141,11 @@ <feature name="brooklyn-camp-brooklyn" version="${project.version}" description="Brooklyn CAMP REST API"> <bundle>mvn:org.apache.brooklyn/brooklyn-camp/${project.version}</bundle> + + <feature>brooklyn-core</feature> + <feature>brooklyn-camp-base</feature> + <bundle dependency="true">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle> + <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> </feature> <feature name="brooklyn-camp-base" version="${project.version}" description="Brooklyn CAMP Base"> @@ -163,12 +167,12 @@ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle> </feature> - - <feature name="brooklyn-rest-server" version="${project.version}" description="Brooklyn REST Server"> <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/${project.version}</bundle> <feature>brooklyn-core</feature> <feature>brooklyn-rest-api</feature> + <feature>brooklyn-camp-brooklyn</feature> + <feature>brooklyn-camp-base</feature> </feature> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/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 571053f..dcae787 100644 --- a/karaf/features/src/main/history/dependencies.xml +++ b/karaf/features/src/main/history/dependencies.xml @@ -4,6 +4,10 @@ <feature prerequisite="false" dependency="false">brooklyn-api</feature> <feature prerequisite="false" dependency="false">brooklyn-api</feature> <feature prerequisite="false" dependency="false">brooklyn-camp-base</feature> + <feature prerequisite="false" dependency="false">brooklyn-camp-base</feature> + <feature prerequisite="false" dependency="false">brooklyn-camp-base</feature> + <feature prerequisite="false" dependency="false">brooklyn-camp-brooklyn</feature> + <feature prerequisite="false" dependency="false">brooklyn-core</feature> <feature prerequisite="false" dependency="false">brooklyn-core</feature> <feature prerequisite="false" dependency="false">brooklyn-rest-api</feature> <feature prerequisite="false" dependency="false">brooklyn-utils-common</feature> @@ -34,7 +38,9 @@ <bundle>mvn:com.sun.jersey/jersey-servlet/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-beanutils/commons-beanutils/1.9.1</bundle> <bundle>mvn:commons-codec/commons-codec/1.9</bundle> + <bundle>mvn:commons-collections/commons-collections/3.2.1</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> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4cd0f06..92e9e80 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -315,6 +315,16 @@ <version>${gson.version}</version> </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons-beanutils.version}</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>${commons-collections.version}</version> + </dependency> + <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>${commons-configuration.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f22544c..3235e24 100644 --- a/pom.xml +++ b/pom.xml @@ -186,6 +186,8 @@ <jline.version>2.12</jline.version> <jsonSmart.version>2.1.1</jsonSmart.version> <minidev.asm.version>1.0.2</minidev.asm.version> + <commons-beanutils.version>1.9.1</commons-beanutils.version> + <commons-collections.version>3.2.1</commons-collections.version> <!-- Compilation --> </properties>
