Updated Branches: refs/heads/master ecbd0e91a -> 2a0d0104b
maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only Signed-off-by: Hugo Trippaers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2a0d0104 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2a0d0104 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2a0d0104 Branch: refs/heads/master Commit: 2a0d0104bd40fb3814bf669aa0263580adfca06c Parents: ecbd0e9 Author: adefanti <[email protected]> Authored: Mon Nov 19 22:59:14 2012 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Nov 20 09:27:07 2012 +0100 ---------------------------------------------------------------------- awsapi/pom.xml | 1 - client/pom.xml | 1 - pom.xml | 12 +++++++++++- server/pom.xml | 1 - utils/pom.xml | 1 - 5 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2a0d0104/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index bc62bd6..2e42655 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -240,7 +240,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.21</version> <scope>runtime</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2a0d0104/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 056e560..1673429 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -104,7 +104,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.21</version> <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2a0d0104/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 08f61f5..c6058c4 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version> <cs.httpclient.version>3.1</cs.httpclient.version> <cs.httpcore.version>4.0</cs.httpcore.version> - <cs.mysql.version>5.1.12</cs.mysql.version> + <cs.mysql.version>5.1.21</cs.mysql.version> <cs.xstream.version>1.3.1</cs.xstream.version> <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version> <cs.mail.version>1.4</cs.mail.version> @@ -161,6 +161,16 @@ <module>test</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${cs.mysql.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2a0d0104/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index cd4fbbe..e3308d8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -45,7 +45,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2a0d0104/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 2e4e74f..6bed67f 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -127,7 +127,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.21</version> <scope>test</scope> </dependency> </dependencies>
