From ac00ab0087ca8f59184121697f7ac4343a694093 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 21 Feb 2014 14:54:38 +0100
Subject: [PATCH] Cleanup all mysql dependencies and set all to provided.

---
 awsapi/pom.xml                          | 5 -----
 client/pom.xml                          | 5 -----
 developer/pom.xml                       | 6 ------
 engine/storage/integration-test/pom.xml | 5 -----
 framework/db/pom.xml                    | 2 +-
 tools/devcloud-kvm/pom.xml              | 2 +-
 tools/devcloud/pom.xml                  | 2 +-
 usage/pom.xml                           | 5 -----
 8 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 4a6c89c9e5f..601e6959a5a 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -272,11 +272,6 @@
       <artifactId>bcprov-jdk16</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr-runtime</artifactId>
diff --git a/client/pom.xml b/client/pom.xml
index 03a141d810a..4eb421d39b8 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -221,11 +221,6 @@
       <artifactId>cloud-mom-inmemory</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-framework-ipc</artifactId>
diff --git a/developer/pom.xml b/developer/pom.xml
index 3b3ed19a6cf..4a1733ae58c 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -21,12 +21,6 @@
     <version>4.4.0-SNAPSHOT</version>
   </parent>
   <dependencies>
-    <!-- specify the dependent jdbc driver here -->
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-	  <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index 7bb27e060e4..7b40f82b7d4 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -121,11 +121,6 @@
       <artifactId>httpclient</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index a0edf20abfe..e9fefd2f407 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml
index 9b4662187d3..73fde8c59c8 100644
--- a/tools/devcloud-kvm/pom.xml
+++ b/tools/devcloud-kvm/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml
index 228b8401059..c8bca883f41 100644
--- a/tools/devcloud/pom.xml
+++ b/tools/devcloud/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
diff --git a/usage/pom.xml b/usage/pom.xml
index 70575d40065..c02ffe611e5 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -35,11 +35,6 @@
       <artifactId>cloud-engine-schema</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>