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/19 10:14:09 UTC
[3/3] stratos git commit: Add javax.cache OSGi import and dependency
Add javax.cache OSGi import and dependency
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aa21115e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aa21115e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aa21115e
Branch: refs/heads/stratos-4.1.x
Commit: aa21115ed9f584e82633767efbdcedef12b8f81b
Parents: 28dfc07
Author: Akila Perera <ra...@gmail.com>
Authored: Thu Nov 19 14:37:27 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Thu Nov 19 14:43:31 2015 +0530
----------------------------------------------------------------------
components/org.apache.stratos.cloud.controller/pom.xml | 6 ------
components/org.apache.stratos.common/pom.xml | 10 ++++++++++
components/org.apache.stratos.manager/pom.xml | 5 +++++
pom.xml | 5 +++++
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa21115e/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 69ff89f..953d034 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</dependency>
<dependency>
@@ -196,12 +192,10 @@
<Import-Package>
org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
- org.wso2.carbon.core.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.securevault.*;version="0.0.0",
org.wso2.carbon.ntask.core.*;version="0.0.0",
- org.wso2.carbon.caching.*;version="${carbon.platform.imp.pkg.version.range}",
org.apache.stratos.mock.iaas.*;version="${project.version}",
org.apache.stratos.mock.iaas.client.*;version="${project.version}",
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa21115e/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index 4da58c3..64d93f3 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -32,6 +32,14 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>javax.cache.wso2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</dependency>
<dependency>
@@ -121,6 +129,8 @@
org.apache.stratos.common.*
</Export-Package>
<Import-Package>
+ org.wso2.carbon.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.caching.impl.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.user.mgt.*;version="${carbon.platform.imp.pkg.version.range}",
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa21115e/components/org.apache.stratos.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml
index 82a29da..8eb64cc 100644
--- a/components/org.apache.stratos.manager/pom.xml
+++ b/components/org.apache.stratos.manager/pom.xml
@@ -38,6 +38,10 @@
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
</dependency>
<dependency>
@@ -126,6 +130,7 @@
<Import-Package>
org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
org.wso2.carbon.ntask.core.*;version="0.0.0",
org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
http://git-wip-us.apache.org/repos/asf/stratos/blob/aa21115e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51775bc..5ede424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,6 +381,11 @@
<artifactId>org.wso2.carbon.mediator.bridge</artifactId>
<version>${carbon.platform.version.4.2.0}</version>
</dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>javax.cache.wso2</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
<!-- Misc -->
<dependency>