Repository: cloudstack Updated Branches: refs/heads/bugfix/4.5-8011 bf72f8714 -> 65a63907d
CLOUDSTACK-8011: Fix httpcore/client and commons-httpclient version usage - httpcore and httpclient are sharing same version variable - commons-httpclient is different that httpclient, the fix gives it a separate var Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65a63907 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65a63907 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65a63907 Branch: refs/heads/bugfix/4.5-8011 Commit: 65a63907d062b8c470a60e4e0806d7a91aaa8063 Parents: bf72f87 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Wed Dec 3 21:10:16 2014 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Wed Dec 3 21:10:16 2014 +0530 ---------------------------------------------------------------------- pom.xml | 3 ++- test/pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65a63907/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c05f024..5c9af0f 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ <cs.xapi.version>6.2.0-3.1</cs.xapi.version> <cs.httpclient.version>4.3.6</cs.httpclient.version> <cs.httpcore.version>4.3.3</cs.httpcore.version> + <cs.commons-httpclient.version>3.1</cs.commons-httpclient.version> <cs.mysql.version>5.1.34</cs.mysql.version> <cs.xstream.version>1.4.7</cs.xstream.version> <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version> @@ -329,7 +330,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${cs.httpcore.version}</version> + <version>${cs.httpclient.version}</version> </dependency> <dependency> <groupId>com.thoughtworks.xstream</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65a63907/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 158e35b..d941641 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>${cs.httpclient.version}</version> + <version>${cs.commons-httpclient.version}</version> </dependency> </dependencies> <build>
