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 sortingOptions = new HashMap(); + private final Map 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 @@ mage-common ${mage-version} - - com.googlecode.jspf - jspf-core - 0.9.1 - log4j log4j 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 @@ mage-common ${mage-version} - - com.googlecode.jspf - jspf-core - 0.9.1 - log4j log4j 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 @@ junit junit - 4.10 test @@ -68,18 +67,6 @@ provided - - net.minidev - json-smart - 1.1.1 - - - - org.aspectj - aspectjrt - 1.6.11 - - ch.qos.logback logback-classic @@ -146,6 +133,7 @@ org.apache.maven.plugins maven-war-plugin + 2.4 src\main\webapp\WEB-INF\web.xml . diff --git a/pom.xml b/pom.xml index e836ffe54a..9eac2b5432 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ junit junit - 4.8.2 + 4.11 log4j