Prosoft Git

killbill-aplcache

pom.xml: fix MySQL dependencies Make sure modules don't …

3/27/2012 6:13:44 PM
Pierre-Alexandre Meyer

Pierre-Alexandre Meyer

Commit: 22cd315

Tree: d816b46

Parents: 93b0fbb

Changes

account/pom.xml 16(+6 -10)

analytics/pom.xml 25(+10 -15)

beatrix/pom.xml 18(+4 -14)

catalog/pom.xml 2(+1 -1)

entitlement/pom.xml 25(+10 -15)

invoice/pom.xml 24(+10 -14)

payment/pom.xml 18(+9 -9)

pom.xml 7(+7 -0)

util/pom.xml 1(+1 -0)

Details

account/pom.xml 16(+6 -10) 

diff --git a/account/pom.xml b/account/pom.xml
index 28c7a7a..389bfb4 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -29,10 +29,6 @@
             <artifactId>jdbi-metrics</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
             <scope>provided</scope>
@@ -77,18 +73,18 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management-dbfiles</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

analytics/pom.xml 25(+10 -15) 

diff --git a/analytics/pom.xml b/analytics/pom.xml
index 8a655ca..d5fff4c 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -31,16 +31,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management-dbfiles</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-api</artifactId>
         </dependency>
@@ -54,11 +44,6 @@
             <artifactId>joda-time</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>stringtemplate</artifactId>
             <scope>runtime</scope>
@@ -108,6 +93,16 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
     </build>

beatrix/pom.xml 18(+4 -14) 

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index a3098bc..31ed0b0 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -83,11 +83,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management</artifactId>
-            <version>5.0.11</version>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
@@ -99,19 +94,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management-dbfiles</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <build>

catalog/pom.xml 2(+1 -1) 

diff --git a/catalog/pom.xml b/catalog/pom.xml
index bf0d550..dee138d 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-api</artifactId>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>com.ning.billing</groupId>
             <artifactId>killbill-util</artifactId>

entitlement/pom.xml 25(+10 -15) 

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 5347c18..a4fafd6 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -72,16 +72,6 @@
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management-dbfiles</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- Same here, this is really debatable whether or not we should keep that here -->
         <dependency>
             <groupId>com.ning.billing</groupId>
@@ -91,11 +81,6 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
@@ -133,6 +118,16 @@
             <artifactId>stringtemplate</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

invoice/pom.xml 24(+10 -14) 

diff --git a/invoice/pom.xml b/invoice/pom.xml
index c2a89a2..81633e1 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -59,16 +59,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>management-dbfiles</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
@@ -83,10 +73,6 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
             <scope>provided</scope>
@@ -96,6 +82,16 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
     </build>

payment/pom.xml 18(+9 -9) 

diff --git a/payment/pom.xml b/payment/pom.xml
index 398a6cc..fc660f7 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -102,14 +102,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-             <groupId>com.mysql</groupId>
-             <artifactId>management</artifactId>
-             <scope>test</scope>
-         </dependency>
-         <dependency>
-             <groupId>com.mysql</groupId>
-             <artifactId>management-dbfiles</artifactId>
-             <scope>test</scope>
-         </dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

pom.xml 7(+7 -0) 

diff --git a/pom.xml b/pom.xml
index fc503d7..55b2b9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
                 <artifactId>killbill-api</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
@@ -70,6 +71,7 @@
                 <artifactId>killbill-account</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
@@ -81,6 +83,7 @@
                 <artifactId>killbill-entitlement</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
@@ -92,6 +95,7 @@
                 <artifactId>killbill-payment</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
@@ -103,6 +107,7 @@
                 <artifactId>killbill-catalog</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
@@ -114,6 +119,7 @@
                 <artifactId>killbill-invoice</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.ning.billing</groupId>
@@ -125,6 +131,7 @@
                 <artifactId>killbill-util</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>

util/pom.xml 1(+1 -0) 

diff --git a/util/pom.xml b/util/pom.xml
index 32fbbde..dcac619 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -36,6 +36,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github