From ab936a6cdb2e3a720d5e6fa37eae6a0a9285804e Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 22 Jun 2018 22:23:09 -0400 Subject: [PATCH] Add logback-parent to dependency management and use a consistent slf4j version everywhere --- cache/pom.xml | 1 - http-api/pom.xml | 1 - http-service/pom.xml | 1 - model-viewer/pom.xml | 1 - pom.xml | 7 +++++++ protocol-api/pom.xml | 1 - runelite-api/pom.xml | 1 - runelite-client/pom.xml | 4 ---- runelite-mixins/pom.xml | 1 - 9 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cache/pom.xml b/cache/pom.xml index 0fe488e645..b4f1ac7721 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -55,7 +55,6 @@ org.slf4j slf4j-api - 1.7.12 org.apache.commons diff --git a/http-api/pom.xml b/http-api/pom.xml index f2fc7ff2f9..d0f50280dc 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -47,7 +47,6 @@ org.slf4j slf4j-api - 1.7.12 org.projectlombok diff --git a/http-service/pom.xml b/http-service/pom.xml index 23206165b1..9b651822cb 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -95,7 +95,6 @@ org.slf4j slf4j-api - 1.7.12 com.github.scribejava diff --git a/model-viewer/pom.xml b/model-viewer/pom.xml index 1a6f046e6e..3e3f9708d1 100644 --- a/model-viewer/pom.xml +++ b/model-viewer/pom.xml @@ -51,7 +51,6 @@ org.slf4j slf4j-api - 1.7.12 org.slf4j diff --git a/pom.xml b/pom.xml index 008ce9e49f..ba41a19da3 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,13 @@ gson 2.8.5 + + ch.qos.logback + logback-parent + 1.2.3 + pom + import + diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index 72bb783e2d..2205ca8c1e 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -44,7 +44,6 @@ org.slf4j slf4j-api - 1.7.12 com.google.guava diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 96d232eda7..8cbc9bb524 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -39,7 +39,6 @@ org.slf4j slf4j-api - 1.7.21 org.projectlombok diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index d7d4b99236..267a08ddff 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -36,8 +36,6 @@ RuneLite Client - 1.7.12 - 1.2.3 4.1.0 true @@ -47,12 +45,10 @@ org.slf4j slf4j-api - ${slf4j.version} ch.qos.logback logback-classic - ${logback.version} net.sf.jopt-simple diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 089cee5e46..5e6dc00284 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -39,7 +39,6 @@ org.slf4j slf4j-api - 1.7.21 provided