You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/01/02 20:16:20 UTC
[1/2] git commit: Upgrading carbon version dependency from 4.1.0 to
4.2.0 - initial step
Updated Branches:
refs/heads/carbon-4.2.0-upgrade b2fccb20a -> a3ce7d16e
Upgrading carbon version dependency from 4.1.0 to 4.2.0 - initial step
Signed-off-by: Sajith Kariyawasam <sa...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/79c9e019
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/79c9e019
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/79c9e019
Branch: refs/heads/carbon-4.2.0-upgrade
Commit: 79c9e019d5051026dfb1f22127689cbd83ca94eb
Parents: b2fccb2
Author: Melan Nimesh <me...@gmail.com>
Authored: Thu Jan 2 18:52:20 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Fri Jan 3 00:36:21 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 2 +-
components/pom.xml | 8 +--
.../src/main/resources/p2.inf | 14 +++---
.../pom.xml | 4 +-
features/manager/pom.xml | 2 +-
features/pom.xml | 6 +--
pom.xml | 6 +--
.../distribution/src/main/assembly/bin.xml | 5 +-
.../distribution/src/main/license/LICENSE | 2 +-
products/autoscaler/modules/integration/pom.xml | 2 +-
products/autoscaler/modules/p2-profile/pom.xml | 20 +++++---
products/autoscaler/pom.xml | 10 ++--
.../distribution/src/main/assembly/bin.xml | 2 +-
.../distribution/src/main/assembly/bin.xml | 9 ++--
.../distribution/src/main/license/LICENSE | 2 +-
.../cloud-controller/modules/p2-profile/pom.xml | 16 +++---
products/cloud-controller/pom.xml | 12 ++---
.../load-balancer/modules/distribution/pom.xml | 16 +++---
.../distribution/src/main/assembly/bin.xml | 8 +--
.../distribution/src/main/license/LICENSE | 2 +-
.../load-balancer/modules/p2-profile/pom.xml | 52 ++++++++++----------
products/load-balancer/pom.xml | 12 ++---
.../distribution/src/main/license/LICENSE | 2 +-
.../modules/features/service/pom.xml | 2 +-
.../stratos-controller/modules/styles/pom.xml | 2 +-
25 files changed, 114 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/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 ea396a9..c5faf9a 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -185,7 +185,7 @@
<Private-Package>org.apache.stratos.autoscaler.internal.*</Private-Package>
<Export-Package>!org.apache.stratos.autoscaler.internal.*,org.apache.stratos.autoscaler.*</Export-Package>
<Import-Package>
- org.osgi.framework.*,
+ org.osgi.framework.*;resolution:=optional,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index e2bfb60..fd7d1a8 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -73,9 +73,9 @@
<module>org.apache.stratos.validate.domain</module>
<module>org.apache.stratos.validate.domain.ui</module>
<!-- Throttling -->
- <module>org.apache.stratos.throttling.agent</module>
+ <!--module>org.apache.stratos.throttling.agent</module>
<module>org.apache.stratos.throttling.manager</module>
- <module>org.apache.stratos.throttling.ui</module>
+ <module>org.apache.stratos.throttling.ui</module-->
<!-- Redirector -->
<module>org.apache.stratos.sso.redirector.ui</module>
<module>org.apache.stratos.redirector.servlet</module>
@@ -254,11 +254,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <wso2carbon.version>4.1.0</wso2carbon.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
<junit.version>4.11</junit.version>
<synapse.core.version>2.1.1-wso2v4</synapse.core.version>
<google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
- <carbon.platform.version>4.1.0</carbon.platform.version>
+ <carbon.platform.version>4.2.0</carbon.platform.version>
<version.equinox.osgi.services>3.3.100.v20120522-1822</version.equinox.osgi.services>
<version.equinox.osgi>3.8.1.v20120830-144521</version.equinox.osgi>
<axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
index f7e4315..d2aa499 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
@@ -16,10 +16,10 @@
# under the License.
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../conf/cloud-controller.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../conf/etc/cartridge.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../conf/etc/cartridges.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../conf/etc/service.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/services.xsd,target:${installFolder}/../conf/etc/services.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../deployment/server/cartridges);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../deployment/server/services);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../../conf/cloud-controller.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../../conf/etc/cartridge.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../../conf/etc/cartridges.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../../conf/etc/service.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/services.xsd,target:${installFolder}/../../conf/etc/services.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/cartridges);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/services);\
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
index 7c01e56..2464cf5 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
@@ -73,11 +73,11 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.throttling.agent</artifactId>
</dependency>-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.throttling.agent.stub</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<!--<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.usage.agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 001b879..513dd5d 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -66,7 +66,7 @@
<properties>
<stratos.version>2.1.0</stratos.version>
<synapse.version>2.1.0-wso2v6</synapse.version>
- <carbon.version>4.1.0</carbon.version>
+ <carbon.version>4.2.0</carbon.version>
<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
<carbon.p2.plugin.version>1.5</carbon.p2.plugin.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 962559f..88d599d 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -59,9 +59,9 @@
</build>
<properties>
- <wso2carbon.version>4.1.0</wso2carbon.version>
- <carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
+ <!--carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1-->
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<synapse.wso2.version>2.1.1-wso2v4</synapse.wso2.version>
<google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
<google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d1c6607..26b5f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,9 +428,9 @@
<properties>
<!-- Carbon related versions -->
- <wso2carbon.version>4.1.0</wso2carbon.version>
- <carbon.platform.package.import.version.range>[4.1.0, 4.2.0)</carbon.platform.package.import.version.range>
- <carbon.platform.package.export.version>4.1.0</carbon.platform.package.export.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
+ <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.wso2v9</axis2.osgi.version>
<jclouds.version>1.6.2-incubating</jclouds.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
index e9b430b..da5224c 100644
--- a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
+++ b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
@@ -163,13 +163,14 @@
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <fileSet>
+ <!-- N/A for carbon 4.2.0 -->
+ <!--fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
<fileSet>
<directory>src/main/autoscale-policies</directory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/license/LICENSE b/products/autoscaler/modules/distribution/src/main/license/LICENSE
index ec01dab..f8c0026 100644
--- a/products/autoscaler/modules/distribution/src/main/license/LICENSE
+++ b/products/autoscaler/modules/distribution/src/main/license/LICENSE
@@ -247,7 +247,7 @@ org.wso2.carbon.andes.mgt.stub_4.1.0.jar, org.wso2.carbon.andes.stub_4.1.0.jar,
org.wso2.carbon.apache.jasper.fragment_4.1.0.jar, org.wso2.carbon.application.deployer_4.1.0.jar,
org.wso2.carbon.application.upload_4.1.0.jar, org.wso2.carbon.authenticator.proxy_4.1.0.jar,
org.wso2.carbon.authenticator.stub_4.1.0.jar, org.wso2.carbon.base_4.1.0.jar, org.wso2.carbon.caching_4.1.0.jar,
-org.wso2.carbon.caching.core_4.1.0.stratos.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
+org.wso2.carbon.caching.core_4.2.0.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
org.wso2.carbon.cassandra.sharedkey_4.1.0.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar, org.wso2.carbon.coordination.common_4.1.0.jar,
org.wso2.carbon.coordination.core_4.1.0.jar, org.wso2.carbon.coordination.server_4.1.0.jar, org.wso2.carbon.core_4.1.0.jar,
org.wso2.carbon.core.bootup.validator_4.1.0.jar, org.wso2.carbon.core.common_4.1.0.jar, org.wso2.carbon.core.commons.stub_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/integration/pom.xml b/products/autoscaler/modules/integration/pom.xml
index c98b056..bdef4a4 100644
--- a/products/autoscaler/modules/integration/pom.xml
+++ b/products/autoscaler/modules/integration/pom.xml
@@ -206,7 +206,7 @@
<properties>
<clarity.version>4.1.3</clarity.version>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/p2-profile/pom.xml b/products/autoscaler/modules/p2-profile/pom.xml
index 7e86429..c27ed79 100644
--- a/products/autoscaler/modules/p2-profile/pom.xml
+++ b/products/autoscaler/modules/p2-profile/pom.xml
@@ -61,7 +61,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>2-unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -79,7 +79,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
@@ -108,8 +108,11 @@
</featureArtifactDef>
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
- </featureArtifactDef>
-
+ </featureArtifactDef>
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.version}
+ </featureArtifactDef>
+
<!-- Registry -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}
@@ -131,7 +134,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
@@ -152,6 +155,11 @@
<id>org.apache.stratos.messaging.feature.group</id>
<version>${project.version}</version>
</feature>
+ <feature>
+ <id>org.wso2.carbon.core.feature.group</id>
+ <version>${carbon.version}</version>
+ </feature>
+
<!-- Registry feature -->
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
@@ -183,7 +191,7 @@
<configuration>
<tasks>
<replace token="false" value="true"
- dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+ dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/pom.xml b/products/autoscaler/pom.xml
index a8225a0..b93932e 100644
--- a/products/autoscaler/pom.xml
+++ b/products/autoscaler/pom.xml
@@ -90,11 +90,11 @@
</profiles>
<properties>
- <carbon.version>4.1.0</carbon.version>
- <carbon.patch.version>4.1.1</carbon.patch.version>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <carbon.version>4.2.0</carbon.version>
+ <carbon.patch.version>4.2.0</carbon.patch.version>
+ <!--carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
index 8eeb5b1..9d56cf0 100644
--- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
@@ -86,4 +86,4 @@
<scope>runtime</scope>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
index 089f9bc..f374341 100644
--- a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
@@ -163,13 +163,14 @@
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <fileSet>
+ <!-- N/A for carbon 4.2.0 -->
+ <!--fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
</fileSets>
<dependencySets>
@@ -352,9 +353,9 @@
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/cartridges.xsd</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
+ </file-->
</files>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/license/LICENSE b/products/cloud-controller/modules/distribution/src/main/license/LICENSE
index ec01dab..f8c0026 100644
--- a/products/cloud-controller/modules/distribution/src/main/license/LICENSE
+++ b/products/cloud-controller/modules/distribution/src/main/license/LICENSE
@@ -247,7 +247,7 @@ org.wso2.carbon.andes.mgt.stub_4.1.0.jar, org.wso2.carbon.andes.stub_4.1.0.jar,
org.wso2.carbon.apache.jasper.fragment_4.1.0.jar, org.wso2.carbon.application.deployer_4.1.0.jar,
org.wso2.carbon.application.upload_4.1.0.jar, org.wso2.carbon.authenticator.proxy_4.1.0.jar,
org.wso2.carbon.authenticator.stub_4.1.0.jar, org.wso2.carbon.base_4.1.0.jar, org.wso2.carbon.caching_4.1.0.jar,
-org.wso2.carbon.caching.core_4.1.0.stratos.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
+org.wso2.carbon.caching.core_4.2.0.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
org.wso2.carbon.cassandra.sharedkey_4.1.0.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar, org.wso2.carbon.coordination.common_4.1.0.jar,
org.wso2.carbon.coordination.core_4.1.0.jar, org.wso2.carbon.coordination.server_4.1.0.jar, org.wso2.carbon.core_4.1.0.jar,
org.wso2.carbon.core.bootup.validator_4.1.0.jar, org.wso2.carbon.core.common_4.1.0.jar, org.wso2.carbon.core.commons.stub_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/p2-profile/pom.xml b/products/cloud-controller/modules/p2-profile/pom.xml
index 4e56a7f..08dbd74 100644
--- a/products/cloud-controller/modules/p2-profile/pom.xml
+++ b/products/cloud-controller/modules/p2-profile/pom.xml
@@ -61,7 +61,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>2-unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -79,7 +79,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
@@ -124,12 +124,12 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.cloud.controller.feature:${project.version}
</featureArtifactDef>
- <featureArtifactDef>
+ <!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.tryit.feature:${carbon.version}
</featureArtifactDef>
@@ -214,7 +214,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
@@ -231,14 +231,14 @@
<id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.wso2.carbon.coordination.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.coordination.core.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature-->
<feature>
<id>org.wso2.carbon.ntask.core.feature.group</id>
<version>${carbon.version}</version>
@@ -342,7 +342,7 @@
<configuration>
<tasks>
<replace token="false" value="true"
- dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+ dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/pom.xml b/products/cloud-controller/pom.xml
index 2d0eac4..e36f3ef 100644
--- a/products/cloud-controller/pom.xml
+++ b/products/cloud-controller/pom.xml
@@ -90,15 +90,15 @@
</profiles>
<properties>
- <carbon.version>4.1.0</carbon.version>
- <carbon.patch.version>4.1.1</carbon.patch.version>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <carbon.version>4.2.0</carbon.version>
+ <carbon.patch.version>4.2.0</carbon.patch.version>
+ <!--carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>
- <synapse.version>2.1.1-wso2v4</synapse.version>
+ <synapse.version>2.1.2-wso2v3</synapse.version>
<rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
<slf4j.wso2.version>1.5.10.wso2v1</slf4j.wso2.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml
index 6a5f178..501e4d4 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -50,12 +50,12 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-commons</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-nhttp-transport</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
@@ -65,24 +65,24 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-core</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-tasks</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-extensions</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<!-- Carbon mediation initializer -->
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.initializer</artifactId>
- <version>4.1.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
- <version>4.1.1</version>
+ <version>4.2.0</version>
</dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.transport.nhttp</artifactId>
- <version>4.1.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index 5e93ce0..5b80b0c 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -78,13 +78,13 @@
</excludes>
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <fileSet>
+ <!--fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
<fileSet>
<directory>src/main/conf/synapse-configs</directory>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/synapse-configs
@@ -185,14 +185,14 @@
</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/zoo.cfg</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
</file>
<file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
+ </file-->
<file>
<source>src/main/conf/user-mgt.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/license/LICENSE b/products/load-balancer/modules/distribution/src/main/license/LICENSE
index a7fb545..0240275 100644
--- a/products/load-balancer/modules/distribution/src/main/license/LICENSE
+++ b/products/load-balancer/modules/distribution/src/main/license/LICENSE
@@ -250,7 +250,7 @@ org.jboss.netty_3.3.0.Final.jar, org.wso2.carbon.addressing_4.1.0.jar
org.wso2.carbon.apache.jasper.fragment_4.1.0.jar, org.wso2.carbon.application.deployer_4.1.0.jar
org.wso2.carbon.authenticator.proxy_4.1.0.jar, org.wso2.carbon.authenticator.stub_4.1.0.jar
org.wso2.carbon.base_4.1.0.jar, org.wso2.carbon.caching_4.1.0.jar
-org.wso2.carbon.caching.core_4.1.0.stratos.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar
+org.wso2.carbon.caching.core_4.2.0.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar
org.wso2.carbon.coordination.common_4.1.0.jar, org.wso2.carbon.coordination.core_4.1.0.jar
org.wso2.carbon.coordination.server_4.1.0.jar, org.wso2.carbon.core_4.1.0.jar,
org.wso2.carbon.core.bootup.validator_4.1.0.jar, org.wso2.carbon.core.common_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml
index 0575c73..05f6d19 100755
--- a/products/load-balancer/modules/p2-profile/pom.xml
+++ b/products/load-balancer/modules/p2-profile/pom.xml
@@ -60,7 +60,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -78,7 +78,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
@@ -111,11 +111,11 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.transport.nhttp.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.transport.nhttp.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.apache.synapse.wso2.feature:${synapse.version}
@@ -125,11 +125,11 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version}
</featureArtifactDef>
<!--featureArtifactDef>
@@ -137,7 +137,7 @@
</featureArtifactDef-->
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -149,15 +149,15 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -167,12 +167,12 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
</featureArtifactDef>
- <featureArtifactDef>
+ <!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}
</featureArtifactDef>
@@ -192,7 +192,7 @@
org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.version}
</featureArtifactDef>
<!--***********************************************-->
<featureArtifactDef>
@@ -208,7 +208,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
@@ -226,15 +226,15 @@
</feature>
<feature>
<id>org.wso2.carbon.task.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.datasource.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.initializer.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
@@ -246,36 +246,36 @@
</feature>
<feature>
<id>org.wso2.carbon.transport.nhttp.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.endpoint.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.sequences.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediators.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.relay.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.ntask.core.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.wso2.carbon.coordination.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.coordination.core.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature-->
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.version}</version>
@@ -294,7 +294,7 @@
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<!--***********************************************-->
<feature>
@@ -316,7 +316,7 @@
<configuration>
<tasks>
<replace token="false" value="true"
- dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+ dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml
index bf752e3..2dcfec9 100755
--- a/products/load-balancer/pom.xml
+++ b/products/load-balancer/pom.xml
@@ -128,16 +128,16 @@
<commons.logging.version>1.1</commons.logging.version>
<opencsv.version>1.8</opencsv.version>
<poi.version>3.0-FINAL</poi.version>
- <carbon.version>4.1.0</carbon.version>
+ <carbon.version>4.2.0</carbon.version>
<emma.version>2.1.5320</emma.version>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
- <carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
+ <!--carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
+ <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>
- <synapse.version>2.1.1-wso2v7</synapse.version>
+ <synapse.version>2.1.2-wso2v3</synapse.version>
<axis2.transport.version>1.1.0-wso2v6</axis2.transport.version>
<elb.version>2.0.5</elb.version>
<passthru.transport.version>1.0.2</passthru.transport.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/stratos-controller/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/main/license/LICENSE b/products/stratos-controller/modules/distribution/src/main/license/LICENSE
index 24d1a36..774a5a9 100644
--- a/products/stratos-controller/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos-controller/modules/distribution/src/main/license/LICENSE
@@ -323,7 +323,7 @@ org.wso2.carbon.authenticator.proxy_4.1.0.jar,
org.wso2.carbon.authenticator.stub_4.1.0.jar,
org.wso2.carbon.base_4.1.0.jar,
org.wso2.carbon.business.messaging.paypal.integration.core_4.1.0.jar,
-org.wso2.carbon.caching.core_4.1.0.stratos.jar,
+org.wso2.carbon.caching.core_4.2.0.jar,
org.wso2.carbon.captcha.mgt_4.1.0.jar,
org.wso2.carbon.cluster.mgt.core_4.1.0.jar,
org.wso2.carbon.coordination.common_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/stratos-controller/modules/features/service/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/features/service/pom.xml b/products/stratos-controller/modules/features/service/pom.xml
index 1e6398f..bebbb84 100755
--- a/products/stratos-controller/modules/features/service/pom.xml
+++ b/products/stratos-controller/modules/features/service/pom.xml
@@ -40,7 +40,7 @@
</modules>
<properties>
- <wso2carbon.version>4.1.0</wso2carbon.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
<synapse.version>${version.synapse}</synapse.version>
<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
<stratos.controller.version>1.0.0</stratos.controller.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/stratos-controller/modules/styles/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/styles/pom.xml b/products/stratos-controller/modules/styles/pom.xml
index bf888fa..745e95c 100644
--- a/products/stratos-controller/modules/styles/pom.xml
+++ b/products/stratos-controller/modules/styles/pom.xml
@@ -125,6 +125,6 @@
</dependency>
</dependencies>
<properties>
- <wso2carbon.version>4.1.0</wso2carbon.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
</properties>
</project>
[2/2] git commit: Upgrading carbon version of stratos controller pom
file to 4.2.0
Posted by sa...@apache.org.
Upgrading carbon version of stratos controller pom file to 4.2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a3ce7d16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a3ce7d16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a3ce7d16
Branch: refs/heads/carbon-4.2.0-upgrade
Commit: a3ce7d16eb18e05cb65e44d9e34d4fc0ceecf49c
Parents: 79c9e01
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Fri Jan 3 00:42:49 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Fri Jan 3 00:42:49 2014 +0530
----------------------------------------------------------------------
products/stratos-controller/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a3ce7d16/products/stratos-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/pom.xml b/products/stratos-controller/pom.xml
index 5157f03..7aaac7d 100755
--- a/products/stratos-controller/pom.xml
+++ b/products/stratos-controller/pom.xml
@@ -308,8 +308,8 @@
<properties>
<rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
<features-dashboard.war.version>1.0.0</features-dashboard.war.version>
- <carbon.version>4.1.0</carbon.version>
- <synapse.version>2.1.1.wso2v4</synapse.version>
+ <carbon.version>4.2.0</carbon.version>
+ <synapse.version>2.1.2.wso2v3</synapse.version>
<stratos.controller.version>1.0.1</stratos.controller.version>
<stratos.component.version>2.1.0</stratos.component.version>
<project.version>4.0.0-SNAPSHOT</project.version>
@@ -318,10 +318,10 @@
<servlet-api.version>2.4</servlet-api.version>
<shoppingcart.version>2.1.0</shoppingcart.version>
<shoppingcart.global.version>2.1.0</shoppingcart.global.version>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
<version.synapse>2.1.1-wso2v3</version.synapse>
<carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
- <carbon.platform.version>4.1.0</carbon.platform.version>
+ <carbon.platform.version>4.2.0</carbon.platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<opencsv.version>1.8</opencsv.version>
<poi.version>3.0-FINAL</poi.version>