mirror of
https://github.com/correl/mage.git
synced 2024-11-28 19:19:55 +00:00
Updated POM to use Java 8. Updated some tool versions in the POMs.
This commit is contained in:
parent
ca39289a3a
commit
3516dc75e4
3 changed files with 19 additions and 29 deletions
|
@ -13,8 +13,6 @@ import static org.junit.Assert.assertTrue;
|
|||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mage.test.serverside.base.MageTestBase;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -84,21 +82,14 @@ public class BoosterGenerationTest extends MageTestBase {
|
|||
}
|
||||
|
||||
private static boolean contains(List<Card> cards, List<String> names, String code) {
|
||||
for (String name : names) {
|
||||
if (contains(cards, name, code)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return names.stream().anyMatch((name) -> (contains(cards, name, code)));
|
||||
}
|
||||
|
||||
private static boolean contains(List<Card> cards, String name, String code) {
|
||||
for (Card card : cards) {
|
||||
if (card.getName().equals(name) && (code == null || card.getExpansionSetCode().equals(code))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return cards.stream().anyMatch((card)
|
||||
-> (card.getName().equals(name)
|
||||
&& (code == null || card.getExpansionSetCode().equals(code)))
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
|
@ -145,7 +144,7 @@
|
|||
|
||||
<finalName>mage</finalName>
|
||||
|
||||
<!-- The extension below is added added by following http://vlkan.com/blog/post/2015/11/27/maven-protobuf/ -->
|
||||
<!-- The extension below is added by following http://vlkan.com/blog/post/2015/11/27/maven-protobuf/ -->
|
||||
<extensions>
|
||||
<!-- provides os.detected.classifier (i.e. linux-x86_64, osx-x86_64) property -->
|
||||
<extension>
|
||||
|
|
26
pom.xml
26
pom.xml
|
@ -15,10 +15,10 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.2</version>
|
||||
<version>3.5.1</version>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
<!--
|
||||
Because of known error in maven-compiler-plugin 3.2 useIncrementalCompilation is inverted
|
||||
|
@ -26,26 +26,26 @@
|
|||
https://jira.codehaus.org/browse/MCOMPILER-209
|
||||
-->
|
||||
<useIncrementalCompilation>false</useIncrementalCompilation>
|
||||
<!-- <compilerArgument>-Xlint:all</compilerArgument> -->
|
||||
<!-- <compilerArgument>-Xlint:all</compilerArgument> -->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>2.7</version>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.5</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifestEntries>
|
||||
<Built-By>MageTeam</Built-By>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifestEntries>
|
||||
<Built-By>MageTeam</Built-By>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
@ -102,7 +102,7 @@
|
|||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.7.10</version>
|
||||
<version>1.7.19</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
|
Loading…
Reference in a new issue