Repository: stratos Updated Branches: refs/heads/master 50b2c9d0d -> 7d95378c1
Upgrade to GSON 2.3 project-wide, fix osgi import/exports in gce Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ee574c3c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ee574c3c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ee574c3c Branch: refs/heads/master Commit: ee574c3ca0cdb68124a5a81baf2062da579c0907 Parents: 50b2c9d Author: Akila Perera <[email protected]> Authored: Fri Aug 14 23:32:12 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Fri Aug 14 23:32:12 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.cartridge.agent/pom.xml | 2 +- components/org.apache.stratos.cli/pom.xml | 2 +- .../org.apache.stratos.cloud.controller/pom.xml | 17 +++++++++-------- .../cloud/controller/iaases/gce/GCEIaas.java | 11 ++++------- components/org.apache.stratos.manager/pom.xml | 2 +- components/org.apache.stratos.messaging/pom.xml | 2 +- .../org.apache.stratos.metadata.client/pom.xml | 2 +- .../org.apache.stratos.mock.iaas.client/pom.xml | 2 +- .../providers/google-compute-engine/pom.xml | 12 ++++-------- .../pom.xml | 4 ++-- features/pom.xml | 1 - pom.xml | 1 + 12 files changed, 26 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/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 256c6bc..c57a2f3 100644 --- a/components/org.apache.stratos.cartridge.agent/pom.xml +++ b/components/org.apache.stratos.cartridge.agent/pom.xml @@ -74,7 +74,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/components/org.apache.stratos.cli/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml index b66e7c3..46b5e66 100644 --- a/components/org.apache.stratos.cli/pom.xml +++ b/components/org.apache.stratos.cli/pom.xml @@ -100,7 +100,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/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 2d5dbf9..5695e33 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -58,12 +58,14 @@ org.apache.commons.logging; version=0.0.0, org.apache.commons.io.*, org.wso2.carbon.utils.*, - org.apache.stratos.kubernetes.client, - org.apache.stratos.kubernetes.client.exceptions, - org.jclouds.aws.ec2.*, - org.jclouds.ec2.*, - org.jclouds.compute.*, - org.jclouds.domain.*, + org.apache.stratos.kubernetes.client; version=${project.version}, + org.apache.stratos.kubernetes.client.exceptions; version=${project.version}, + org.jclouds.aws.ec2.*; version=${jclouds.version}, + org.jclouds.ec2.*; version=${jclouds.version}, + org.jclouds.compute.*; version=${jclouds.version}, + org.jclouds.domain.*; version=${jclouds.version}, + org.jclouds.googlecomputeengine.*; version=${jclouds.version}, + org.jclouds.googlecloud.*; version=${jclouds.version}, *; resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> @@ -257,7 +259,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>${gson2.version}</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>com.google.guice.wso2</groupId> @@ -316,7 +318,6 @@ </dependency> </dependencies> <properties> - <gson2.version>2.2</gson2.version> <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version> <sun.jersey.version>1.12</sun.jersey.version> </properties> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java index 141e266..ec181de 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java @@ -103,8 +103,7 @@ public class GCEIaas extends JcloudsIaas { if (location.getScope().toString().equalsIgnoreCase(CloudControllerConstants.ZONE_ELEMENT) && location.getId().equals(zone)) { templateBuilder.locationId(location.getId()); - log.info("zone has been set as " + zone - + " with id: " + location.getId()); + log.info("zone has been set as " + zone + " with id: " + location.getId()); break; } } @@ -147,11 +146,9 @@ public class GCEIaas extends JcloudsIaas { for (String propertyKey : iaasInfo.getProperties().keySet()) { if (propertyKey.startsWith(CloudControllerConstants.TAGS_AS_KEY_VALUE_PAIRS_PREFIX)) { - keyValuePairTagsMap - .put(propertyKey.substring(CloudControllerConstants.TAGS_AS_KEY_VALUE_PAIRS_PREFIX.length()), - iaasInfo.getProperties().get(propertyKey)); - template.getOptions() - .userMetadata(keyValuePairTagsMap); + keyValuePairTagsMap.put(propertyKey.substring(CloudControllerConstants.TAGS_AS_KEY_VALUE_PAIRS_PREFIX + .length()), iaasInfo.getProperties().get(propertyKey)); + template.getOptions().as(GoogleComputeEngineTemplateOptions.class).userMetadata(keyValuePairTagsMap); } log.info("usermeta data key:" + propertyKey + " value: " + iaasInfo.getProperties().get(propertyKey)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/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 6f397a3..6b79fd2 100644 --- a/components/org.apache.stratos.manager/pom.xml +++ b/components/org.apache.stratos.manager/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.1</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/components/org.apache.stratos.messaging/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml index 3c4175d..5d39ff4 100644 --- a/components/org.apache.stratos.messaging/pom.xml +++ b/components/org.apache.stratos.messaging/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/components/org.apache.stratos.metadata.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml index 831931d..241694e 100644 --- a/components/org.apache.stratos.metadata.client/pom.xml +++ b/components/org.apache.stratos.metadata.client/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>${gson.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/components/org.apache.stratos.mock.iaas.client/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml index e420088..a454d19 100644 --- a/components/org.apache.stratos.mock.iaas.client/pom.xml +++ b/components/org.apache.stratos.mock.iaas.client/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/dependencies/jclouds/providers/google-compute-engine/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/providers/google-compute-engine/pom.xml b/dependencies/jclouds/providers/google-compute-engine/pom.xml index 147633f..c6d0d73 100644 --- a/dependencies/jclouds/providers/google-compute-engine/pom.xml +++ b/dependencies/jclouds/providers/google-compute-engine/pom.xml @@ -48,11 +48,6 @@ <artifactId>oauth</artifactId> <version>${jclouds.version}</version> </dependency> - <dependency> - <groupId>com.google.auto.value</groupId> - <artifactId>auto-value</artifactId> - <version>1.1</version> - </dependency> </dependencies> <build> @@ -103,9 +98,10 @@ </Private-Package> <Import-Package> !org.jclouds.googlecomputeengine.*, - org.jclouds.compute.internal;version="${jclouds.version}", - org.jclouds.rest.internal;version="${jclouds.version}", - org.jclouds*;version="${jclouds.version}", + !org.jclouds.googlecloud.*, + !org.jclouds.oauth.v2.*, + org.jclouds.compute.*; version="${jclouds.version}", + org.jclouds.rest.*; version="${jclouds.version}", *;resolution:=optional </Import-Package> <Include-Resource> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml index 9ce4307..8489cf2 100644 --- a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml +++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.1</version> + <version>${gson.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> @@ -129,7 +129,7 @@ <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v8</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}</bundleDef> <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef> - <bundleDef>com.google.code.gson:gson:2.1</bundleDef> + <bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef> <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef> <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/features/pom.xml ---------------------------------------------------------------------- diff --git a/features/pom.xml b/features/pom.xml index 5c79c97..df5e3e0 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -62,7 +62,6 @@ <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version> <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version> <sun.jersey.version>1.12</sun.jersey.version> - <gson.version>2.3.1</gson.version> <google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version> <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version> <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version> http://git-wip-us.apache.org/repos/asf/stratos/blob/ee574c3c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 44fa2f1..835f741 100644 --- a/pom.xml +++ b/pom.xml @@ -555,5 +555,6 @@ <jclouds.version>1.9.1</jclouds.version> <kubernetes.api.version>2.2.16</kubernetes.api.version> <store.version>1.0.1</store.version> + <gson.version>2.3</gson.version> </properties> </project> \ No newline at end of file
