Repository: stratos
Updated Branches:
refs/heads/master b90ed7087 -> 1539df8cb
Replacing carbon version 4.2.0 with ${wso2carbon.version} in component pom.xml
files
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1539df8c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1539df8c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1539df8c
Branch: refs/heads/master
Commit: 1539df8cb19b6923ecaa31cea32aab64e2eb5aa1
Parents: b90ed70
Author: Imesh Gunaratne <[email protected]>
Authored: Fri Jan 16 16:52:40 2015 +0530
Committer: Imesh Gunaratne <[email protected]>
Committed: Fri Jan 16 16:52:40 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.account.mgt.ui/pom.xml | 21 ++++++++++---------
.../org.apache.stratos.autoscaler/pom.xml | 8 +++----
.../org.apache.stratos.cartridge.agent/pom.xml | 4 ++--
.../org.apache.stratos.cloud.controller/pom.xml | 9 ++++----
components/org.apache.stratos.common/pom.xml | 4 ++--
.../org.apache.stratos.custom.handlers/pom.xml | 10 ++++-----
.../pom.xml | 4 ++--
.../org.apache.stratos.logging.view.ui/pom.xml | 22 ++++++++++----------
.../org.apache.stratos.manager.styles/pom.xml | 2 +-
components/org.apache.stratos.manager/pom.xml | 2 +-
.../org.apache.stratos.metadataservice/pom.xml | 10 ++++-----
.../org.apache.stratos.register.ui/pom.xml | 6 +++---
.../org.apache.stratos.rest.endpoint/pom.xml | 6 +++---
.../pom.xml | 11 +++++-----
14 files changed, 61 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.account.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt.ui/pom.xml
b/components/org.apache.stratos.account.mgt.ui/pom.xml
index fd671fc..5e56aba 100644
--- a/components/org.apache.stratos.account.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.account.mgt.ui/pom.xml
@@ -17,7 +17,8 @@
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";>
+<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-components-parent</artifactId>
@@ -36,7 +37,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
+
<extensions>true</extensions>
<configuration>
<instructions>
@@ -64,32 +65,32 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.account.mgt.stub</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.json.wso2</groupId>
- <artifactId>json</artifactId>
- <version>${json.wso2.version}</version>
+ <groupId>org.json.wso2</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.wso2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common.stub</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml
b/components/org.apache.stratos.autoscaler/pom.xml
index 575657f..4f5874d 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -181,7 +181,7 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
<scope>provided</scope>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
@@ -201,9 +201,9 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>com.nimbusds.wso2</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>2.26.1.wso2v2</version>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml
b/components/org.apache.stratos.cartridge.agent/pom.xml
index bf7446d..c1021f4 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -82,12 +82,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/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 2d19286..5d3b64b 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -94,10 +94,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
@@ -175,7 +177,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.analytics.hive.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<!-- jclouds dependencies -->
@@ -255,7 +257,6 @@
<artifactId>gce</artifactId>
<version>${jclouds.stratos.version}</version>
</dependency>
-
<dependency>
<groupId>com.jamesmurty.utils.wso2</groupId>
<artifactId>java-xmlbuilder</artifactId>
@@ -299,12 +300,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/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 4bca67f..a4aa3e8 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>commons-lang.wso2</groupId>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.custom.handlers/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.custom.handlers/pom.xml
b/components/org.apache.stratos.custom.handlers/pom.xml
index b12cdfe..c15fb5c 100644
--- a/components/org.apache.stratos.custom.handlers/pom.xml
+++ b/components/org.apache.stratos.custom.handlers/pom.xml
@@ -34,28 +34,28 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core.common</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core.services</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>opensaml.wso2</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.load.balancer.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml
b/components/org.apache.stratos.load.balancer.common/pom.xml
index e0680d6..3d4fc3e 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.logging.view.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/pom.xml
b/components/org.apache.stratos.logging.view.ui/pom.xml
index 909efca..5656531 100644
--- a/components/org.apache.stratos.logging.view.ui/pom.xml
+++ b/components/org.apache.stratos.logging.view.ui/pom.xml
@@ -19,7 +19,8 @@
-->
-<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";>
+<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>
@@ -38,7 +39,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
+
<extensions>true</extensions>
<configuration>
<instructions>
@@ -47,11 +48,12 @@
<Export-Package>
org.apache.stratos.logging.view.ui.*
</Export-Package>
- <Import-Package>
- org.wso2.carbon.logging.view.stub.*;
version="${carbon.platform.package.import.version.range}",
+ <Import-Package>
+ org.wso2.carbon.logging.view.stub.*;
+
version="${carbon.platform.package.import.version.range}",
*;resolution:=optional
- </Import-Package>
-
<!--Embed-Dependency>org.wso2.carbon.logging.view.stub;scope=compile|runtime;inline=true</Embed-Dependency-->
+ </Import-Package>
+
<!--Embed-Dependency>org.wso2.carbon.logging.view.stub;scope=compile|runtime;inline=true</Embed-Dependency-->
<Carbon-Component>UIBundle</Carbon-Component>
</instructions>
</configuration>
@@ -63,19 +65,17 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging.view.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.stub</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.manager.styles/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.styles/pom.xml
b/components/org.apache.stratos.manager.styles/pom.xml
index a842055..c294255 100644
--- a/components/org.apache.stratos.manager.styles/pom.xml
+++ b/components/org.apache.stratos.manager.styles/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/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 fc16c2e..0e3c08f 100644
--- a/components/org.apache.stratos.manager/pom.xml
+++ b/components/org.apache.stratos.manager/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.metadataservice/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/pom.xml
b/components/org.apache.stratos.metadataservice/pom.xml
index 281c702..18115e5 100644
--- a/components/org.apache.stratos.metadataservice/pom.xml
+++ b/components/org.apache.stratos.metadataservice/pom.xml
@@ -90,19 +90,19 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -145,14 +145,14 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.ws.client</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.register.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.register.ui/pom.xml
b/components/org.apache.stratos.register.ui/pom.xml
index 401a338..c945c11 100644
--- a/components/org.apache.stratos.register.ui/pom.xml
+++ b/components/org.apache.stratos.register.ui/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.common.ui</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml
b/components/org.apache.stratos.rest.endpoint/pom.xml
index ca110ff..f017b8c 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -89,19 +89,19 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/stratos/blob/1539df8c/components/org.apache.stratos.sso.redirector.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml
b/components/org.apache.stratos.sso.redirector.ui/pom.xml
index 5270792..962ab5c 100644
--- a/components/org.apache.stratos.sso.redirector.ui/pom.xml
+++ b/components/org.apache.stratos.sso.redirector.ui/pom.xml
@@ -17,7 +17,8 @@
# 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";>
+<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-components-parent</artifactId>
@@ -38,7 +39,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
+
<extensions>true</extensions>
<configuration>
<instructions>
@@ -64,12 +65,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
- <version>4.2.0</version>
+ <version>${wso2carbon.version}</version>
</dependency>
</dependencies>
