From 499d0be171ea375cc74ed81aa26349d2c3d9a9bc Mon Sep 17 00:00:00 2001
From: bundabrg <bundabrg@grieve.com.au>
Date: Wed, 30 Jun 2021 15:32:27 +0800
Subject: [PATCH] Merge upstream and update version 1.4.0-bundabrg-SNAPSHOT

* Support for 1.17
---
 bootstrap/bungeecord/pom.xml | 2 +-
 bootstrap/pom.xml            | 2 +-
 bootstrap/spigot/pom.xml     | 4 ++--
 bootstrap/sponge/pom.xml     | 2 +-
 bootstrap/standalone/pom.xml | 2 +-
 bootstrap/velocity/pom.xml   | 2 +-
 common/pom.xml               | 2 +-
 connector/pom.xml            | 2 +-
 pom.xml                      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index fbae2c04b17..a3396dc7df8 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
 
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index abf87e60e13..136e1c8fac1 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 3be3b3e0e5e..d9eaa34d510 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.4.0-ext-SNAPSHOT</version>
+            <version>${parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index f3f03972c6e..39ab7f329f9 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-sponge</artifactId>
 
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index 8b4182629fd..d62bffbbbbd 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-standalone</artifactId>
 
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index 5c0a592049c..22f5c550f0f 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-velocity</artifactId>
 
diff --git a/common/pom.xml b/common/pom.xml
index c84402b5603..197a1420e55 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>common</artifactId>
 
diff --git a/connector/pom.xml b/connector/pom.xml
index 24c446e42ff..c28b6d13b78 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.4.0-ext-SNAPSHOT</version>
+        <version>1.4.0-bundabrg-SNAPSHOT</version>
     </parent>
     <artifactId>connector</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 828d63397b2..70b80fc99df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.geysermc</groupId>
     <artifactId>geyser-parent</artifactId>
-    <version>1.4.0-ext-SNAPSHOT</version>
+    <version>1.4.0-bundabrg-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geyser</name>
     <description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description>