From 3582d5cd6fc3b22b0a289874aa21fe08c4a988e2 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Tue, 7 Jun 2022 00:19:59 +0200
Subject: [PATCH] Changed back the Geyser version and use Cumulus 1.1

---
 Jenkinsfile                  | 1 -
 ap/pom.xml                   | 4 ++--
 api/base/pom.xml             | 2 +-
 api/geyser/pom.xml           | 4 ++--
 api/pom.xml                  | 2 +-
 bootstrap/bungeecord/pom.xml | 4 ++--
 bootstrap/pom.xml            | 4 ++--
 bootstrap/spigot/pom.xml     | 4 ++--
 bootstrap/sponge/pom.xml     | 4 ++--
 bootstrap/standalone/pom.xml | 4 ++--
 bootstrap/velocity/pom.xml   | 4 ++--
 common/pom.xml               | 4 ++--
 core/pom.xml                 | 8 ++++----
 pom.xml                      | 2 +-
 14 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f1c8be56e..ac10b06dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,6 @@ pipeline {
             when {
                 anyOf {
                     branch "master"
-                    branch "feature/cumulus-1.1" // allow Floodgate to build
                 }
             }
 
diff --git a/ap/pom.xml b/ap/pom.xml
index b60f37558..0644044a1 100644
--- a/ap/pom.xml
+++ b/ap/pom.xml
@@ -6,9 +6,9 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>ap</artifactId>
-    <version>2.0.3-cumulus-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/api/base/pom.xml b/api/base/pom.xml
index 4d4d12d90..1d051eaa3 100644
--- a/api/base/pom.xml
+++ b/api/base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>api-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/api/geyser/pom.xml b/api/geyser/pom.xml
index 9b67bea9e..2a933a2e0 100644
--- a/api/geyser/pom.xml
+++ b/api/geyser/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>api-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>base-api</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/api/pom.xml b/api/pom.xml
index 2ff8b4906..5d078fba5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>api-parent</artifactId>
diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 0c04f139e..b2c661447 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>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- Used for better working with internals without reflection -->
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 7c5ac68a1..7d6ac8f98 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>ap</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index ff100c6fa..d80408589 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>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index 96013e69a..8eba4d73d 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>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-sponge</artifactId>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index b3b32cc87..8ee94b793 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>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-standalone</artifactId>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index d81994522..36882a19e 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>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-velocity</artifactId>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>core</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/common/pom.xml b/common/pom.xml
index fc00d4031..07fdb2b12 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>common</artifactId>
 
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.geysermc.cumulus</groupId>
             <artifactId>cumulus</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index d817fab0f..6fe54f8d5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>2.0.3-cumulus-SNAPSHOT</version>
+        <version>2.0.3-SNAPSHOT</version>
     </parent>
     <artifactId>core</artifactId>
 
@@ -21,19 +21,19 @@
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>ap</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>geyser-api</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>common</artifactId>
-            <version>2.0.3-cumulus-SNAPSHOT</version>
+            <version>2.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <!-- Jackson JSON and YAML serialization -->
diff --git a/pom.xml b/pom.xml
index f0b8f21ab..f4930959d 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>2.0.3-cumulus-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geyser</name>
     <description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description>