From 46bb6f81bb3b2cd681726e3b0a3bf4048e7b5957 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sat, 18 Dec 2021 14:19:43 -0500
Subject: [PATCH] Update logback to 1.2.9

logback-parent isn't really a bom but instead includes other unrelated
depenedncies like mockito and jodatime, and so I am just adding the
individual logback and slf4j dependencies themselves. Also add
slf4j-simple in dependencyManagement for the various test dependencies
we have on it.
---
 cache-client/pom.xml |  1 -
 cache/pom.xml        |  1 -
 http-api/pom.xml     |  1 -
 http-service/pom.xml |  8 +++-----
 pom.xml              | 23 +++++++++++++++++++----
 runelite-api/pom.xml |  1 -
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index 5f616c30f5..c3a97e17de 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -62,7 +62,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/cache/pom.xml b/cache/pom.xml
index 5aac96d0c6..8ed326415b 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -95,7 +95,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/http-api/pom.xml b/http-api/pom.xml
index 24ffa1bfdd..49bb4a43f0 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -68,7 +68,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/http-service/pom.xml b/http-service/pom.xml
index 671c95d597..15f6992c83 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -23,8 +23,10 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
@@ -91,10 +93,6 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.github.scribejava</groupId>
 			<artifactId>scribejava-apis</artifactId>
diff --git a/pom.xml b/pom.xml
index 3f5542e96d..a58e181871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,8 @@
 		<project.build.outputTimestamp>1</project.build.outputTimestamp>
 		<java.release>8</java.release>
 		<lombok.version>1.18.20</lombok.version>
+		<logback.version>1.2.9</logback.version>
+		<slf4j.version>1.7.25</slf4j.version>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<checkstyle.skip>true</checkstyle.skip>
@@ -161,10 +163,23 @@
 			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-parent</artifactId>
-				<version>1.2.3</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<artifactId>logback-classic</artifactId>
+				<version>${logback.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-core</artifactId>
+				<version>${logback.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-simple</artifactId>
+				<version>${slf4j.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.inject</groupId>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 62813947a2..219f88d40d 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -60,7 +60,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>