brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/3] brooklyn-server git commit: Adds brooklyn-rest-client feature
Date Wed, 10 Aug 2016 12:49:13 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 1a8789641 -> a86e60556


Adds brooklyn-rest-client feature

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2ec42ee2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2ec42ee2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2ec42ee2

Branch: refs/heads/master
Commit: 2ec42ee225acb847ab627ed944c52578469f3d46
Parents: ddb6acc
Author: Aled Sage <aled.sage@gmail.com>
Authored: Tue Aug 9 14:38:46 2016 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Tue Aug 9 14:38:46 2016 +0100

----------------------------------------------------------------------
 karaf/features/src/main/feature/feature.xml | 32 ++++++++++++++++++++++++
 karaf/pom.xml                               | 10 ++++++++
 2 files changed, 42 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2ec42ee2/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 8bc7e62..88c338f 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -100,6 +100,38 @@
         <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
     </feature>
 
+    <feature name="brooklyn-rest-client" version="${project.version}" description="Brooklyn
REST Client">
+        <feature>brooklyn-rest-api</feature>
+        <feature>swagger</feature>
+        
+        <bundle>mvn:org.apache.brooklyn/brooklyn-rest-client/${project.version}</bundle>
+        
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
+        <bundle dependency='true'>mvn:commons-logging/commons-logging/${commons-logging.version}</bundle>
+        <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+
+        <bundle dependency='true'>wrap:mvn:com.google.code.findbugs/jsr305/${jsr305.version}</bundle>
+
+        <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+        
+        <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jaxrs/${resteasy.version}</bundle>
+        <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/resteasy-jackson2-provider/${resteasy.version}</bundle>
+        <bundle dependency='true'>wrap:mvn:org.jboss.resteasy/jaxrs-api/${resteasy.version}</bundle>
+        <bundle dependency='true'>mvn:org.jboss.spec.javax.annotation/jboss-annotations-api_1.1_spec/${jboss-annotations-api_1.1_spec.version}</bundle>
+        <bundle dependency='true'>wrap:mvn:javax.activation/activation/${javax-activation.version}</bundle>
+        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+        <bundle dependency="true">wrap:mvn:net.jcip/jcip-annotations/${jcip-annotations.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-annotations/${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.jaxrs/jackson-jaxrs-json-provider/${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.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${fasterxml.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>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2ec42ee2/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 4574bf2..92c501d 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -48,6 +48,16 @@
     <servicemix.version>6.0.0</servicemix.version>
     <reflections.bundle.version>0.9.9_1</reflections.bundle.version> <!--
see reflections.version -->
 
+    <!-- brooklyn-rest-client's transitive dependencies from resteasy -->
+    <jboss-annotations-api_1.1_spec.version>1.0.1.Final</jboss-annotations-api_1.1_spec.version>
+    <javax-activation.version>1.1</javax-activation.version>
+    <jcip-annotations.version>1.0</jcip-annotations.version>
+    
+    <!-- brooklyn-rest-client's transitive dependencies from httpclient:4.4.1 -->
+    <commons-logging.version>1.2</commons-logging.version>
+    <commons-codec.version>1.9</commons-codec.version>
+    <commons-io.version>2.4</commons-io.version>
+
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
   </properties>


Mime
View raw message