From 3582d5cd6fc3b22b0a289874aa21fe08c4a988e2 Mon Sep 17 00:00:00 2001 From: Tim203 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 @@ org.geysermc geyser-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT ap - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT \ 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 @@ org.geysermc api-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT 4.0.0 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 @@ org.geysermc api-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT 4.0.0 @@ -26,7 +26,7 @@ org.geysermc base-api - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile 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 @@ org.geysermc geyser-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT api-parent 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 @@ org.geysermc bootstrap-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT bootstrap-bungeecord @@ -14,7 +14,7 @@ org.geysermc core - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile 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 @@ org.geysermc geyser-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT bootstrap-parent pom @@ -34,7 +34,7 @@ org.geysermc ap - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT provided 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 @@ org.geysermc bootstrap-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT bootstrap-spigot @@ -30,7 +30,7 @@ org.geysermc core - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile 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 @@ org.geysermc bootstrap-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT bootstrap-sponge @@ -14,7 +14,7 @@ org.geysermc core - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile 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 @@ org.geysermc bootstrap-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT bootstrap-standalone @@ -18,7 +18,7 @@ org.geysermc core - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile 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 @@ org.geysermc bootstrap-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT bootstrap-velocity @@ -14,7 +14,7 @@ org.geysermc core - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile 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 @@ org.geysermc geyser-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT common @@ -20,7 +20,7 @@ org.geysermc.cumulus cumulus - 1.1-SNAPSHOT + 1.1 com.google.code.gson 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 @@ org.geysermc geyser-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT core @@ -21,19 +21,19 @@ org.geysermc ap - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT provided org.geysermc geyser-api - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile org.geysermc common - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT compile diff --git a/pom.xml b/pom.xml index f0b8f21ab..f4930959d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.geysermc geyser-parent - 2.0.3-cumulus-SNAPSHOT + 2.0.3-SNAPSHOT pom Geyser Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.