Update pom.xml

This commit is contained in:
Fuzzlemann 2017-08-28 17:34:53 +02:00
parent f2a534417d
commit 9325fa69fd
8 changed files with 63 additions and 11 deletions

View File

@ -59,6 +59,7 @@
</execution>
</executions>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<excludes>
<exclude>org.powermock:*</exclude>
@ -68,7 +69,8 @@
<exclude>xpp3:*</exclude>
<exclude>org.objenesis:*</exclude>
<exclude>cglib:*</exclude>
<exclude>org.*:*</exclude>
<exclude>org.bukkit:*</exclude>
<exclude>org.mockito:*</exclude>
<exclude>org.easymock:*</exclude>
<exclude>junit:*</exclude>
</excludes>
@ -118,6 +120,10 @@
<id>plan-snapshot-repo</id>
<url>http://repo.fuzzlemann.de/artifactory/libs-snapshot/</url>
</repository>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<dependencies>
<dependency>
@ -126,6 +132,34 @@
<version>1.12-R0.1-20170725.202533-1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.12-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-config</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-event</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>bungeecord-protocol</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock</artifactId>

View File

@ -36,6 +36,12 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.6</version>
<scope>compile</scope>
</dependency>
<!-- Framework for easier plugin development-->
<dependency>
<groupId>com.djrapitops</groupId>
@ -48,16 +54,19 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.4.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency>
<!-- SoftDepended Plugins-->
<dependency>
@ -180,6 +189,7 @@
</execution>
</executions>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<excludes>
<exclude>org.powermock:*</exclude>
@ -189,7 +199,8 @@
<exclude>xpp3:*</exclude>
<exclude>org.objenesis:*</exclude>
<exclude>cglib:*</exclude>
<exclude>org.*:*</exclude>
<exclude>org.bukkit:*</exclude>
<exclude>org.mockito:*</exclude>
<exclude>org.easymock:*</exclude>
<exclude>junit:*</exclude>
</excludes>

View File

@ -24,8 +24,16 @@ public class ImporterManager {
}
public static void registerImporter(Importer importer) {
if (importer == null) {
throw new NullPointerException("Importer cannot be null");
}
String firstName = importer.getNames().get(0);
if (firstName == null) {
throw new IllegalArgumentException("No Importer name given");
}
if (getImporter(firstName) != null) {
removeImporter(firstName);
}

View File

@ -10,6 +10,7 @@ import java.util.*;
/**
* @author Fuzzlemann
* @since 4.0.0
*/
public class ServerImportData {

View File

@ -27,7 +27,7 @@ public class UserImportRefiner {
private final Plan plugin;
private final boolean onlineMode;
private final Vector<UserImportData> importers = new Vector<>();
private final List<UserImportData> importers = new Vector<>();
private final Map<String, Boolean> worlds = new Hashtable<>();
@ -92,7 +92,7 @@ public class UserImportRefiner {
Benchmark.start(benchmarkName);
Vector<UserImportData> invalidData = new Vector<>();
List<UserImportData> invalidData = new Vector<>();
importers.parallelStream().forEach(importer -> {
String name = importer.getName();
@ -173,7 +173,7 @@ public class UserImportRefiner {
}
private void addFoundUUIDs(Map<String, String> foundUUIDs) {
Vector<UserImportData> found = new Vector<>();
List<UserImportData> found = new Vector<>();
uuidsMissing.entrySet().parallelStream().forEach((entry) -> {
UserImportData importer = entry.getKey();
@ -226,7 +226,7 @@ public class UserImportRefiner {
}
private void addFoundNames(Map<String, String> foundNames) {
Vector<UserImportData> found = new Vector<>();
List<UserImportData> found = new Vector<>();
namesMissing.entrySet().parallelStream().forEach(entry -> {
UserImportData importer = entry.getKey();

View File

@ -30,7 +30,7 @@ public class OfflinePlayerImporter extends Importer {
@Override
public List<UserImportData> getUserImportData() {
Vector<UserImportData> dataList = new Vector<>();
List<UserImportData> dataList = new Vector<>();
Arrays.stream(Bukkit.getOfflinePlayers()).parallel().forEach(player -> {
UserImportData.UserImportDataBuilder builder = UserImportData.builder();

View File

@ -4,7 +4,7 @@ import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.Settings;
import main.java.com.djrapitops.plan.systems.webserver.WebServer;
import main.java.com.djrapitops.plan.utilities.file.FileUtil;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.commons.lang3.text.StrSubstitutor;
import java.io.FileNotFoundException;
import java.io.Serializable;

View File

@ -55,15 +55,13 @@ public class GraphTest {
@Test
public void testSeriesCreator() {
String result = SeriesCreator.seriesGraph(points, false, false);
String result = SeriesCreator.seriesGraph(points, false, false).replaceAll("[\\[\\]]", "");
String[] splittedResult = result.split(",");
Map<String, String> expected = new LinkedHashMap<>();
String key = null;
for (String resultString : splittedResult) {
resultString = resultString.replaceAll("[\\[\\]]", "");
if (key == null) {
key = resultString;
} else {