github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Some minor changes to pom files.

Browse source
This commit is contained in:
LevelX2 2014-10-22 11:55:19 +02:00
parent 3b25d3685f
commit c3c0d047b1
5 changed files with 12 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java
View file

@ -1,5 +1,14 @@
package mage.client.plugins.impl; 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.MageCard;
import mage.cards.MagePermanent; import mage.cards.MagePermanent;
import mage.cards.action.ActionCallback; import mage.cards.action.ActionCallback;
@ -23,12 +32,6 @@ import org.apache.log4j.Logger;
import org.mage.plugins.card.CardPluginImpl; import org.mage.plugins.card.CardPluginImpl;
import org.mage.plugins.theme.ThemePluginImpl; 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 { public class Plugins implements MagePlugins {
@ -42,7 +45,7 @@ public class Plugins implements MagePlugins {
private CardPlugin cardPlugin = null; private CardPlugin cardPlugin = null;
private CounterPlugin counterPlugin = null; private CounterPlugin counterPlugin = null;
private static final MageActionCallback mageActionCallback = new MageActionCallback(); 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() { public static MagePlugins getInstance() {
return fINSTANCE; return fINSTANCE;

5
Mage.Plugins/Mage.Counter.Plugin/pom.xml
View file

@ -22,11 +22,6 @@
<artifactId>mage-common</artifactId> <artifactId>mage-common</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.googlecode.jspf</groupId>
<artifactId>jspf-core</artifactId>
<version>0.9.1</version>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>

5
Mage.Plugins/Mage.Theme.Plugin/pom.xml
View file

@ -21,11 +21,6 @@
<artifactId>mage-common</artifactId> <artifactId>mage-common</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.googlecode.jspf</groupId>
<artifactId>jspf-core</artifactId>
<version>0.9.1</version>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>

14
Mage.Stats/pom.xml
View file

@ -38,7 +38,6 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.10</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -68,18 +67,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </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> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
@ -146,6 +133,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration> <configuration>
<webXml>src\main\webapp\WEB-INF\web.xml</webXml> <webXml>src\main\webapp\WEB-INF\web.xml</webXml>
<outputDirectory>.</outputDirectory> <outputDirectory>.</outputDirectory>

2
pom.xml
View file

@ -85,7 +85,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.8.2</version> <version>4.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>