Repository: stratos Updated Branches: refs/heads/master 9f0d671a4 -> 08de72982
switch to jclouds 1.8.1 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fc74c5b9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fc74c5b9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fc74c5b9 Branch: refs/heads/master Commit: fc74c5b9137e07cad8f10a36842b5ab6d1ce1305 Parents: 76fdcfc Author: R-Rajkumar <[email protected]> Authored: Wed Dec 3 23:24:23 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Wed Dec 3 23:24:23 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.cloud.controller/pom.xml | 19 ++++++++++------ dependencies/pom.xml | 9 ++++---- .../pom.xml | 23 ++++++++++---------- pom.xml | 4 ++-- 4 files changed, 30 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fc74c5b9/components/org.apache.stratos.cloud.controller/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml index 1a9445a..2d19286 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -216,19 +216,24 @@ <version>${jclouds.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> + <groupId>org.apache.jclouds.api</groupId> <artifactId>ec2</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>aws-ec2</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> + <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-nova</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.version}</version> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>openstack-neutron</artifactId> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> <groupId>org.apache.jclouds.api</groupId> @@ -243,12 +248,12 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>vcloud</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>gce</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/stratos/blob/fc74c5b9/dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/pom.xml b/dependencies/pom.xml index b98d916..46bed08 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -33,11 +33,10 @@ <url>http://apache.org</url> <modules> - <module>jclouds/apis/vcloud/1.8.0-stratos</module> - <module>jclouds/apis/ec2/1.8.0-stratos</module> - <module>jclouds/apis/openstack-nova/1.8.0-stratos</module> - <module>jclouds/apis/gce/1.8.0-stratos</module> - <module>jclouds/provider/aws-ec2/1.8.0-stratos</module> + <module>jclouds/apis/vcloud/1.8.1-stratos</module> + <module>jclouds/apis/openstack-neutron/1.8.1-stratos</module> + <module>jclouds/apis/gce/1.8.1-stratos</module> + <module>jclouds/provider/aws-ec2/1.8.1-stratos</module> <module>org.wso2.carbon.ui</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/fc74c5b9/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 a4cbbae..c12fcfa 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 @@ -120,19 +120,19 @@ <version>${jclouds.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> + <groupId>org.apache.jclouds.api</groupId> <artifactId>ec2</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>aws-ec2</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> + <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-nova</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -163,7 +163,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>vcloud</artifactId> - <version>1.8.0-stratos</version> + <version>${jclouds.stratos.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> @@ -301,15 +301,16 @@ <bundleDef>org.apache.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds:jclouds-core:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds:jclouds-compute:${jclouds.version}</bundleDef> - <bundleDef>org.apache.stratos:ec2:1.8.0-stratos</bundleDef> - <bundleDef>org.apache.stratos:openstack-nova:1.8.0-stratos</bundleDef> - <bundleDef>org.apache.stratos:vcloud:1.8.0-stratos</bundleDef> - <bundleDef>org.apache.stratos:gce:1.8.0-stratos</bundleDef> + <bundleDef>org.apache.jclouds.api:ec2:${jclouds.version}</bundleDef> + <bundleDef>org.apache.jclouds.api:openstack-nova:${jclouds.version}</bundleDef> + <bundleDef>org.apache.stratos:openstack-neutron:${jclouds.stratos.version}</bundleDef> + <bundleDef>org.apache.stratos:vcloud:${jclouds.stratos.version}</bundleDef> + <bundleDef>org.apache.stratos:gce:${jclouds.stratos.version}</bundleDef> + <bundleDef>org.apache.stratos:aws-ec2:${jclouds.stratos.version}</bundleDef> <bundleDef>org.apache.commons:commons-compress:1.5</bundleDef> <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef> <bundleDef>org.apache.jclouds.common:openstack-common:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds.api:openstack-keystone:${jclouds.version}</bundleDef> - <bundleDef>org.apache.stratos:aws-ec2:1.8.0-stratos</bundleDef> <bundleDef>com.google.guava:guava:17.0</bundleDef> <bundleDef>org.apache.jclouds.api:cloudstack:${jclouds.version}</bundleDef> http://git-wip-us.apache.org/repos/asf/stratos/blob/fc74c5b9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9a03e74..5375ada 100644 --- a/pom.xml +++ b/pom.xml @@ -546,7 +546,7 @@ <carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range> <carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version> <axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version> - <jclouds.version>1.8.0</jclouds.version> - <jclouds.stratos.version>1.8.0-stratos</jclouds.stratos.version> + <jclouds.version>1.8.1</jclouds.version> + <jclouds.stratos.version>1.8.1-stratos</jclouds.stratos.version> </properties> </project>
