Merge upstream and update version 1.4.0-bundabrg-SNAPSHOT

* Support for 1.17
bundabrg · Jun 30, 2021 · 499d0be · 499d0be
1 parent 34fc9ce
commit 499d0be
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>