mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-06 10:45:37 +01:00
16e6a12982
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes:a619858
Updated Upstream (BungeeCord) (#549)6f55959
Apply SpigotMC/BungeeCord#2908 (#546)
656 lines
24 KiB
Diff
656 lines
24 KiB
Diff
From f830225f2c26d8807de43f16843b5132f5c48c30 Mon Sep 17 00:00:00 2001
|
|
From: Troy Frew <fuzzy_bot@arenaga.me>
|
|
Date: Tue, 15 Nov 2016 08:56:43 -0500
|
|
Subject: [PATCH] POM Changes
|
|
|
|
|
|
diff --git a/api/pom.xml b/api/pom.xml
|
|
index 87b279b8..d3016c10 100644
|
|
--- a/api/pom.xml
|
|
+++ b/api/pom.xml
|
|
@@ -5,41 +5,41 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-api</artifactId>
|
|
+ <artifactId>travertine-api</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-API</name>
|
|
+ <name>Travertine-API</name>
|
|
<description>API implemented by the Elastic Portal Suite</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-chat</artifactId>
|
|
+ <artifactId>travertine-chat</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-config</artifactId>
|
|
+ <artifactId>travertine-config</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-event</artifactId>
|
|
+ <artifactId>travertine-event</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-protocol</artifactId>
|
|
+ <artifactId>travertine-protocol</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
|
|
index a43db907..078c5b1a 100644
|
|
--- a/bootstrap/pom.xml
|
|
+++ b/bootstrap/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-bootstrap</artifactId>
|
|
+ <artifactId>travertine-bootstrap</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Bootstrap</name>
|
|
- <description>Java 1.6 loader for Waterfall</description>
|
|
+ <name>Travertine-Bootstrap</name>
|
|
+ <description>Java 1.6 loader for Travertine</description>
|
|
|
|
<properties>
|
|
<maven.deploy.skip>true</maven.deploy.skip>
|
|
@@ -30,14 +30,14 @@
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-proxy</artifactId>
|
|
+ <artifactId>travertine-proxy</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
- <finalName>Waterfall</finalName>
|
|
+ <finalName>Travertine</finalName>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
diff --git a/chat/pom.xml b/chat/pom.xml
|
|
index 8523d99a..29094871 100644
|
|
--- a/chat/pom.xml
|
|
+++ b/chat/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-chat</artifactId>
|
|
+ <artifactId>travertine-chat</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Chat</name>
|
|
- <description>Minecraft JSON chat API intended for use with Waterfall</description>
|
|
+ <name>Travertine-Chat</name>
|
|
+ <description>Minecraft JSON chat API intended for use with Travertine</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
diff --git a/config/pom.xml b/config/pom.xml
|
|
index 5f4f2b33..18f0a14e 100644
|
|
--- a/config/pom.xml
|
|
+++ b/config/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-config</artifactId>
|
|
+ <artifactId>travertine-config</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Config</name>
|
|
- <description>Generic java configuration API intended for use with Waterfall</description>
|
|
+ <name>Travertine-Config</name>
|
|
+ <description>Generic java configuration API intended for use with Travertine</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
diff --git a/event/pom.xml b/event/pom.xml
|
|
index f4f7fdb0..592bef24 100644
|
|
--- a/event/pom.xml
|
|
+++ b/event/pom.xml
|
|
@@ -5,16 +5,16 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-event</artifactId>
|
|
+ <artifactId>travertine-event</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Event</name>
|
|
- <description>Generic java event dispatching API intended for use with Waterfall.</description>
|
|
+ <name>Travertine-Event</name>
|
|
+ <description>Generic java event dispatching API intended for use with Travertine.</description>
|
|
</project>
|
|
diff --git a/log/pom.xml b/log/pom.xml
|
|
index 93bd4bcc..3ef8acf2 100644
|
|
--- a/log/pom.xml
|
|
+++ b/log/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-log</artifactId>
|
|
+ <artifactId>travertine-log</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Log</name>
|
|
- <description>Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
|
|
+ <name>Travertine-Log</name>
|
|
+ <description>Simplistic and performant java.util.Logger based logger and console API designed for use with Travertine and Minecraft related applications.</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
@@ -27,7 +27,7 @@
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-chat</artifactId>
|
|
+ <artifactId>travertine-chat</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
diff --git a/log4j/pom.xml b/log4j/pom.xml
|
|
index 1cd12d6a..ca18158f 100644
|
|
--- a/log4j/pom.xml
|
|
+++ b/log4j/pom.xml
|
|
@@ -4,18 +4,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-log4j</artifactId>
|
|
+ <artifactId>travertine-log4j</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Log</name>
|
|
- <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
|
|
+ <name>Travertine-Log</name>
|
|
+ <description>Simplistic and performant Log4j2 based logger and console API designed for use with Travertine and Minecraft related applications.</description>
|
|
|
|
<properties>
|
|
<log4j2.version>2.12.0</log4j2.version>
|
|
@@ -50,5 +50,24 @@
|
|
<version>3.4.2</version>
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
+ <!-- Console improvements -->
|
|
+ <dependency>
|
|
+ <groupId>net.minecrell</groupId>
|
|
+ <artifactId>terminalconsoleappender</artifactId>
|
|
+ <version>1.0.0</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>net.java.dev.jna</groupId>
|
|
+ <artifactId>jna</artifactId>
|
|
+ <version>4.4.0</version>
|
|
+ <scope>runtime</scope>
|
|
+ </dependency>
|
|
+
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>travertine-chat</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
</dependencies>
|
|
</project>
|
|
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
|
|
index 8eea364f..83bc7a7d 100644
|
|
--- a/module/cmd-alert/pom.xml
|
|
+++ b/module/cmd-alert/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module-cmd-alert</artifactId>
|
|
+ <artifactId>travertine-module-cmd-alert</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
|
|
index 9a2eb779..42fb0a11 100644
|
|
--- a/module/cmd-find/pom.xml
|
|
+++ b/module/cmd-find/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module-cmd-find</artifactId>
|
|
+ <artifactId>travertine-module-cmd-find</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
|
|
index 57b0cdd8..cc2e55f9 100644
|
|
--- a/module/cmd-list/pom.xml
|
|
+++ b/module/cmd-list/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module-cmd-list</artifactId>
|
|
+ <artifactId>travertine-module-cmd-list</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
|
|
index 990c0a6d..af82bb2c 100644
|
|
--- a/module/cmd-send/pom.xml
|
|
+++ b/module/cmd-send/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module-cmd-send</artifactId>
|
|
+ <artifactId>travertine-module-cmd-send</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
|
|
index 1b4e0455..8d96679e 100644
|
|
--- a/module/cmd-server/pom.xml
|
|
+++ b/module/cmd-server/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module-cmd-server</artifactId>
|
|
+ <artifactId>travertine-module-cmd-server</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
diff --git a/module/pom.xml b/module/pom.xml
|
|
index 0b9fc4aa..ca1f7487 100644
|
|
--- a/module/pom.xml
|
|
+++ b/module/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>pom</packaging>
|
|
|
|
- <name>Waterfall Modules</name>
|
|
- <description>Parent project for all Waterfall modules.</description>
|
|
+ <name>Travertine Modules</name>
|
|
+ <description>Parent project for all Travertine modules.</description>
|
|
|
|
<modules>
|
|
<module>cmd-alert</module>
|
|
@@ -36,7 +36,7 @@
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-api</artifactId>
|
|
+ <artifactId>travertine-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
|
|
index 0d3a3b70..e6ee3cd8 100644
|
|
--- a/module/reconnect-yaml/pom.xml
|
|
+++ b/module/reconnect-yaml/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module</artifactId>
|
|
+ <artifactId>travertine-module</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-module-reconnect-yaml</artifactId>
|
|
+ <artifactId>travertine-module-reconnect-yaml</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
diff --git a/native/pom.xml b/native/pom.xml
|
|
index ec465dd3..28d1a02c 100644
|
|
--- a/native/pom.xml
|
|
+++ b/native/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-native</artifactId>
|
|
+ <artifactId>travertine-native</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Native</name>
|
|
- <description>Optional native code to speed up and enhance Waterfall functionality.</description>
|
|
+ <name>Travertine-Native</name>
|
|
+ <description>Optional native code to speed up and enhance Travertine functionality.</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 3ca7ca91..94e4aca2 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -5,19 +5,19 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-super</artifactId>
|
|
+ <artifactId>travertine-super</artifactId>
|
|
<version>dev-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>pom</packaging>
|
|
|
|
- <name>Waterfall-Parent</name>
|
|
- <description>Parent project for all Waterfall modules.</description>
|
|
- <url>https://github.com/WaterfallMC/Waterfall</url>
|
|
+ <name>Travertine-Parent</name>
|
|
+ <description>Parent project for all Travertine modules.</description>
|
|
+ <url>https://github.com/PaperMC/Travertine</url>
|
|
<inceptionYear>2015</inceptionYear>
|
|
<organization>
|
|
<name>WaterfallMC</name>
|
|
@@ -65,17 +65,17 @@
|
|
</modules>
|
|
|
|
<scm>
|
|
- <connection>scm:git:git@github.com:com:WaterfallMC/Waterfall.git</connection>
|
|
- <developerConnection>scm:git:git@github.com:WaterfallMC/Waterfall.git</developerConnection>
|
|
- <url>git@github.com:WaterfallMC/Waterfall.git</url>
|
|
+ <connection>scm:git:git@github.com:com:PaperMC/Travertine.git</connection>
|
|
+ <developerConnection>scm:git:git@github.com:PaperMC/Travertine.git</developerConnection>
|
|
+ <url>git@github.com:PaperMC/Travertine.git</url>
|
|
</scm>
|
|
<issueManagement>
|
|
<system>GitHub</system>
|
|
- <url>https://github.com/PaperMC/Waterfall/issues</url>
|
|
+ <url>https://github.com/PaperMC/Travertine/issues</url>
|
|
</issueManagement>
|
|
<ciManagement>
|
|
<system>jenkins</system>
|
|
- <url>https://papermc.io/ci/job/Waterfall/</url>
|
|
+ <url>https://papermc.io/ci/job/Travertine/</url>
|
|
</ciManagement>
|
|
|
|
<distributionManagement>
|
|
diff --git a/protocol/pom.xml b/protocol/pom.xml
|
|
index 8571f378..ba3ffe3d 100644
|
|
--- a/protocol/pom.xml
|
|
+++ b/protocol/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-protocol</artifactId>
|
|
+ <artifactId>travertine-protocol</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Protocol</name>
|
|
- <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
|
|
+ <name>Travertine-Protocol</name>
|
|
+ <description>Minimal implementation of the Minecraft protocol for use in Travertine</description>
|
|
|
|
<!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
|
|
<repositories>
|
|
@@ -42,7 +42,7 @@
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-chat</artifactId>
|
|
+ <artifactId>travertine-chat</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
diff --git a/proxy/pom.xml b/proxy/pom.xml
|
|
index f0c36550..4bda0d62 100644
|
|
--- a/proxy/pom.xml
|
|
+++ b/proxy/pom.xml
|
|
@@ -5,17 +5,17 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-proxy</artifactId>
|
|
+ <artifactId>travertine-proxy</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Proxy</name>
|
|
+ <name>Travertine-Proxy</name>
|
|
<description>Proxy component of the Elastic Portal Suite</description>
|
|
|
|
<properties>
|
|
@@ -59,31 +59,31 @@
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-api</artifactId>
|
|
+ <artifactId>travertine-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-log4j</artifactId>
|
|
+ <artifactId>travertine-log4j</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-native</artifactId>
|
|
+ <artifactId>travertine-native</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-protocol</artifactId>
|
|
+ <artifactId>travertine-protocol</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-query</artifactId>
|
|
+ <artifactId>travertine-query</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
|
|
index 9b20d0df..2637b9e2 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
|
|
@@ -18,7 +18,7 @@ public class JenkinsModuleSource implements ModuleSource
|
|
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
|
|
try
|
|
{
|
|
- URL website = new URL( "https://papermc.io/ci/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
|
|
+ URL website = new URL( "https://papermc.io/ci/job/Travertine/" + version.getBuild() + "/artifact/Travertine-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
|
|
URLConnection con = website.openConnection();
|
|
// 15 second timeout at various stages
|
|
con.setConnectTimeout( 15000 );
|
|
diff --git a/query/pom.xml b/query/pom.xml
|
|
index 1c845a6d..0f2ea00b 100644
|
|
--- a/query/pom.xml
|
|
+++ b/query/pom.xml
|
|
@@ -5,18 +5,18 @@
|
|
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-parent</artifactId>
|
|
+ <artifactId>travertine-parent</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-query</artifactId>
|
|
+ <artifactId>travertine-query</artifactId>
|
|
<version>1.16-R0.4-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Waterfall-Query</name>
|
|
- <description>Minecraft query implementation based on the Waterfall API.</description>
|
|
+ <name>Travertine-Query</name>
|
|
+ <description>Minecraft query implementation based on the Travertine API.</description>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
@@ -27,7 +27,7 @@
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
- <artifactId>waterfall-api</artifactId>
|
|
+ <artifactId>travertine-api</artifactId>
|
|
<version>${project.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
--
|
|
2.25.1
|
|
|