Repository: incubator-stratos Updated Branches: refs/heads/master 13e5733f4 -> 7e62d1205
Adding vcloud module to build Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7e62d120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7e62d120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7e62d120 Branch: refs/heads/master Commit: 7e62d1205696b6d11156de8ddc3ca6c46befb4f5 Parents: 13e5733 Author: Melan Nimesh <[email protected]> Authored: Wed Mar 5 23:29:32 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Wed Mar 5 23:29:32 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.cloud.controller/pom.xml | 2 +- dependencies/pom.xml | 41 ++++++++++++++++++++ .../pom.xml | 4 +- pom.xml | 2 + 4 files changed, 46 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7e62d120/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 d84e657..73b67b4 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -211,7 +211,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>vcloud</artifactId> - <version>${jclouds.version}</version> + <version>${jclouds.vcloud.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7e62d120/dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/pom.xml b/dependencies/pom.xml new file mode 100644 index 0000000..8c31467 --- /dev/null +++ b/dependencies/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<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";> + + <parent> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>stratos-dependents</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Dependent Projects</name> + <description>Apache Stratos dependent projects</description> + <url>http://apache.org</url> + + <modules> + <module>jclouds/vcloud/1.7.1-stratos</module> + </modules> +</project> + http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7e62d120/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 c98b499..f72e9f7 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 @@ -121,7 +121,7 @@ <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>vcloud</artifactId> - <version>${jclouds.version}</version> + <version>${jclouds.vcloud.version}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -233,7 +233,7 @@ <bundleDef>org.apache.jclouds:jclouds-compute:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds.api:ec2:${jclouds.version}</bundleDef> <bundleDef>org.apache.jclouds.api:openstack-nova:${jclouds.version}</bundleDef> - <bundleDef>org.apache.jclouds.api:vcloud:${jclouds.version}</bundleDef> + <bundleDef>org.apache.jclouds.api:vcloud:${jclouds.vcloud.version}</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> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7e62d120/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7bd0014..961d951 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,7 @@ </scm> <modules> + <module>dependencies</module> <module>service-stubs</module> <module>components</module> <module>extensions</module> @@ -433,5 +434,6 @@ <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.7.1</jclouds.version> + <jclouds.vcloud.version>1.7.1-stratos</jclouds.vcloud.version> </properties> </project>
