From 809d61d5ea09a25b4689e96a54d0868a3ea666bc Mon Sep 17 00:00:00 2001
From: Dustin Conrad <dustinaconrad@gmail.com>
Date: Sat, 9 Aug 2014 19:38:34 -0400
Subject: [PATCH] Use dependency management to use common versions of log4j and
 junit in all the projects.

---
 Mage.Client/pom.xml                               |  2 --
 Mage.Plugins/Mage.Counter.Plugin/pom.xml          |  1 -
 Mage.Plugins/Mage.Theme.Plugin/pom.xml            |  1 -
 Mage.Server.Console/pom.xml                       |  2 +-
 Mage.Server.Plugins/Mage.Player.AI/pom.xml        |  1 -
 Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml    |  1 -
 Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml |  1 -
 Mage.Server.Plugins/Mage.Player.Human/pom.xml     |  1 -
 Mage.Server/pom.xml                               |  3 +--
 Mage.Sets/pom.xml                                 |  3 +--
 Mage.Tests/pom.xml                                |  6 ++++--
 Mage/pom.xml                                      |  1 -
 pom.xml                                           | 15 +++++++++++++++
 13 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index a41e8071082..10be76f2e85 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -33,7 +33,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
         </dependency>
         <dependency>
             <groupId>net.sf.trove4j</groupId>
@@ -73,7 +72,6 @@
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-           <version>4.11</version>
            <type>jar</type>
            <scope>test</scope>
        </dependency>
diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
index 11c503475c3..aba0b461ee3 100644
--- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
@@ -30,7 +30,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
index a2665a9140e..02202fd1673 100644
--- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
@@ -29,7 +29,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml
index d4dd0141491..157d81b8db6 100644
--- a/Mage.Server.Console/pom.xml
+++ b/Mage.Server.Console/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+           <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
index d4a89072a38..e63555e0ca8 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
             <type>jar</type>
         </dependency>
         <dependency>
diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
index 946226c9166..de2e1cfc949 100644
--- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
             <type>jar</type>
         </dependency>
         <dependency>
diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
index d6dd528b8d3..92e345663f6 100644
--- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
             <type>jar</type>
         </dependency>
         <dependency>
diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
index 6fdda585807..be6fb442903 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
@@ -28,7 +28,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml
index 71dce33e8b6..382150d9f8b 100644
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
             <type>jar</type>
         </dependency>
         <dependency>
diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml
index d490c6ad0aa..e513666c697 100644
--- a/Mage.Sets/pom.xml
+++ b/Mage.Sets/pom.xml
@@ -25,14 +25,13 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml
index 5b8b71c47f1..76df1cacda2 100644
--- a/Mage.Tests/pom.xml
+++ b/Mage.Tests/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -55,7 +55,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -67,6 +66,9 @@
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-plugin</artifactId>
               <version>2.16</version>
+                <configuration>
+                  <argLine>-XX:MaxPermSize=512m</argLine>
+                </configuration>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
diff --git a/Mage/pom.xml b/Mage/pom.xml
index d4fc31d3c5f..54fd4e53aa7 100644
--- a/Mage/pom.xml
+++ b/Mage/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
             <type>jar</type>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index b2a3b868f0c..6de9ebbb523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,4 +78,19 @@
         <mage-version>1.3.0</mage-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.8.2</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>