You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/17 17:32:26 UTC
[3/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-joda/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-joda/pom.xml b/dependencies/jclouds/jclouds-joda/pom.xml
index 0a8c840..55f3e25 100644
--- a/dependencies/jclouds/jclouds-joda/pom.xml
+++ b/dependencies/jclouds/jclouds-joda/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-joda</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.date.joda*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-netty/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-netty/pom.xml b/dependencies/jclouds/jclouds-netty/pom.xml
index b1f6169..0598a82 100644
--- a/dependencies/jclouds/jclouds-netty/pom.xml
+++ b/dependencies/jclouds/jclouds-netty/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-netty</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,8 +53,8 @@
<Export-Package>org.jclouds.netty*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- org.jboss.netty*;version="${netty.imp.pkg.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ org.jboss.netty*;version="${netty.imp.pkg.version.range}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -64,4 +63,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-sshj/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-sshj/pom.xml b/dependencies/jclouds/jclouds-sshj/pom.xml
index 90b9492..8f147b3 100644
--- a/dependencies/jclouds/jclouds-sshj/pom.xml
+++ b/dependencies/jclouds/jclouds-sshj/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.sshj*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-common/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-common/pom.xml b/dependencies/jclouds/openstack-common/pom.xml
index 2168973..25041f4 100644
--- a/dependencies/jclouds/openstack-common/pom.xml
+++ b/dependencies/jclouds/openstack-common/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.common</groupId>
<artifactId>openstack-common</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.openstack*;version="${jclouds.version}";-noimport:=true</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-keystone/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-keystone/pom.xml b/dependencies/jclouds/openstack-keystone/pom.xml
index 2624bea..7a532c8 100644
--- a/dependencies/jclouds/openstack-keystone/pom.xml
+++ b/dependencies/jclouds/openstack-keystone/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -83,7 +82,7 @@
<Export-Package>org.jclouds.openstack*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -92,4 +91,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-neutron/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-neutron/pom.xml b/dependencies/jclouds/openstack-neutron/pom.xml
index e3fffa4..e45b860 100644
--- a/dependencies/jclouds/openstack-neutron/pom.xml
+++ b/dependencies/jclouds/openstack-neutron/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.openstack.neutron.v2*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-nova/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/pom.xml b/dependencies/jclouds/openstack-nova/pom.xml
index ba3a73a..328fc4e 100644
--- a/dependencies/jclouds/openstack-nova/pom.xml
+++ b/dependencies/jclouds/openstack-nova/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-nova</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.openstack.nova.v2_0*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/sts/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/sts/pom.xml b/dependencies/jclouds/sts/pom.xml
index 8167cfc..1785224 100644
--- a/dependencies/jclouds/sts/pom.xml
+++ b/dependencies/jclouds/sts/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>sts</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -84,7 +83,7 @@
</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -93,4 +92,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index cbee800..0248507 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -346,4 +346,4 @@
</profile>
<!-- END SNIPPET: release-profile -->
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/rocoto/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/rocoto/pom.xml b/dependencies/rocoto/pom.xml
index 420a984..4f8072d 100644
--- a/dependencies/rocoto/pom.xml
+++ b/dependencies/rocoto/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.99soft.guice</groupId>
<artifactId>rocoto</artifactId>
- <version>${rocoto.version}</version>
</dependency>
</dependencies>
@@ -57,7 +56,7 @@
!com.google.inject*,
*;resolution:=optional
</Import-Package>
- <Fragment-Host>guice;bundle-version="${guice.imp.pkg.version}"</Fragment-Host>
+ <Fragment-Host>guice;bundle-version="${guice.imp.pkg.version.range}"</Fragment-Host>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
<unpackBundle>true</unpackBundle>
@@ -65,4 +64,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/sshj/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/sshj/pom.xml b/dependencies/sshj/pom.xml
index 2d01282..74740d6 100644
--- a/dependencies/sshj/pom.xml
+++ b/dependencies/sshj/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
- <version>${net.schmizz.sshj.version}</version>
</dependency>
</dependencies>
@@ -54,9 +53,9 @@
<Import-Package>
!net.schmizz.*,
javax.crypto*,
- com.jcraft.jzlib*;version="${jzlib.imp.pkg.version}",
- org.slf4j*;version="${slf4j.imp.pkg.version}",
- org.bouncycastle*;version="${bouncycastle.imp.pkg.version}",
+ com.jcraft.jzlib*;version="${jzlib.imp.pkg.version.range}",
+ org.slf4j*;version="${slf4j.imp.pkg.version.range}",
+ org.bouncycastle*;version="${bouncycastle.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -65,4 +64,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
index 32eceb8..a455bcf 100644
--- a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
+++ b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
@@ -41,6 +41,10 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wso2.siddhi</groupId>
<artifactId>siddhi-core</artifactId>
<version>2.0.0-wso2v5</version>
@@ -48,7 +52,14 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@@ -60,4 +71,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
index 570d655..3d47615 100644
--- a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
+++ b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
@@ -35,6 +35,10 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wso2.siddhi</groupId>
<artifactId>siddhi-core</artifactId>
<version>2.1.0-wso2v1</version>
@@ -42,7 +46,14 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@@ -54,4 +65,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
index f110e22..105d4b1 100644
--- a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
+++ b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
@@ -22,13 +22,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>das-extension</artifactId>
<version>4.1.5-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>metering-service-capps</artifactId>
<name>Apache Stratos - Metering Service CApps</name>
@@ -39,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<executions>
<execution>
<id>auto-clean</id>
@@ -52,7 +51,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -71,6 +69,4 @@
</plugin>
</plugins>
</build>
-
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
index 840a932..cdcde5a 100644
--- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
+++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
@@ -22,13 +22,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>das-extension</artifactId>
<version>4.1.5-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>monitoring-service-capps</artifactId>
<name>Apache Stratos - Monitoring Service CApps</name>
@@ -39,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<executions>
<execution>
<id>auto-clean</id>
@@ -52,7 +51,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -71,6 +69,4 @@
</plugin>
</plugins>
</build>
-
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/das/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/pom.xml b/extensions/das/pom.xml
index 13f9a22..e81a68b 100644
--- a/extensions/das/pom.xml
+++ b/extensions/das/pom.xml
@@ -31,12 +31,11 @@
<packaging>pom</packaging>
<name>Apache Stratos - DAS Extension</name>
<description>Apache Stratos DAS extension</description>
+
<modules>
<module>modules/artifacts/metering-dashboard/capps</module>
<module>modules/artifacts/monitoring-dashboard/capps</module>
<module>modules/stratos-das-extension</module>
<module>modules/distribution</module>
</modules>
-
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/aws-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/aws-extension/pom.xml b/extensions/load-balancer/modules/aws-extension/pom.xml
index 812dde3..02b5eff 100644
--- a/extensions/load-balancer/modules/aws-extension/pom.xml
+++ b/extensions/load-balancer/modules/aws-extension/pom.xml
@@ -20,9 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
@@ -38,47 +36,38 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.8.8</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.5.wso2v1</version>
</dependency>
</dependencies>
@@ -87,7 +76,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<configuration>
<archive>
<manifest>
@@ -120,5 +108,4 @@
</plugin>
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/haproxy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/haproxy-extension/pom.xml b/extensions/load-balancer/modules/haproxy-extension/pom.xml
index 15e4d27..5f42132 100644
--- a/extensions/load-balancer/modules/haproxy-extension/pom.xml
+++ b/extensions/load-balancer/modules/haproxy-extension/pom.xml
@@ -36,37 +36,30 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
</dependencies>
@@ -107,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/lvs-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/lvs-extension/pom.xml b/extensions/load-balancer/modules/lvs-extension/pom.xml
index e06617c..e100c70 100644
--- a/extensions/load-balancer/modules/lvs-extension/pom.xml
+++ b/extensions/load-balancer/modules/lvs-extension/pom.xml
@@ -36,37 +36,30 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
</dependencies>
@@ -107,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/nginx-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/nginx-extension/pom.xml b/extensions/load-balancer/modules/nginx-extension/pom.xml
index b29e6ed..71989d1 100644
--- a/extensions/load-balancer/modules/nginx-extension/pom.xml
+++ b/extensions/load-balancer/modules/nginx-extension/pom.xml
@@ -36,37 +36,30 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
</dependencies>
@@ -107,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
index 364b2a4..6534a26 100644
--- a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
+++ b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
@@ -54,7 +54,16 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.autoscaler:${project.version}
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.identity.oauth.stub:${carbon.platform.patch.version.4.2.3}
+ </bundleDef>
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.identity.application.mgt.stub:${carbon.platform.version.4.2.0}
+ </bundleDef>
+
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.autoscaler:${project.version}
</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}
@@ -62,9 +71,28 @@
<bundleDef>
org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}
</bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
+ </bundleDef>
+ <bundleDef>org.mvel:mvel2:${mvel2.version}</bundleDef>
+ <bundleDef>org.apache.amber.wso2:amber:${amber.version}</bundleDef>
+ <bundleDef>com.nimbusds.wso2:nimbus-jose-jwt:${nimbus.jose.jwt.wso2.version}</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.core:${carbon.kernel.version}
+ </importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.ntask.core:${carbon.platform.patch.version.4.2.1}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -72,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/cep/org.apache.stratos.event.processor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
index ac6ded6..1ccca10 100644
--- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
@@ -37,13 +37,11 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.event.processor.server.feature</artifactId>
- <version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.event.processor.ui.feature</artifactId>
- <version>1.0.0</version>
<type>zip</type>
</dependency>
</dependencies>
@@ -71,7 +69,7 @@
org.apache.stratos:org.apache.stratos.event.processor.server.feature:${project.version}
</includedFeatureDef>
<includedFeatureDef>
- org.wso2.carbon:org.wso2.carbon.event.processor.ui.feature:1.0.0
+ org.wso2.carbon:org.wso2.carbon.event.processor.ui.feature:${carbon.event.processor.version}
</includedFeatureDef>
</includedFeatures>
</configuration>
@@ -80,4 +78,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
index 8241985..06a5d61 100644
--- a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
@@ -82,7 +82,8 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.event.processor.core:${siddhi.event.processor.version}
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.event.processor.core:${siddhi.event.processor.version}
</bundleDef>
<bundleDef>
org.wso2.carbon:org.wso2.carbon.event.processor.admin:${siddhi.event.processor.version}
@@ -104,7 +105,8 @@
</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -112,4 +114,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index 7ac3bff..3befc3d 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -81,13 +81,20 @@
</adviceFile>
<bundles>
<!-- Stratos bundles -->
- <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.cloud.controller:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.kubernetes.client:${project.version}
</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.kubernetes.client:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.mock.iaas.client:${project.version}
</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.mock.iaas.client:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
</bundleDef>
<!-- Kubernetes API wrapper -->
@@ -99,6 +106,7 @@
<!-- jclouds bundles -->
<bundleDef>org.apache.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
<bundleDef>org.apache.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
+
<!-- jclouds wrappers in Stratos -->
<bundleDef>org.apache.stratos:google-compute-engine:${jclouds.version}
</bundleDef>
@@ -122,54 +130,68 @@
<bundleDef>org.apache.stratos:jclouds-sshj:${jclouds.version}</bundleDef>
<!-- jclouds dependencies -->
- <bundleDef>com.jcraft:jsch.agentproxy.core:0.0.8</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.connector-factory:0.0.8</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.sshagent:0.0.8</bundleDef>
+ <bundleDef>com.jcraft:jsch.agentproxy.core:${jsch.agentproxy.version}</bundleDef>
+ <bundleDef>
+ com.jcraft:jsch.agentproxy.connector-factory:${jsch.agentproxy.version}
+ </bundleDef>
+ <bundleDef>com.jcraft:jsch.agentproxy.sshagent:${jsch.agentproxy.version}</bundleDef>
<bundleDef>
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-sshj:0.0.8_1
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-sshj:${jsch.agentproxy.sshj.version}
</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.usocket-nc:0.0.8</bundleDef>
- <bundleDef>io.netty:netty:3.5.9.Final</bundleDef>
- <bundleDef>com.google.guava:guava:16.0.1</bundleDef>
- <bundleDef>net.java.dev.jna:jna:4.1.0</bundleDef>
- <bundleDef>net.java.dev.jna:jna-platform:4.1.0</bundleDef>
- <bundleDef>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jzlib:1.1.1_1
+ <bundleDef>com.jcraft:jsch.agentproxy.usocket-nc:${usocket.nc.version}</bundleDef>
+ <bundleDef>io.netty:netty:${netty.version}</bundleDef>
+ <bundleDef>com.google.guava:guava:${guava.version}</bundleDef>
+ <bundleDef>net.java.dev.jna:jna:${jna.version}</bundleDef>
+ <bundleDef>net.java.dev.jna:jna-platform:${jna.version}</bundleDef>
+ <bundleDef>
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.jzlib:${servicemix.bundles.jzlib.version}
</bundleDef>
<bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
- <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
- <bundleDef>javax.ws.rs:jsr311-api:1.1.1</bundleDef>
+ <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:${bcprov.jdk16.version}</bundleDef>
+ <bundleDef>javax.ws.rs:jsr311-api:${jsr311.api.version}</bundleDef>
<bundleDef>
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject:1_2
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject:${servicemix.bundles.javax.inject.version}
</bundleDef>
<bundleDef>
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance:1.0_6
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance:${servicemix.bundles.aopalliance.version}
</bundleDef>
<!-- jclouds dependency wrappers in Stratos -->
- <bundleDef>org.apache.stratos:guice:3.0</bundleDef>
- <bundleDef>org.apache.stratos:net.schmizz.sshj:0.8.1</bundleDef>
- <bundleDef>org.apache.stratos:guice-assistedinject:3.0</bundleDef>
- <bundleDef>org.apache.stratos:guice-multibindings:3.0</bundleDef>
- <bundleDef>org.apache.stratos:rocoto:6.1</bundleDef>
+ <bundleDef>org.apache.stratos:guice:${guice.version}</bundleDef>
+ <bundleDef>org.apache.stratos:net.schmizz.sshj:${net.schmizz.sshj.version}</bundleDef>
+ <bundleDef>
+ org.apache.stratos:guice-assistedinject:${guice.assistedinject.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:guice-multibindings:${guice.multibindings.version}
+ </bundleDef>
+ <bundleDef>org.apache.stratos:rocoto:${rocoto.version}</bundleDef>
<!-- Misc -->
<bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
- <bundleDef>org.apache.commons:commons-compress:1.5</bundleDef>
- <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
- <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.7.0</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.7.0</bundleDef>
+ <bundleDef>org.apache.commons:commons-compress:${commons.compress.version}</bundleDef>
+ <bundleDef>
+ com.jamesmurty.utils.wso2:java-xmlbuilder:${java.xmlbuilder.wso2.version}
+ </bundleDef>
+ <bundleDef>commons-io.wso2:commons-io:${commons.io.wso2.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-api:${slf4j.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-log4j12:${slf4j.log4j12.version}</bundleDef>
<bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}
</bundleDef>
- <bundleDef>jdom.wso2:jdom:1.0.0.wso2v1</bundleDef>
- <bundleDef>org.json.wso2:json:1.0.0.wso2v1</bundleDef>
- <bundleDef>org.apache.httpcomponents.wso2:httpcore:4.3.0.wso2v1</bundleDef>
- <bundleDef>org.apache.httpcomponents.wso2:httpclient:4.2.5.wso2v1</bundleDef>
+ <bundleDef>jdom.wso2:jdom:${jdom.wso2.version}</bundleDef>
+ <bundleDef>org.json.wso2:json:${json.wso2.version}</bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpclient-osgi:${httpclient.version}</bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpcore-osgi:${httpcore.version}</bundleDef>
</bundles>
<importBundles>
</importBundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.core.server:${carbon.kernel.version}
+ </importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.ntask.core:${carbon.platform.patch.version.4.2.1}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -177,4 +199,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/common/org.apache.stratos.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.feature/pom.xml b/features/common/org.apache.stratos.common.feature/pom.xml
index d0604fe..5d75e68 100644
--- a/features/common/org.apache.stratos.common.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.feature/pom.xml
@@ -35,13 +35,11 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common.server.feature</artifactId>
- <version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.custom.handlers.feature</artifactId>
- <version>${project.version}</version>
<type>zip</type>
</dependency>
</dependencies>
@@ -75,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.server.feature/pom.xml b/features/common/org.apache.stratos.common.server.feature/pom.xml
index 6a00de8..ec4cd0c 100644
--- a/features/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.server.feature/pom.xml
@@ -86,11 +86,19 @@
</properties>
</adviceFile>
<bundles>
+ <!-- Stratos bundles -->
<bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
+
+ <!-- Misc -->
<bundleDef>org.quartz-scheduler.wso2:quartz:${quartz.wso2.version}</bundleDef>
<bundleDef>org.json.wso2:json:${json.wso2.version}</bundleDef>
<bundleDef>kaptcha.wso2:kaptcha:${kaptcha.wso2.version}</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt:${carbon.kernel.version}</bundleDef>
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.captcha.mgt:${carbon.kernel.version}
+ </bundleDef>
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
+ </bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>
@@ -103,4 +111,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
index df42777..ef9dbd2 100644
--- a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
+++ b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
@@ -55,8 +55,17 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.custom.handlers:${project.version}</bundleDef>
- <bundleDef>com.nimbusds.wso2:nimbus-jose-jwt:2.26.1.wso2v2</bundleDef>
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.identity.oauth:${carbon.platform.patch.version.4.2.3}
+ </bundleDef>
+
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.custom.handlers:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>com.nimbusds.wso2:nimbus-jose-jwt:${nimbus.jose.jwt.wso2.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -64,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
index 7e09b64..c428358 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
@@ -54,15 +54,15 @@
</properties>
</adviceFile>
<bundles>
+ <!-- Stratos bundles -->
<bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.load.balancer.common:${project.version}
</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}</importFeatureDef>
+ <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -70,4 +70,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
index 03816dd..eed0860 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
@@ -55,13 +55,32 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.load.balancer:${project.version}
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.load.balancer:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.autoscaler.service.stub:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>
+ org.wso2.orbit.commons-collections:commons-collections:${commons.collections.version}
+ </bundleDef>
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
+ <importFeatureDef>
+ org.wso2.carbon.core.server:${carbon.kernel.version}
+ </importFeatureDef>
+ <importFeatureDef>
+ org.apache.synapse.wso2:${synapse.wso2.feature.version}
</importFeatureDef>
- <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}</importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -69,4 +88,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
index e743ed8..196a2be 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
@@ -20,6 +20,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
@@ -27,7 +28,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.metadata.client.feature</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Metadata client Feature</name>
@@ -56,12 +56,19 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version}
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.metadata.client:${project.version}
</bundleDef>
+
+ <!-- Misc -->
<bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
- <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
- <bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef>
- <bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef>
+ <bundleDef>org.apache.commons:commons-lang3:${commons.lang3.version}</bundleDef>
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
+ </bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpclient-osgi:${httpclient.version}</bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpcore-osgi:${httpcore.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -69,4 +76,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
index 09048a3..b8889d2 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
@@ -33,200 +33,6 @@
<name>Apache Stratos - Meta Data Service feature</name>
<description>This feature packs the Meta Data Service of stratos</description>
- <dependencies>
- <!--CXF runtime environment-->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-dv</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjc-utils</groupId>
- <artifactId>cxf-xjc-runtime</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-boolean</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.0-beta3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-nio</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0-m10</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.6.11</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.xmlschema</groupId>
- <artifactId>xmlschema-core</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon.webapp.ext</groupId>
- <artifactId>carbon-cxf</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>4.2.0</version>
- </dependency>
- <!--dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
- <version>${project.version}</version>
- </dependency-->
- </dependencies>
-
<build>
<resources>
<resource>
@@ -297,7 +103,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
index b14a6b6..6ab73bb 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
@@ -33,200 +33,6 @@
<name>Apache Stratos - RESTful admin services feature</name>
<description>This feature packs the RESTful API cabability of stratos</description>
- <dependencies>
- <!--CXF runtime environment-->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-dv</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjc-utils</groupId>
- <artifactId>cxf-xjc-runtime</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-boolean</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.0-beta3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-nio</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0-m10</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.6.11</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.xmlschema</groupId>
- <artifactId>xmlschema-core</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon.webapp.ext</groupId>
- <artifactId>carbon-cxf</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.client</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>4.2.0</version>
- </dependency>
- </dependencies>
-
<build>
<resources>
<resource>
@@ -299,4 +105,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
index 031e7eb..66ee3eb 100644
--- a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
+++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
@@ -79,19 +79,33 @@
</properties>
</adviceFile>
<bundles>
+ <!-- Stratos bundles -->
<bundleDef>org.apache.stratos:org.apache.stratos.manager:${project.version}</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}
</bundleDef>
- <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v8</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}
</bundleDef>
- <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
- <bundleDef>com.google.code.gson:gson:2.1</bundleDef>
- <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
- <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>
- <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.autoscaler.service.stub:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>org.wso2.andes.wso2:andes-client:${andes.client.version}</bundleDef>
+ <bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
+ <bundleDef>org.apache.commons:commons-lang3:${commons.lang3.version}</bundleDef>
+ <bundleDef>
+ org.eclipse.jgit:org.eclipse.jgit:${eclipse.jgit.wso2.osgi.version}
+ </bundleDef>
+ <bundleDef>com.jcraft:jsch:${jsch.version}</bundleDef>
+ <bundleDef>com.gitblit:gitblit:${gitblit.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -99,4 +113,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
index 262e485..68fc7ff 100644
--- a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
+++ b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
@@ -54,7 +54,8 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.manager.styles:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.manager.styles:${project.version}
</bundleDef>
</bundles>
<importFeatures>
@@ -66,4 +67,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/messaging/org.apache.stratos.messaging.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/org.apache.stratos.messaging.feature/pom.xml b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
index 3a30229..4b0e09b 100644
--- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml
+++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
@@ -54,12 +54,22 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>
+ org.wso2.orbit.commons-collections:commons-collections:${commons.collections.version}
</bundleDef>
<bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
- <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
+ <bundleDef>org.apache.commons:commons-lang3:${commons.lang3.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-api:${slf4j.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-log4j12:${slf4j.log4j12.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -67,4 +77,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>