Repository: stratos
Updated Branches:
  refs/heads/docker-integration 9ae2b3737 -> a9ffb6177


Loading Kubernetes client jar and the rest easy dependencies into the Stratos 
product runtime.


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a9ffb617
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a9ffb617
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a9ffb617

Branch: refs/heads/docker-integration
Commit: a9ffb6177a4fad977c8a618fda52cc5ae9e44747
Parents: 9ae2b37
Author: Nirmal Fernando <[email protected]>
Authored: Wed Sep 17 09:52:00 2014 +0530
Committer: Nirmal Fernando <[email protected]>
Committed: Wed Sep 17 09:52:15 2014 +0530

----------------------------------------------------------------------
 .../pom.xml                                     |  1 -
 products/stratos/modules/distribution/pom.xml   | 31 ++++++++++++++++++++
 .../modules/distribution/src/assembly/bin.xml   |  4 +++
 3 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/a9ffb617/components/org.apache.stratos.kubernetes.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml 
b/components/org.apache.stratos.kubernetes.client/pom.xml
index c15681a..9c45def 100644
--- a/components/org.apache.stratos.kubernetes.client/pom.xml
+++ b/components/org.apache.stratos.kubernetes.client/pom.xml
@@ -78,7 +78,6 @@
                        <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-               <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

http://git-wip-us.apache.org/repos/asf/stratos/blob/a9ffb617/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml 
b/products/stratos/modules/distribution/pom.xml
index 5e71b86..34a600a 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -38,6 +38,37 @@
             <version>${rampart.mar.version}</version>
             <type>mar</type>
         </dependency>
+       <dependency>
+                       <groupId>org.jboss.resteasy</groupId>
+                       <artifactId>resteasy-jaxrs</artifactId>
+                       <version>2.2.0.GA</version>
+                       <!-- filter out unwanted jars -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-httpclient</groupId>
+                                       
<artifactId>commons-httpclient</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>javax.servlet</groupId>
+                                       <artifactId>servlet-api</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.jboss.resteasy</groupId>
+                       <artifactId>resteasy-jaxb-provider</artifactId>
+                       <version>2.2.0.GA</version>
+               </dependency>
+       <dependency>
+                       <groupId>org.jboss.resteasy</groupId>
+                       <artifactId>resteasy-jackson-provider</artifactId>
+                       <version>2.2.0.GA</version>
+               </dependency>
+       <dependency>
+               <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.kubernetes.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.wso2.andes.wso2</groupId>
             <artifactId>andes-client</artifactId>

http://git-wip-us.apache.org/repos/asf/stratos/blob/a9ffb617/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml 
b/products/stratos/modules/distribution/src/assembly/bin.xml
index b5c4798..c2e82d3 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -576,6 +576,10 @@
                 <include>org.apache.activemq:activemq-client:jar</include>
                 
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar</include>
                 <include>org.fusesource.hawtbuf:hawtbuf:jar</include>
+                
<include>org.apache.stratos:org.apache.stratos.kubernetes.client:jar</include>
+               <include>org.jboss.resteasy:resteasy-jaxrs:jar</include>
+               <include>org.jboss.resteasy:resteasy-jaxb-provider:jar</include>
+               
<include>org.jboss.resteasy:resteasy-jackson-provider:jar</include>
             </includes>
         </dependencySet>
         <dependencySet>

Reply via email to