From ffdea9835e11ca78808a4e2d6bb8ac9c0e49188a Mon Sep 17 00:00:00 2001
From: William Collishaw <williamcollishaw@hotmail.co.uk>
Date: Wed, 1 May 2019 20:03:00 -0600
Subject: [PATCH] Put all dependency versions shared over multiple modules into
 dependency management in the parent pom

---
 cache-client/pom.xml    |  4 ----
 cache-updater/pom.xml   |  2 --
 cache/pom.xml           |  5 -----
 http-api/pom.xml        |  7 ------
 http-service/pom.xml    |  4 ----
 pom.xml                 | 49 +++++++++++++++++++++++++++++++++++++++++
 protocol-api/pom.xml    |  2 --
 protocol/pom.xml        |  3 ---
 runelite-api/pom.xml    |  2 --
 runelite-client/pom.xml | 12 ++++------
 runelite-mixins/pom.xml |  4 ----
 11 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index 9e3fb75ac9..8eeeb22e42 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -50,14 +50,10 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>${slf4j.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
index cc14496c34..8db3386854 100644
--- a/cache-updater/pom.xml
+++ b/cache-updater/pom.xml
@@ -69,12 +69,10 @@
 		<dependency>
 			<groupId>org.sql2o</groupId>
 			<artifactId>sql2o</artifactId>
-			<version>${sql2o.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.minio</groupId>
 			<artifactId>minio</artifactId>
-			<version>${minio.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/cache/pom.xml b/cache/pom.xml
index 752cb60a72..744b71d189 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -70,7 +70,6 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-buffer</artifactId>
-			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
@@ -91,14 +90,10 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>${slf4j.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite.rs</groupId>
diff --git a/http-api/pom.xml b/http-api/pom.xml
index b38668938d..fb3436b14f 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -47,7 +47,6 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>${okhttp3.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -71,20 +70,14 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>${slf4j.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
-			<version>${okhttp3.version}</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/http-service/pom.xml b/http-service/pom.xml
index 373f055930..100ad462d9 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -97,7 +97,6 @@
 		<dependency>
 			<groupId>org.sql2o</groupId>
 			<artifactId>sql2o</artifactId>
-			<version>${sql2o.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -115,7 +114,6 @@
 		<dependency>
 			<groupId>io.minio</groupId>
 			<artifactId>minio</artifactId>
-			<version>${minio.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>redis.clients</groupId>
@@ -142,8 +140,6 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
-			<version>${okhttp3.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/pom.xml b/pom.xml
index 39ea729c43..502d2d0969 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,55 @@
 				<artifactId>gson</artifactId>
 				<version>${gson.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.sql2o</groupId>
+				<artifactId>sql2o</artifactId>
+				<version>${sql2o.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-buffer</artifactId>
+				<version>${netty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.minio</groupId>
+				<artifactId>minio</artifactId>
+				<version>${minio.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>${netty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp3.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>mockwebserver</artifactId>
+				<version>${okhttp3.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-simple</artifactId>
+				<version>${slf4j.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-all</artifactId>
+				<version>${mockito.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-parent</artifactId>
diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml
index 41b70cb0c9..bfcf3eec64 100644
--- a/protocol-api/pom.xml
+++ b/protocol-api/pom.xml
@@ -58,8 +58,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 5938a0deef..1a1a7bdb20 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -54,7 +54,6 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -65,8 +64,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index d44e2bdaff..bc54eee19f 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -58,8 +58,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index a7e1affe21..db67503ccb 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -229,8 +229,10 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
@@ -238,12 +240,6 @@
 			<version>${hamcrest.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.google.inject.extensions</groupId>
 			<artifactId>guice-testlib</artifactId>
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
index f621363afa..6af3cf206e 100644
--- a/runelite-mixins/pom.xml
+++ b/runelite-mixins/pom.xml
@@ -66,14 +66,10 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>