* Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging.

This commit is contained in:
LevelX2 2015-02-20 13:58:13 +01:00
parent 48e08d94ce
commit 79e9312893
31 changed files with 94 additions and 92 deletions

View file

@ -30,6 +30,10 @@
<artifactId>jspf-core</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@ -100,7 +104,7 @@
<artifactId>truevfs-profile-base</artifactId>
<groupId>net.java.truevfs</groupId>
<type>jar</type>
<version>0.10.6</version>
<version>0.10.8</version>
<exclusions>
<exclusion>
<artifactId>truevfs-access-swing</artifactId>
@ -150,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>

View file

@ -443,7 +443,7 @@ public class ConnectDialog extends MageDialog {
try {
in = new BufferedReader(new InputStreamReader(serverListURL.openConnection(p).getInputStream()));
} catch (FileNotFoundException| UnknownHostException ex ) {
logger.info("Could not read serverlist from: " + serverListURL.toString());
logger.warn("Could not read serverlist from: " + serverListURL.toString());
File f = new File("serverlist.txt");
if (f.exists() && !f.isDirectory()) {
logger.info("Using buffered serverlist: serverlist.txt");
@ -465,7 +465,7 @@ public class ConnectDialog extends MageDialog {
String inputLine;
while ((inputLine = in.readLine()) != null) {
logger.info("Found server: " + inputLine);
logger.debug("Found server: " + inputLine);
servers.add(inputLine);
if (output != null) {
output.append(inputLine).append('\n');

View file

@ -28,8 +28,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>

View file

@ -39,8 +39,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>

View file

@ -42,7 +42,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.12</version>
<version>2.1.17</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@ -140,7 +140,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.7.4</version>
<version>0.12.3</version>
<configuration>
<generatePackage>mage.server.util.config</generatePackage>
<schemaDirectory>./src/main/xml-resources/jaxb/Config/</schemaDirectory>
@ -157,7 +157,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>

View file

@ -44,13 +44,13 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>1.1.1</version>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.11</version>
<version>1.8.2</version>
</dependency>
<dependency>
@ -63,38 +63,32 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>2.3.5.Final</version>
<version>2.3.7.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.10</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
<version>2.0.10</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
<version>2.2.0.GA</version>
<version>2.3.1.GA</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
<version>2.4</version>
</dependency>
<dependency>
@ -106,15 +100,14 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<version>2.5</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.2</version>
<version>2.7</version>
</dependency>
</dependencies>
<build>
@ -124,7 +117,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@ -133,7 +125,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<version>2.6</version>
<configuration>
<webXml>src\main\webapp\WEB-INF\web.xml</webXml>
<outputDirectory>.</outputDirectory>
@ -142,7 +134,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.4</version>
<version>1.7</version>
<configuration>
<sources>
<source>

View file

@ -57,32 +57,33 @@
<artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<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>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<finalName>mage-tests</finalName>
</build>

View file

@ -1,12 +1,12 @@
package org.mage.test.cards.abilities.activated;
import junit.framework.Assert;
import mage.abilities.keyword.IndestructibleAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,9 +1,7 @@
package org.mage.test.cards.abilities.enters;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,9 +1,9 @@
package org.mage.test.cards.abilities.enters;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,9 +1,9 @@
package org.mage.test.cards.abilities.enters;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -28,11 +28,11 @@
package org.mage.test.cards.abilities.keywords;
import junit.framework.Assert;
import mage.constants.CardType;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -6,11 +6,11 @@
package org.mage.test.cards.abilities.keywords;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.Filter;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -2,6 +2,7 @@ package org.mage.test.cards.abilities.keywords;
import mage.abilities.Abilities;
import mage.abilities.AbilitiesImpl;
import mage.abilities.Ability;
import mage.abilities.keyword.LifelinkAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
@ -346,7 +347,7 @@ public class SoulbondKeywordTest extends CardTestPlayerBase {
assertPowerToughness(playerA, "Nearheath Pilgrim", 2, 1);
assertPowerToughness(playerA, "Elite Vanguard", 2, 1);
Abilities abilities = new AbilitiesImpl();
Abilities<Ability> abilities = new AbilitiesImpl<>();
abilities.add(LifelinkAbility.getInstance());
assertAbilities(playerA, "Nearheath Pilgrim", abilities);
assertAbilities(playerA, "Elite Vanguard", abilities);
@ -373,7 +374,7 @@ public class SoulbondKeywordTest extends CardTestPlayerBase {
Permanent trustedForcemange = getPermanent("Trusted Forcemage", playerA.getId());
Permanent eliteVanguard = getPermanent("Elite Vanguard", playerA.getId());
Assert.assertTrue(trustedForcemange.getPairedCard() == null);
Assert.assertTrue(eliteVanguard.getPairedCard() == null);
Assert.assertEquals(trustedForcemange.getPairedCard(), null);
Assert.assertEquals(eliteVanguard.getPairedCard(),null);
}
}

View file

@ -1,11 +1,11 @@
package org.mage.test.cards.conditional;
import junit.framework.Assert;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,10 +1,10 @@
package org.mage.test.cards.conditional.twofaced;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.filter.Filter;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -27,10 +27,10 @@
*/
package org.mage.test.cards.copy;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,11 +1,10 @@
package org.mage.test.cards.copy;
import junit.framework.Assert;
import mage.constants.CardType;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -54,8 +53,8 @@ public class ProgenitorMimicTest extends CardTestPlayerBase {
}
}
Assert.assertTrue("Only one non token permanent ",nonTokens == 1);
Assert.assertTrue("Only one token permanent ",tokens == 1);
Assert.assertEquals("Only one non token permanent ",1, nonTokens);
Assert.assertEquals("Only one token permanent ",1, tokens);
}
// /**

View file

@ -1,9 +1,9 @@
package org.mage.test.cards.filters;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,8 +1,8 @@
package org.mage.test.cards.single;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -27,7 +27,7 @@ public class ArchangelsLightTest extends CardTestPlayerBase {
assertLife(playerB, 20);
assertGraveyardCount(playerA, 1);
assertGraveyardCount(playerA, "Archangel's Light", 1);
Assert.assertEquals(currentGame.getPlayer(playerA.getId()).getLibrary().size(), 77);
Assert.assertEquals(77, currentGame.getPlayer(playerA.getId()).getLibrary().size());
}

View file

@ -2,6 +2,7 @@ package org.mage.test.cards.single;
import mage.abilities.Abilities;
import mage.abilities.AbilitiesImpl;
import mage.abilities.Ability;
import mage.abilities.keyword.LifelinkAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
@ -51,7 +52,7 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase {
assertPowerToughness(playerA, "Horned Turtle", 4, 5, Filter.ComparisonScope.All);
Abilities abilities = new AbilitiesImpl();
Abilities<Ability> abilities = new AbilitiesImpl<>();
abilities.add(LifelinkAbility.getInstance());
assertAbilities(playerA, "Horned Turtle", abilities);
}
@ -95,7 +96,7 @@ public class HomicidalSeclusionTest extends CardTestPlayerBase {
assertPermanentCount(playerA, "Elite Vanguard", 0);
assertPowerToughness(playerA, "Air Elemental", 7, 5, Filter.ComparisonScope.All);
Abilities abilities = new AbilitiesImpl();
Abilities<Ability> abilities = new AbilitiesImpl<>();
abilities.add(LifelinkAbility.getInstance());
assertAbilities(playerA, "Air Elemental", abilities);
}

View file

@ -1,8 +1,8 @@
package org.mage.test.cards.targets.attacking;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -6,9 +6,9 @@
package org.mage.test.cards.triggers;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -27,9 +27,9 @@
*/
package org.mage.test.cards.triggers;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,10 +1,11 @@
package org.mage.test.combat;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -51,7 +52,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase {
assertLife(playerB, 20);
Permanent crawWurm = getPermanent("Craw Wurm", playerB.getId());
Assert.assertTrue("Should be tapped because of being blocked by Wall of Frost", crawWurm.isTapped());
Assert.assertEquals("Should be tapped because of being blocked by Wall of Frost", true, crawWurm.isTapped());
}
/**

View file

@ -1,9 +1,9 @@
package org.mage.test.combat;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -1,10 +1,11 @@
package org.mage.test.combat;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -26,8 +27,8 @@ public class DamageDistributionTest extends CardTestPlayerBase {
execute();
Permanent instigator = getPermanent("Warren Instigator", playerA.getId());
Assert.assertNotNull(instigator);
Assert.assertTrue("Computer didn't attacked with Warren Instigator", instigator.isTapped());
Assert.assertNotEquals(null, instigator);
Assert.assertEquals("Computer didn't attacked with Warren Instigator", true, instigator.isTapped());
// should block and die
assertPermanentCount(playerB, "Merfolk Looter", 0);

View file

@ -28,10 +28,10 @@
package org.mage.test.combat;
import junit.framework.Assert;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;

View file

@ -82,7 +82,7 @@ public class ManaUtilTest extends CardTestPlayerBase {
HashMap<UUID, ManaAbility> useableAbilities = getManaAbilities(card);
Assert.assertEquals(expected1, useableAbilities.size());
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities);
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap<UUID, ManaAbility>)useableAbilities);
Assert.assertEquals(expected2, useableAbilities.size());
}
@ -109,7 +109,7 @@ public class ManaUtilTest extends CardTestPlayerBase {
HashMap<UUID, ManaAbility> useableAbilities = getManaAbilities(card);
Assert.assertEquals(expected1, useableAbilities.size());
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap)useableAbilities);
useableAbilities = ManaUtil.tryToAutoPay(unpaid, (LinkedHashMap<UUID, ManaAbility>)useableAbilities);
Assert.assertEquals(1, useableAbilities.size());
ManaAbility ability = useableAbilities.values().iterator().next();
Assert.assertTrue("Wrong mana ability has been chosen", expectedChosen.isInstance(ability));

View file

@ -24,7 +24,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.178</version>
<version>1.4.185</version>
<scope>runtime</scope>
</dependency>
<dependency>

15
pom.xml
View file

@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@ -24,14 +24,14 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<version>2.7</version>
<configuration>
<encoding>UTF-8</encoding>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>2.5</version>
<configuration>
<archive>
<manifestEntries>
@ -85,13 +85,18 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.10</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>