From f3bd5041fe6a1579c45071a55d487e270de44936 Mon Sep 17 00:00:00 2001
From: ThatGamerBlue <thatgamerblue@gmail.com>
Date: Thu, 16 May 2019 13:41:34 +0100
Subject: [PATCH] Merge upstream (#261)

* [maven-release-plugin] prepare release runelite-parent-1.5.23

* [maven-release-plugin] prepare for next development iteration

* Update archetype version
---
 cache-client/pom.xml                     | 2 +-
 cache-updater/pom.xml                    | 2 +-
 cache/pom.xml                            | 2 +-
 http-api/pom.xml                         | 2 +-
 http-service/pom.xml                     | 2 +-
 pom.xml                                  | 2 +-
 protocol-api/pom.xml                     | 2 +-
 protocol/pom.xml                         | 2 +-
 runelite-api/pom.xml                     | 2 +-
 runelite-client/pom.xml                  | 2 +-
 runelite-mixins/pom.xml                  | 2 +-
 runelite-plugin-archetype/pom.xml        | 2 +-
 runelite-script-assembler-plugin/pom.xml | 2 +-
 runescape-api/pom.xml                    | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index 691bb1d95c..279c8f05ee 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache-client</artifactId>
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
index 9c925c8cb4..acd78bee14 100644
--- a/cache-updater/pom.xml
+++ b/cache-updater/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 	
 	<name>Cache Updater</name>
diff --git a/cache/pom.xml b/cache/pom.xml
index efb80c0240..183d47e500 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache</artifactId>
diff --git a/http-api/pom.xml b/http-api/pom.xml
index ca41b36b2e..d87f850ccc 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<name>Web API</name>
diff --git a/http-service/pom.xml b/http-service/pom.xml
index 81d8de533c..b018f6a016 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<name>Web Service</name>
diff --git a/pom.xml b/pom.xml
index b661e0729e..d9c59cd7f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.5.23-SNAPSHOT</version>
+	<version>1.5.24-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml
index fae727ac70..ed9eb46e42 100644
--- a/protocol-api/pom.xml
+++ b/protocol-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol-api</artifactId>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 814c33de88..0566215d29 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol</artifactId>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 38f6ace8a7..065207af3d 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index 3af4961819..edd6e015c2 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>client</artifactId>
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
index 867d1543a3..de71a11dea 100644
--- a/runelite-mixins/pom.xml
+++ b/runelite-mixins/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mixins</artifactId>
diff --git a/runelite-plugin-archetype/pom.xml b/runelite-plugin-archetype/pom.xml
index 3a7fe3b36b..3e4dfcaae4 100644
--- a/runelite-plugin-archetype/pom.xml
+++ b/runelite-plugin-archetype/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-plugin-archetype</artifactId>
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index 5302a199d1..98e762168a 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>script-assembler-plugin</artifactId>
diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml
index cc70e2bdd1..3990dada08 100644
--- a/runescape-api/pom.xml
+++ b/runescape-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.23-SNAPSHOT</version>
+		<version>1.5.24-SNAPSHOT</version>
 	</parent>
 
 	<groupId>net.runelite.rs</groupId>