From c3c0d047b1e6defbd03b49c00736e34900eacea8 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 22 Oct 2014 11:55:19 +0200
Subject: [PATCH] * Some minor changes to pom files.

---
 .../java/mage/client/plugins/impl/Plugins.java  | 17 ++++++++++-------
 Mage.Plugins/Mage.Counter.Plugin/pom.xml        |  5 -----
 Mage.Plugins/Mage.Theme.Plugin/pom.xml          |  5 -----
 Mage.Stats/pom.xml                              | 14 +-------------
 pom.xml                                         |  2 +-
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
index b5dae38928..733a87391c 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
@@ -1,5 +1,14 @@
 package mage.client.plugins.impl;
 
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import javax.swing.JComponent;
 import mage.cards.MageCard;
 import mage.cards.MagePermanent;
 import mage.cards.action.ActionCallback;
@@ -23,12 +32,6 @@ import org.apache.log4j.Logger;
 import org.mage.plugins.card.CardPluginImpl;
 import org.mage.plugins.theme.ThemePluginImpl;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.*;
-
 
 public class Plugins implements MagePlugins {
 
@@ -42,7 +45,7 @@ public class Plugins implements MagePlugins {
     private CardPlugin cardPlugin = null;
     private CounterPlugin counterPlugin = null;
     private static final MageActionCallback mageActionCallback = new MageActionCallback();
-    private Map<String, String> sortingOptions = new HashMap<String, String>();
+    private final Map<String, String> sortingOptions = new HashMap<>();
 
     public static MagePlugins getInstance() {
         return fINSTANCE;
diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
index aba0b461ee..e84b2d868b 100644
--- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
@@ -22,11 +22,6 @@
             <artifactId>mage-common</artifactId>
             <version>${mage-version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.jspf</groupId>
-            <artifactId>jspf-core</artifactId>
-            <version>0.9.1</version>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
index 02202fd167..5acf5f7a22 100644
--- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
@@ -21,11 +21,6 @@
             <artifactId>mage-common</artifactId>
             <version>${mage-version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.jspf</groupId>
-            <artifactId>jspf-core</artifactId>
-            <version>0.9.1</version>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/Mage.Stats/pom.xml b/Mage.Stats/pom.xml
index 844fb543e2..6c3adbafef 100644
--- a/Mage.Stats/pom.xml
+++ b/Mage.Stats/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
             <scope>test</scope>
         </dependency>
 
@@ -68,18 +67,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>net.minidev</groupId>
-            <artifactId>json-smart</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.6.11</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -146,6 +133,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                 <version>2.4</version>
                 <configuration>
                     <webXml>src\main\webapp\WEB-INF\web.xml</webXml>
                     <outputDirectory>.</outputDirectory>
diff --git a/pom.xml b/pom.xml
index e836ffe54a..9eac2b5432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.2</version>
+                <version>4.11</version>
             </dependency>
             <dependency>
                 <groupId>log4j</groupId>