Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix scope of mixin, exclude junit provided by json-simple, correct dependency download failure logging (#2695)

This commit is contained in:
Henri Schubin 2022-10-30 12:02:29 +02:00 committed by GitHub
parent 9096ff05e5
commit 2ac2cb89c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/common/build.gradle
View File

@ -58,7 +58,10 @@ dependencies {
shadow "org.eclipse.jetty:jetty-server:$jettyVersion"
shadow "org.eclipse.jetty:jetty-alpn-java-server:$jettyVersion"
shadow "org.eclipse.jetty.http2:http2-server:$jettyVersion"
shadow 'com.googlecode.json-simple:json-simple:1.1.1' // json simple used by UUIDFetcher
shadow("com.googlecode.json-simple:json-simple:1.1.1") { // json simple used by UUIDFetcher
// json-simple has junit (a test dependency) compile scoped
exclude group: "junit", module: "junit"
}
// Swagger annotations
implementation "jakarta.ws.rs:jakarta.ws.rs-api:3.1.0"

19
Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java
View File

@ -50,10 +50,7 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
@ -132,14 +129,12 @@ public abstract class SQLDB extends AbstractDatabase {
if (downloadDriver) {
DependencyManager dependencyManager = new DependencyManager(files.getDataDirectory().resolve("libraries"));
dependencyManager.loadFromResource(getDependencyResource());
CompletableFuture<Void>[] results = dependencyManager.download(null, DRIVER_REPOSITORIES);
for (int i = 0; i < results.length; i++) {
CompletableFuture<Void> result = results[i];
Repository repository = DRIVER_REPOSITORIES.get(i);
result.exceptionally(error -> {
logger.warn("Failed to download " + getType().getName() + "-driver from " + repository.getHost() + ": " + error.getMessage() + ", " + error.getCause());
return null;
});
try {
dependencyManager.downloadAll(null, DRIVER_REPOSITORIES).get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
logger.error("Failed to download " + getType().getName() + "-driver", e);
}
IsolatedClassLoader classLoader = new IsolatedClassLoader();

2
Plan/sponge/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
shadow "org.bstats:bstats-sponge:$bstatsVersion"
annotationProcessor "org.spongepowered:spongeapi:$spongeVersion"
shadow "org.spongepowered:mixin:0.7.11-SNAPSHOT"
compileOnly "org.spongepowered:mixin:0.7.11-SNAPSHOT"
testImplementation "org.spongepowered:spongeapi:$spongeVersion"
testImplementation project(path: ":common", configuration: 'testArtifacts')