You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/10/17 09:06:34 UTC
[1/2] git commit: Added a dependency to com.google.code.gson in
messaging.feature
Updated Branches:
refs/heads/master 7dfc52a2d -> 1f1446bbc
Added a dependency to com.google.code.gson in messaging.feature
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/882eac85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/882eac85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/882eac85
Branch: refs/heads/master
Commit: 882eac85fc3562ec62abc0b5d6a40b38e4bc5ac2
Parents: 1d112b4
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Oct 17 12:35:49 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Oct 17 12:35:49 2013 +0530
----------------------------------------------------------------------
.../messaging/org.apache.stratos.messaging.feature/pom.xml | 6 ++++++
products/elb/modules/distribution/src/main/license/LICENSE | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/882eac85/features/messaging/org.apache.stratos.messaging.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/org.apache.stratos.messaging.feature/pom.xml b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
index 63dab5e..1860056 100644
--- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml
+++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
@@ -37,6 +37,11 @@
<description></description>
<dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson2.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -63,6 +68,7 @@
</adviceFile>
<bundles>
<bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}</bundleDef>
+ <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
<bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
<bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
</bundles>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/882eac85/products/elb/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/license/LICENSE b/products/elb/modules/distribution/src/main/license/LICENSE
index e9b70d3..231f6de 100644
--- a/products/elb/modules/distribution/src/main/license/LICENSE
+++ b/products/elb/modules/distribution/src/main/license/LICENSE
@@ -243,8 +243,7 @@ net.schmizz.sshj_0.8.0.jar, opencsv_1.8.0.wso2v1.jar
opensaml2_2.4.1.wso2v1.jar, openstack-common_1.6.1.incubating.jar
openstack-keystone_1.6.1.incubating.jar, openstack-nova_1.6.1.incubating.jar,
org.apache.felix.gogo.command_0.8.0.v201108120515.jar, org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar
-org.apache.felix.gogo.shell_0.8.0.v201110170705.jar, org.apache.jasper.glassfish_2.2.2.v201205150955.jar,
-org.apache.stratos.cartridge.messages_3.0.0.SNAPSHOT.jar, org.apache.stratos.cloud.controller_3.0.0.SNAPSHOT.jar
+org.apache.felix.gogo.shell_0.8.0.v201110170705.jar, org.apache.jasper.glassfish_2.2.2.v201205150955.jar,
org.apache.stratos.lb.cartridge.autoscaler.service.stub_3.0.0.SNAPSHOT.jar, org.apache.stratos.lb.common_3.0.0.SNAPSHOT.jar
org.apache.stratos.lb.endpoint_3.0.0.SNAPSHOT.jar, org.apache.stratos.mediator.autoscale_3.0.0.SNAPSHOT.jar
org.jboss.netty_3.3.0.Final.jar, org.wso2.carbon.addressing_4.1.0.jar
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by im...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1f1446bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1f1446bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1f1446bb
Branch: refs/heads/master
Commit: 1f1446bbceb2df241ef5bf8dc4339f7a7f5da5e5
Parents: 882eac8 7dfc52a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Oct 17 12:36:14 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Oct 17 12:36:14 2013 +0530
----------------------------------------------------------------------
.../org/apache/stratos/messaging/domain/topology/Topology.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------