Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-29 03:57:48 +01:00
Code Issues Projects Releases Wiki Activity
b1bb4b4c38
Waterfall/Waterfall-Proxy-Patches/0001-POM-Changes.patch
Techcable 7b902eb14f
Wiggle the patches to resolve conflicts 
For some reason, this doesn't build on my computer because of an issue
with OpenSSL.

Fixes #43
2017-05-15 00:01:52 -07:00

602 lines
21 KiB
Diff
Raw Blame History

From c4e75b19ef7630ecf1c1418dd9ceedb4337736ec 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 2a3c5eae..0e6adea2 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-api</artifactId>
+ <artifactId>travertine-api</artifactId>
<version>1.12-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 90a1c378..e6f7daf1 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>travertine-bootstrap</artifactId>
<version>1.12-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.compiler.source>1.6</maven.compiler.source>
@@ -27,7 +27,7 @@
<dependencies>
<dependency>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -40,7 +40,7 @@
</dependencies>
<build>
- <finalName>Waterfall</finalName>
+ <finalName>Travertine</finalName>
<plugins>
<plugin>
<!-- Don't deploy proxy to maven repo, only APIs -->
diff --git a/chat/pom.xml b/chat/pom.xml
index 2d99a884..084c64e0 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
+ <artifactId>travertine-chat</artifactId>
<version>1.12-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>
<properties>
<!-- Require Java 8, not Java 6 -->
diff --git a/config/pom.xml b/config/pom.xml
index fc49babe..ced2ac5a 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-config</artifactId>
+ <artifactId>travertine-config</artifactId>
<version>1.12-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 a387b2c0..551a8151 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-event</artifactId>
+ <artifactId>travertine-event</artifactId>
<version>1.12-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 b54e01a0..18c356f0 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log</artifactId>
+ <artifactId>travertine-log</artifactId>
<version>1.12-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/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 2d81204b..1c65ba41 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.12-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.12-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index f22790a3..feceb6b3 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.12-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.12-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 0e693f11..65ef4aa2 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.12-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.12-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index ba6de230..09a11b18 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.12-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.12-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index e00697fe..dbcb9a12 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.12-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.12-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index a4d581ec..44012d53 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.12-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>
@@ -28,13 +28,13 @@
</modules>
<properties>
- <module.author>WaterfallMC</module.author>
+ <module.author>TravertineMC</module.author>
</properties>
<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 091ea8cf..feea2195 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.12-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.12-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 8b045e3b..172c128f 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-native</artifactId>
+ <artifactId>travertine-native</artifactId>
<version>1.12-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 2f4dd31b..690c25aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,23 +5,23 @@
<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.12-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/TravertineMC/Travertine</url>
<inceptionYear>2015</inceptionYear>
<organization>
- <name>WaterfallMC</name>
- <url>https://github.com/WaterfallMC</url>
+ <name>TravertineMC</name>
+ <url>https://github.com/TravertineMC</url>
</organization>
<licenses>
<license>
@@ -64,17 +64,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:TravertineMC/Travertine.git</connection>
+ <developerConnection>scm:git:git@github.com:TravertineMC/Travertine.git</developerConnection>
+ <url>git@github.com:TravertineMC/Travertine.git</url>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/WaterfallMC/Waterfall/issues</url>
+ <url>https://github.com/TravertineMC/Travertine/issues</url>
</issueManagement>
<ciManagement>
<system>jenkins</system>
- <url>https://ci.aquifermc.org/job/Waterfall/</url>
+ <url>https://ci.aquifermc.org/job/Travertine/</url>
</ciManagement>
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 9a4b6529..b6db889c 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-protocol</artifactId>
+ <artifactId>travertine-protocol</artifactId>
<version>1.12-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 5cf35841..de5f0675 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>1.12-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Proxy</name>
+ <name>Travertine-Proxy</name>
<description>Proxy component of the Elastic Portal Suite</description>
<dependencies>
@@ -54,31 +54,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-log</artifactId>
+ <artifactId>travertine-log</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 4b3613fa..b0afcc59 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.12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-query</artifactId>
+ <artifactId>travertine-query</artifactId>
<version>1.12-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.12.2
Reference in New Issue View Git Blame Copy Permalink