GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Changed back the Geyser version and use Cumulus 1.1

This commit is contained in:
Tim203 2022-06-07 00:19:59 +02:00
parent 5fe24ac867
commit 3582d5cd6f
No known key found for this signature in database
GPG Key ID: 064EE9F5BF7C3EE8
14 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -24,7 +24,6 @@ pipeline {
when { when {
anyOf { anyOf {
branch "master" branch "master"
branch "feature/cumulus-1.1" // allow Floodgate to build
} }
} }

4
ap/pom.xml
View File

@ -6,9 +6,9 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId> <artifactId>geyser-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>ap</artifactId> <artifactId>ap</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</project> </project>

2
api/base/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>api-parent</artifactId> <artifactId>api-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
api/geyser/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>api-parent</artifactId> <artifactId>api-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>base-api</artifactId> <artifactId>base-api</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
api/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId> <artifactId>geyser-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>api-parent</artifactId> <artifactId>api-parent</artifactId>

4
bootstrap/bungeecord/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId> <artifactId>bootstrap-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>bootstrap-bungeecord</artifactId> <artifactId>bootstrap-bungeecord</artifactId>
@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Used for better working with internals without reflection --> <!-- Used for better working with internals without reflection -->

4
bootstrap/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId> <artifactId>geyser-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>bootstrap-parent</artifactId> <artifactId>bootstrap-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>ap</artifactId> <artifactId>ap</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
bootstrap/spigot/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId> <artifactId>bootstrap-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>bootstrap-spigot</artifactId> <artifactId>bootstrap-spigot</artifactId>
@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
bootstrap/sponge/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId> <artifactId>bootstrap-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>bootstrap-sponge</artifactId> <artifactId>bootstrap-sponge</artifactId>
@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
bootstrap/standalone/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId> <artifactId>bootstrap-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>bootstrap-standalone</artifactId> <artifactId>bootstrap-standalone</artifactId>
@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
bootstrap/velocity/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>bootstrap-parent</artifactId> <artifactId>bootstrap-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>bootstrap-velocity</artifactId> <artifactId>bootstrap-velocity</artifactId>
@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
common/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId> <artifactId>geyser-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>common</artifactId> <artifactId>common</artifactId>
@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>org.geysermc.cumulus</groupId> <groupId>org.geysermc.cumulus</groupId>
<artifactId>cumulus</artifactId> <artifactId>cumulus</artifactId>
<version>1.1-SNAPSHOT</version> <version>1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>

8
core/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId> <artifactId>geyser-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>core</artifactId> <artifactId>core</artifactId>
@ -21,19 +21,19 @@
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>ap</artifactId> <artifactId>ap</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-api</artifactId> <artifactId>geyser-api</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Jackson JSON and YAML serialization --> <!-- Jackson JSON and YAML serialization -->

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>geyser-parent</artifactId> <artifactId>geyser-parent</artifactId>
<version>2.0.3-cumulus-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Geyser</name> <name>Geyser</name>
<description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description> <description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description>