From b4ed5f0da599c5c40dfccff7ddf0f0aea8cf1e66 Mon Sep 17 00:00:00 2001
From: William Collishaw <williamcollishaw@hotmail.co.uk>
Date: Wed, 1 May 2019 13:36:11 -0600
Subject: [PATCH 1/3] Upgrade Maven Plugin packages

Set maven package versions to variables and defining the variables in the parent pom when the package is used in multiple modules
Upgrade maven packages
Prevent trimming stack trace to maven surefire which caused newer versions to not display stacktrace in Netbeans.

Upgrade Maven jar plugin from 3.0.2 to 3.1.1
Upgrade Maven compiler plugin version from 3.6.1 to 3.8.0
Upgrade Maven checkstyle plugin version from 2.17 to 3.0.0
Upgrade Maven javadoc plugin from 3.0.0-M1 to 3.1.0
Upgrade Maven surefire plugin from 2.18 to 2.22
Upgrade Maven plugin api from 3.0.5 to 3.6.1
Upgrade Maven plugin annotations from 3.4 to 3.6.0
Upgrade Maven plugin plugin from 3.4 to 3.6.0
Upgrade Maven git commit id plugin from 2.2.5 to 2.2.6
Upgrade Maven jarsigner plugin from 1.4 to 3.0.0
Upgrade Maven resource plugin from 3.0.2 to 3.1.0
---
 cache-client/pom.xml                     |  4 +-
 cache-updater/pom.xml                    |  7 ++--
 cache/pom.xml                            | 16 ++++----
 http-api/pom.xml                         | 16 +++++---
 http-service/pom.xml                     | 24 +++++++-----
 pom.xml                                  | 49 +++++++++++++++++-------
 protocol-api/pom.xml                     |  2 +-
 protocol/pom.xml                         |  4 +-
 runelite-api/pom.xml                     |  8 +++-
 runelite-client/pom.xml                  | 42 ++++++++++++--------
 runelite-mixins/pom.xml                  | 10 +++--
 runelite-script-assembler-plugin/pom.xml | 12 ++++--
 scripts/pom.xml                          |  6 ++-
 13 files changed, 132 insertions(+), 68 deletions(-)

diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index 1daaf23e24..9e3fb75ac9 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -50,13 +50,13 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
+			<version>${slf4j.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
index fb3edeb171..cc14496c34 100644
--- a/cache-updater/pom.xml
+++ b/cache-updater/pom.xml
@@ -36,6 +36,7 @@
 	
 	<properties>
 		<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
+		<mysql.connector.version>5.1.45</mysql.connector.version>
 	</properties>
     
 	<dependencies>
@@ -58,7 +59,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.45</version>
+			<version>${mysql.connector.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
@@ -68,12 +69,12 @@
 		<dependency>
 			<groupId>org.sql2o</groupId>
 			<artifactId>sql2o</artifactId>
-			<version>1.5.4</version>
+			<version>${sql2o.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.minio</groupId>
 			<artifactId>minio</artifactId>
-			<version>3.0.6</version>
+			<version>${minio.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/cache/pom.xml b/cache/pom.xml
index 051e0bbcfc..752cb60a72 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -36,9 +36,11 @@
 	<name>Cache</name>
 
 	<properties>
-		<cache.version>165</cache.version>
-		
+		<commons.cli.version>1.3.1</commons.cli.version>
+		<commons.compress.version>1.10</commons.compress.version>
 		<antlr4.version>4.6</antlr4.version>
+
+		<cache.version>165</cache.version>
 	</properties>
 
 	<dependencies>
@@ -59,7 +61,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.10</version>
+			<version>${commons.compress.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -68,7 +70,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-buffer</artifactId>
-			<version>4.1.0.Final</version>
+			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
@@ -78,7 +80,7 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.3.1</version>
+			<version>${commons.cli.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -89,13 +91,13 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
+			<version>${slf4j.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/http-api/pom.xml b/http-api/pom.xml
index bdebfd7020..74f8138ef3 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -35,6 +35,10 @@
 	<artifactId>http-api</artifactId>
 
 	<properties>
+		<commons.csv.version>1.4</commons.csv.version>
+
+		<maven.git.commit.id.version>2.2.6</maven.git.commit.id.version>
+
 		<git.commit.id.abbrev>nogit</git.commit.id.abbrev>
 		<git.dirty>false</git.dirty>
 	</properties>
@@ -43,7 +47,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.7.0</version>
+			<version>${okhttp3.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -61,25 +65,25 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-csv</artifactId>
-			<version>1.4</version>
+			<version>${commons.csv.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.12</version>
+			<version>${slf4j.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
-			<version>3.7.0</version>
+			<version>${okhttp3.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -95,7 +99,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.5</version>
+				<version>${maven.git.commit.id.version}</version>
 				<executions>
 					<execution>
 						<id>query-git-info</id>
diff --git a/http-service/pom.xml b/http-service/pom.xml
index c12a91fa11..373f055930 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -38,6 +38,12 @@
 	<properties>
 		<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
 		<mapstruct.version>1.2.0.Final</mapstruct.version>
+		<maria.java.client.version>2.2.3</maria.java.client.version>
+		<mongodb.driver.version>3.10.1</mongodb.driver.version>
+		<scribejava.apis.version>4.1.0</scribejava.apis.version>
+		<swagger.maven.plugin.version>3.1.8</swagger.maven.plugin.version>
+		<redis.clients.version>2.10.0</redis.clients.version>
+		<jaxb.api.version>2.3.1</jaxb.api.version>
 	</properties>
 
 	<dependencies>
@@ -85,13 +91,13 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>2.2.3</version>
+			<version>${maria.java.client.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.sql2o</groupId>
 			<artifactId>sql2o</artifactId>
-			<version>1.5.4</version>
+			<version>${sql2o.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -104,17 +110,17 @@
 		<dependency>
 			<groupId>com.github.scribejava</groupId>
 			<artifactId>scribejava-apis</artifactId>
-			<version>4.1.0</version>
+			<version>${scribejava.apis.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.minio</groupId>
 			<artifactId>minio</artifactId>
-			<version>3.0.6</version>
+			<version>${minio.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.10.0</version>
+			<version>${redis.clients.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.commons</groupId>
@@ -125,7 +131,7 @@
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongodb-driver-sync</artifactId>
-			<version>3.10.1</version>
+			<version>${mongodb.driver.version}</version>
 		</dependency>
 
 		<dependency>
@@ -136,7 +142,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
-			<version>3.7.0</version>
+			<version>${okhttp3.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -188,13 +194,13 @@
 			<plugin>
 				<groupId>com.github.kongchen</groupId>
 				<artifactId>swagger-maven-plugin</artifactId>
-				<version>3.1.8</version>
+				<version>${swagger.maven.plugin.version}</version>
 				<dependencies>
 					<!-- Java 11+ does not include this anymore -->
 					<dependency>
 						<groupId>javax.xml.bind</groupId>
 						<artifactId>jaxb-api</artifactId>
-						<version>2.3.1</version>
+						<version>${jaxb.api.version}</version>
 					</dependency>
 				</dependencies>
 				<configuration>
diff --git a/pom.xml b/pom.xml
index 0d505fccac..af359595ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,25 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<lombok.version>1.18.4</lombok.version>
+		<checkstyle.version>8.3</checkstyle.version>
+		<logback.version>1.2.3</logback.version>
+		<gson.version>2.8.5</gson.version>
+		<guava.version>23.2-jre</guava.version>
+		<junit.version>4.12</junit.version>
+		<slf4j.version>1.7.12</slf4j.version>
+		<netty.version>4.1.0.Final</netty.version>
+		<mockito.version>1.10.19</mockito.version>
+		<sql2o.version>1.5.4</sql2o.version>
+		<minio.version>3.0.6</minio.version>
+		<okhttp3.version>3.7.0</okhttp3.version>
+		<zlika.reproducible.build.maven.plugin.version>0.7</zlika.reproducible.build.maven.plugin.version>
+
+		<maven.jar.plugin.version>3.1.1</maven.jar.plugin.version>
+		<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
+		<maven.checkstyle.plugin.version>3.0.0</maven.checkstyle.plugin.version>
+		<maven.javadoc.plugin.version>3.1.0</maven.javadoc.plugin.version>
+		<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
+		<maven.surefire-plugin.version>2.22.1</maven.surefire-plugin.version>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<checkstyle.skip>true</checkstyle.skip>
@@ -131,7 +150,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>23.2-jre</version>
+				<version>${guava.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.projectlombok</groupId>
@@ -142,12 +161,12 @@
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
-				<version>2.8.5</version>
+				<version>${gson.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-parent</artifactId>
-				<version>1.2.3</version>
+				<version>${logback.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -159,7 +178,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.6.1</version>
+				<version>${maven.compiler.plugin.version}</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -168,24 +187,24 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<!-- newer versions seem to not show stacktraces in Netbeans -->
-				<version>2.18</version>
+				<version>${maven.surefire-plugin.version}</version>
 				<configuration>
 					<enableAssertions>true</enableAssertions>
 					<argLine>-Xmx512m</argLine>
+					<trimStackTrace>false</trimStackTrace>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.3</version>
+				<version>${maven.release.plugin.version}</version>
 			</plugin>
 			<!-- maven-release-plugin runs maven-javadoc-plugin as one of its
 			     release steps, so run it on goal jar to detect errors -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.0-M1</version>
+				<version>${maven.javadoc.plugin.version}</version>
 				<configuration>
 					<!-- Fix Javadoc on Java 11+ - JDK-8212233 -->
 					<source>8</source>
@@ -202,12 +221,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.17</version>
+				<version>${maven.checkstyle.plugin.version}</version>
 				<dependencies>
 					<dependency>
 						<groupId>com.puppycrawl.tools</groupId>
 						<artifactId>checkstyle</artifactId>
-						<version>8.3</version>
+						<version>${checkstyle.version}</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -222,14 +241,16 @@
 				<configuration>
 					<configLocation>checkstyle.xml</configLocation>
 					<!-- exclude generated sources from checkstyle https://stackoverflow.com/a/30406454/7189686 -->
-					<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+					<sourceDirectories>
+						<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+					</sourceDirectories>
 					<includeTestSourceDirectory>true</includeTestSourceDirectory>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>io.github.zlika</groupId>
 				<artifactId>reproducible-build-maven-plugin</artifactId>
-				<version>0.7</version>
+				<version>${zlika.reproducible.build.maven.plugin.version}</version>
 				<executions>
 					<execution>
 						<!-- Move from pre-integration-test to place before jarsigning -->
@@ -246,12 +267,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.2</version>
+					<version>${maven.jar.plugin.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.6.1</version>
+					<version>${maven.compiler.plugin.version}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml
index 09b1d2c28c..41b70cb0c9 100644
--- a/protocol-api/pom.xml
+++ b/protocol-api/pom.xml
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 8416894b5e..5938a0deef 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.0.Final</version>
+			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 00117b581e..d44e2bdaff 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -35,6 +35,10 @@
 	<artifactId>runelite-api</artifactId>
 	<name>RuneLite API</name>
 
+	<properties>
+		<jsr305.version>1.3.9</jsr305.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -48,13 +52,13 @@
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>
-			<version>1.3.9</version>
+			<version>${jsr305.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index b3d4ab64fc..8eb433fef7 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -38,6 +38,18 @@
 	<properties>
 		<guice.version>4.1.0</guice.version>
 		<jogl.version>2.3.2</jogl.version>
+		<hamcrest.version>1.3</hamcrest.version>
+		<jopt.version>5.0.1</jopt.version>
+		<commons.text.version>1.2</commons.text.version>
+		<sigpipe.jbsdiff.version>1.0</sigpipe.jbsdiff.version>
+		<java.dev.jna.version>4.5.1</java.dev.jna.version>
+		<runelite.pushingpixels.substance.version>8.0.02</runelite.pushingpixels.substance.version>
+		<runelite.pushingpixels.trident.version>1.5.00</runelite.pushingpixels.trident.version>
+		<runelite.discord.version>1.1</runelite.discord.version>
+		<runelite.orange.extensions.version>1.0</runelite.orange.extensions.version>
+		<maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
+		<maven.jarsigner.plugin.version>3.0.0</maven.jarsigner.plugin.version>
+		<maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
 
 		<jarsigner.skip>true</jarsigner.skip>
 	</properties>
@@ -54,7 +66,7 @@
 		<dependency>
 			<groupId>net.sf.jopt-simple</groupId>
 			<artifactId>jopt-simple</artifactId>
-			<version>5.0.1</version>
+			<version>${jopt.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -73,12 +85,12 @@
 		<dependency>
 			<groupId>net.runelite.pushingpixels</groupId>
 			<artifactId>substance</artifactId>
-			<version>8.0.02</version>
+			<version>${runelite.pushingpixels.substance.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite.pushingpixels</groupId>
 			<artifactId>trident</artifactId>
-			<version>1.5.00</version>
+			<version>${runelite.pushingpixels.trident.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -89,7 +101,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
-			<version>1.2</version>
+			<version>${commons.text.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
@@ -160,7 +172,7 @@
 		<dependency>
 			<groupId>io.sigpipe</groupId>
 			<artifactId>jbsdiff</artifactId>
-			<version>1.0</version>
+			<version>${sigpipe.jbsdiff.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.tukaani</groupId>
@@ -172,12 +184,12 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>4.5.1</version>
+			<version>${java.dev.jna.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna-platform</artifactId>
-			<version>4.5.1</version>
+			<version>${java.dev.jna.version}</version>
 		</dependency>
 
 		<dependency>
@@ -205,31 +217,31 @@
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>discord</artifactId>
-			<version>1.1</version>
+			<version>${runelite.discord.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>orange-extensions</artifactId>
-			<version>1.0</version>
+			<version>${runelite.orange.extensions.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
+			<version>${hamcrest.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -267,7 +279,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
+				<version>${maven.resources.plugin.version}</version>
 				<configuration>
 					<nonFilteredFileExtensions>
 						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
@@ -279,7 +291,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>${maven.shade.plugin.version}</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -355,7 +367,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jarsigner-plugin</artifactId>
-				<version>1.4</version>
+				<version>${maven.jarsigner.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>sign</id>
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
index 747256e0ed..f621363afa 100644
--- a/runelite-mixins/pom.xml
+++ b/runelite-mixins/pom.xml
@@ -35,6 +35,10 @@
 	<artifactId>mixins</artifactId>
 	<name>RuneLite Mixins</name>
 
+	<properties>
+		<javax.inject.version>1</javax.inject.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -55,20 +59,20 @@
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
-			<version>1</version>
+			<version>${javax.inject.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index 2ee5a13a39..8459e3af01 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -36,6 +36,12 @@
 	<name>Script Assembler Plugin</name>
 	<packaging>maven-plugin</packaging>
 
+	<properties>
+		<maven.plugin.api.version>3.6.1</maven.plugin.api.version>
+		<maven.plugin.annotations.version>3.6.0</maven.plugin.annotations.version>
+		<maven.plugin.plugin.version>3.6.0</maven.plugin.plugin.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>net.runelite</groupId>
@@ -51,12 +57,12 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
-			<version>3.0.5</version>
+			<version>${maven.plugin.api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.4</version>
+			<version>${maven.plugin.annotations.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -65,7 +71,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.4</version>
+				<version>${maven.plugin.plugin.version}</version>
 				<executions>
 					<execution>
 						<id>default-descriptor</id>
diff --git a/scripts/pom.xml b/scripts/pom.xml
index 7898c2e8fb..e033f3d764 100644
--- a/scripts/pom.xml
+++ b/scripts/pom.xml
@@ -31,12 +31,16 @@
 	<version>1.0.0</version>
 	<name>Scripts</name>
 
+	<properties>
+		<webdav.version>2.12</webdav.version>
+	</properties>
+
 	<build>
 		<extensions>
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-webdav-jackrabbit</artifactId>
-				<version>2.12</version>
+				<version>${webdav.version}</version>
 			</extension>
 		</extensions>
 	</build>

From a4d0333ee20e7b68f4756b7aa806bd68c8349477 Mon Sep 17 00:00:00 2001
From: William Collishaw <williamcollishaw@hotmail.co.uk>
Date: Wed, 1 May 2019 19:18:04 -0600
Subject: [PATCH 2/3] Revert maven plugin upgrades

---
 http-api/pom.xml                         |  2 +-
 pom.xml                                  | 10 +++++-----
 runelite-client/pom.xml                  |  4 ++--
 runelite-script-assembler-plugin/pom.xml |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/http-api/pom.xml b/http-api/pom.xml
index 74f8138ef3..b38668938d 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -37,7 +37,7 @@
 	<properties>
 		<commons.csv.version>1.4</commons.csv.version>
 
-		<maven.git.commit.id.version>2.2.6</maven.git.commit.id.version>
+		<maven.git.commit.id.version>2.2.5</maven.git.commit.id.version>
 
 		<git.commit.id.abbrev>nogit</git.commit.id.abbrev>
 		<git.dirty>false</git.dirty>
diff --git a/pom.xml b/pom.xml
index af359595ab..39ea729c43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,12 +52,12 @@
 		<okhttp3.version>3.7.0</okhttp3.version>
 		<zlika.reproducible.build.maven.plugin.version>0.7</zlika.reproducible.build.maven.plugin.version>
 
-		<maven.jar.plugin.version>3.1.1</maven.jar.plugin.version>
-		<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
-		<maven.checkstyle.plugin.version>3.0.0</maven.checkstyle.plugin.version>
-		<maven.javadoc.plugin.version>3.1.0</maven.javadoc.plugin.version>
+		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
+		<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+		<maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
+		<maven.javadoc.plugin.version>3.0.0-M1</maven.javadoc.plugin.version>
 		<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
-		<maven.surefire-plugin.version>2.22.1</maven.surefire-plugin.version>
+		<maven.surefire-plugin.version>2.18</maven.surefire-plugin.version>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<checkstyle.skip>true</checkstyle.skip>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index 8eb433fef7..a7e1affe21 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -47,8 +47,8 @@
 		<runelite.pushingpixels.trident.version>1.5.00</runelite.pushingpixels.trident.version>
 		<runelite.discord.version>1.1</runelite.discord.version>
 		<runelite.orange.extensions.version>1.0</runelite.orange.extensions.version>
-		<maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
-		<maven.jarsigner.plugin.version>3.0.0</maven.jarsigner.plugin.version>
+		<maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
+		<maven.jarsigner.plugin.version>1.4</maven.jarsigner.plugin.version>
 		<maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
 
 		<jarsigner.skip>true</jarsigner.skip>
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index 8459e3af01..46b631d70d 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -37,9 +37,9 @@
 	<packaging>maven-plugin</packaging>
 
 	<properties>
-		<maven.plugin.api.version>3.6.1</maven.plugin.api.version>
-		<maven.plugin.annotations.version>3.6.0</maven.plugin.annotations.version>
-		<maven.plugin.plugin.version>3.6.0</maven.plugin.plugin.version>
+		<maven.plugin.api.version>3.0.5</maven.plugin.api.version>
+		<maven.plugin.annotations.version>3.4</maven.plugin.annotations.version>
+		<maven.plugin.plugin.version>3.4</maven.plugin.plugin.version>
 	</properties>
 
 	<dependencies>

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 3/3] 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>