CNF when calling metadata client
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7618c7b1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7618c7b1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7618c7b1 Branch: refs/heads/4.0.0-grouping Commit: 7618c7b172df604ebf8563b278e0ea0a6d31cd3e Parents: 1953032 Author: Udara Liyanage <[email protected]> Authored: Tue Oct 28 16:32:09 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Tue Oct 28 16:32:09 2014 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.metadata.client/pom.xml | 4 ++-- .../org.apache.stratos.metadata.client.feature/pom.xml | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7618c7b1/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 4f92ca7..11daa79 100644 --- a/components/org.apache.stratos.metadata.client/pom.xml +++ b/components/org.apache.stratos.metadata.client/pom.xml @@ -18,13 +18,12 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.3.5</version> - <scope>provided</scope> </dependency> <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>1.9</version> - <scope>provided</scope> + <!-- <scope>provided</scope>--> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -55,6 +54,7 @@ !org.apache.stratos.metadata.client, org.apache.commons.logging; version=0.0.0, org.apache.commons.configuration; version=0.0.0, + org.apache.http.conn.ssl;version=0.0.0, *;resolution:=optional </Import-Package> <DynamicImport-Package>*</DynamicImport-Package> http://git-wip-us.apache.org/repos/asf/stratos/blob/7618c7b1/features/common/org.apache.stratos.metadata.client.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/org.apache.stratos.metadata.client.feature/pom.xml b/features/common/org.apache.stratos.metadata.client.feature/pom.xml index 6a8402f..09857d0 100644 --- a/features/common/org.apache.stratos.metadata.client.feature/pom.xml +++ b/features/common/org.apache.stratos.metadata.client.feature/pom.xml @@ -50,6 +50,17 @@ <artifactId>httpclient-osgi</artifactId> <version>4.3.5</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.5</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.2</version> + </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-osgi</artifactId> @@ -88,10 +99,8 @@ <bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version}</bundleDef> <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef> <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> -<!-- <bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef> <bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef> ---> </bundles> </configuration> </execution>
