From 2a0d0104bd40fb3814bf669aa0263580adfca06c Mon Sep 17 00:00:00 2001
From: adefanti <aurelien.defanti@gmail.com>
Date: Mon, 19 Nov 2012 22:59:14 +0100
Subject: [PATCH] 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 <trippie@gmail.com>
---
 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(-)

diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index bc62bd63766..2e426550afa 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>
diff --git a/client/pom.xml b/client/pom.xml
index 056e560baff..1673429f3d9 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>
diff --git a/pom.xml b/pom.xml
index 08f61f5bb21..c6058c4ea75 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>
diff --git a/server/pom.xml b/server/pom.xml
index cd4fbbe309a..e3308d85ea2 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>
diff --git a/utils/pom.xml b/utils/pom.xml
index 2e4e74f5411..6bed67f8f21 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>