Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity
21050ebfb0
Waterfall/Waterfall-Proxy-Patches/0001-POM-Changes.patch
Shane Freeder 6deaa1c15c
Merge upstream - Minecraft 1.13.1 support
2018-08-23 22:59:35 +01:00

656 lines
23 KiB
Diff
Raw Blame History

From 46fd98cefdf9176f9c7bcf922aaf17082f6378aa 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 0e46cbbe0..6058e11c7 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-api</artifactId>
+ <artifactId>travertine-api</artifactId>
<version>1.13-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 e7bc7a5d9..21990c32f 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>travertine-bootstrap</artifactId>
<version>1.13-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>
@@ -28,7 +28,7 @@
<dependencies>
<dependency>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -41,7 +41,7 @@
</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 c9328ac3d..04daec408 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
+ <artifactId>travertine-chat</artifactId>
<version>1.13-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 febc4af05..52fbf681c 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-config</artifactId>
+ <artifactId>travertine-config</artifactId>
<version>1.13-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 e778b3d98..de500af7c 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-event</artifactId>
+ <artifactId>travertine-event</artifactId>
<version>1.13-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 e24b3e409..95dd1a833 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log</artifactId>
+ <artifactId>travertine-log</artifactId>
<version>1.13-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 a085a39cb..87ee1371a 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -4,17 +4,17 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log4j</artifactId>
+ <artifactId>travertine-log4j</artifactId>
<version>1.13-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
+ <name>Travertine-Log</name>
<description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
<properties>
@@ -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 db1493399..f05130e72 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.13-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.13-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index c8d9826d3..7f8340e99 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.13-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.13-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 461b26ee8..8cdacf0a9 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.13-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.13-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 1b687b3ce..85de8defd 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.13-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.13-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 9bdc3aba9..a6c6d277e 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.13-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.13-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 6bed2ea0b..c72d3ecdd 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.13-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>
@@ -35,7 +35,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 ca9a7c616..78576a538 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.13-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.13-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 7073b4040..15fa568a7 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-native</artifactId>
+ <artifactId>travertine-native</artifactId>
<version>1.13-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 0183bf9c5..af6d5a97c 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.13-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/WaterfallMC/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:WaterfallMC/Travertine.git</connection>
+ <developerConnection>scm:git:git@github.com:WaterfallMC/Travertine.git</developerConnection>
+ <url>git@github.com:WaterfallMC/Travertine.git</url>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/WaterfallMC/Waterfall/issues</url>
+ <url>https://github.com/WaterfallMC/Travertine/issues</url>
</issueManagement>
<ciManagement>
<system>jenkins</system>
- <url>https://ci.aquifermc.org/job/Waterfall/</url>
+ <url>https://ci.destroystokyo.com/job/Travertine/</url>
</ciManagement>
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 333ae1e82..88ddcfb9e 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -5,23 +5,23 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-protocol</artifactId>
+ <artifactId>travertine-protocol</artifactId>
<version>1.13-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>
<dependencies>
<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 df84d6f19..f25ee27ec 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>1.13-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Proxy</name>
+ <name>Travertine-Proxy</name>
<description>Proxy component of the Elastic Portal Suite</description>
<properties>
@@ -41,14 +41,14 @@
<version>${netty.version}</version>
<scope>compile</scope>
</dependency>
- <!-- Waterfall Start - add Netty DNS resolver -->
+ <!-- Travertine Start - add Netty DNS resolver -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>${netty.version}</version>
<scope>compile</scope>
</dependency>
- <!-- Waterfall End -->
+ <!-- Travertine End -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
@@ -64,31 +64,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/query/pom.xml b/query/pom.xml
index 4ae682ee5..c8f62a78f 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.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-query</artifactId>
+ <artifactId>travertine-query</artifactId>
<version>1.13-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.18.0
Reference in New Issue View Git Blame Copy Permalink