Repository: stratos Updated Branches: refs/heads/master e5dbd7778 -> d61637239
Updating Stratos dependencies versions to project version Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d6163723 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d6163723 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d6163723 Branch: refs/heads/master Commit: d61637239268903ffef7148de0d51eabfcf956bb Parents: e5dbd77 Author: Akila Perera <[email protected]> Authored: Tue Aug 11 17:23:54 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Tue Aug 11 17:23:54 2015 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.cloud.controller/pom.xml | 2 +- components/org.apache.stratos.kubernetes.client/pom.xml | 6 +++--- dependencies/fabric8/kubernetes-api/pom.xml | 6 ++---- dependencies/org.wso2.carbon.ui/pom.xml | 1 - .../org.apache.stratos.cloud.controller.feature/pom.xml | 4 ++-- pom.xml | 1 - products/stratos/modules/distribution/pom.xml | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/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 3c5869c..2b75e3d 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -317,7 +317,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>kubernetes-api</artifactId> - <version>${kubernetes.api.stratos.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <properties> http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/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 f2a03fd..c496318 100644 --- a/components/org.apache.stratos.kubernetes.client/pom.xml +++ b/components/org.apache.stratos.kubernetes.client/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>kubernetes-api</artifactId> - <version>${kubernetes.api.stratos.version}</version> + <version>${project.version}</version> </dependency> </dependencies> @@ -71,8 +71,8 @@ org.apache.stratos.kubernetes.client.exceptions, </Export-Package> <Import-Package> - io.fabric8.kubernetes.api.*;version=${kubernetes.api.stratos.version}, - io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.stratos.version}, + io.fabric8.kubernetes.api.*;version=${kubernetes.api.version}, + io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version}, *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/dependencies/fabric8/kubernetes-api/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml index baddfa2..6c4ac71 100644 --- a/dependencies/fabric8/kubernetes-api/pom.xml +++ b/dependencies/fabric8/kubernetes-api/pom.xml @@ -27,9 +27,7 @@ </parent> <artifactId>kubernetes-api</artifactId> - <version>2.2.16-stratosv1</version> <packaging>bundle</packaging> - <name>Fabric8 :: Kubernetes API</name> <description> This is a wrapper bundle for Fabric8 Kubernetes API for exposing proper bundle import @@ -141,8 +139,8 @@ <instructions> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> <Export-Package> - io.fabric8.kubernetes.api.*;version=${kubernetes.api.stratos.version}, - io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.stratos.version}, + io.fabric8.kubernetes.api.*;version=${kubernetes.api.version}, + io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version}, io.fabric8.kubernetes.internal.*, </Export-Package> <Import-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/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 0b03b2c..6c9e470 100644 --- a/dependencies/org.wso2.carbon.ui/pom.xml +++ b/dependencies/org.wso2.carbon.ui/pom.xml @@ -32,7 +32,6 @@ <packaging>bundle</packaging> <name>WSO2 Carbon - UI</name> <description>org.wso2.carbon.ui patch version for apache stratos</description> - <version>4.2.0-stratosv1</version> <url>http://wso2.org</url> <repositories> http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/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 a9c535c..d4a3388 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 @@ -254,7 +254,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>kubernetes-api</artifactId> - <version>${kubernetes.api.stratos.version}</version> + <version>${project.version}</version> </dependency> </dependencies> @@ -360,7 +360,7 @@ <bundleDef>org.apache.jclouds.api:sts:${jclouds.version}</bundleDef> <bundleDef>javax.ws.rs:jsr311-api:1.1.1</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:kubernetes-api:${kubernetes.api.stratos.version}</bundleDef> + <bundleDef>org.apache.stratos:kubernetes-api:${project.version}</bundleDef> </bundles> <importBundles> </importBundles> http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 555130e..993194a 100644 --- a/pom.xml +++ b/pom.xml @@ -555,6 +555,5 @@ <jclouds.version>1.8.1</jclouds.version> <project.jclouds.stratos.version>1.8.1-stratosv1</project.jclouds.stratos.version> <kubernetes.api.version>2.2.16</kubernetes.api.version> - <kubernetes.api.stratos.version>2.2.16-stratosv1</kubernetes.api.stratos.version> </properties> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/d6163723/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index add0975..d19d392 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -482,7 +482,7 @@ <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.wso2.carbon.ui</artifactId> - <version>4.2.0-stratos</version> + <version>${project.version}</version> </dependency> </dependencies> <build>
