From 209758b7e6b7783919e3f4a92864a37082956036 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 08:56:43 -0500 Subject: [PATCH] POM Changes diff --git a/api/pom.xml b/api/pom.xml index b79d7ed6..dc49e44f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,41 +5,41 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-api + travertine-api 1.14-SNAPSHOT jar - Waterfall-API + Travertine-API API implemented by the Elastic Portal Suite io.github.waterfallmc - waterfall-chat + travertine-chat ${project.version} compile io.github.waterfallmc - waterfall-config + travertine-config ${project.version} compile io.github.waterfallmc - waterfall-event + travertine-event ${project.version} compile io.github.waterfallmc - waterfall-protocol + travertine-protocol ${project.version} compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 487fb3bb..d2f0293d 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-bootstrap + travertine-bootstrap 1.14-SNAPSHOT jar - Waterfall-Bootstrap - Java 1.6 loader for Waterfall + Travertine-Bootstrap + Java 1.6 loader for Travertine true @@ -28,14 +28,14 @@ io.github.waterfallmc - waterfall-proxy + travertine-proxy ${project.version} compile - Waterfall + Travertine org.apache.maven.plugins diff --git a/chat/pom.xml b/chat/pom.xml index 7ad05abb..7c0f54b2 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-chat + travertine-chat 1.14-SNAPSHOT jar - Waterfall-Chat - Minecraft JSON chat API intended for use with Waterfall + Travertine-Chat + Minecraft JSON chat API intended for use with Travertine diff --git a/config/pom.xml b/config/pom.xml index 9d0fe24b..b1b313d4 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-config + travertine-config 1.14-SNAPSHOT jar - Waterfall-Config - Generic java configuration API intended for use with Waterfall + Travertine-Config + Generic java configuration API intended for use with Travertine diff --git a/event/pom.xml b/event/pom.xml index d6efe097..a447a4a5 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -5,16 +5,16 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-event + travertine-event 1.14-SNAPSHOT jar - Waterfall-Event - Generic java event dispatching API intended for use with Waterfall. + Travertine-Event + Generic java event dispatching API intended for use with Travertine. diff --git a/log/pom.xml b/log/pom.xml index fd999b51..280b3ceb 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-log + travertine-log 1.14-SNAPSHOT jar - Waterfall-Log - Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications. + Travertine-Log + Simplistic and performant java.util.Logger based logger and console API designed for use with Travertine and Minecraft related applications. @@ -27,7 +27,7 @@ io.github.waterfallmc - waterfall-chat + travertine-chat ${project.version} compile diff --git a/log4j/pom.xml b/log4j/pom.xml index e03fe0d7..4b04cbda 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -4,17 +4,17 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-log4j + travertine-log4j 1.14-SNAPSHOT jar - Waterfall-Log + Travertine-Log Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications. @@ -50,5 +50,24 @@ 3.4.2 runtime + + + net.minecrell + terminalconsoleappender + 1.0.0 + + + net.java.dev.jna + jna + 4.4.0 + runtime + + + + io.github.waterfallmc + travertine-chat + ${project.version} + compile + diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml index 6f3aa272..5ee87a9a 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -5,13 +5,13 @@ io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-alert + travertine-module-cmd-alert 1.14-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml index 01d95284..af8a7d9c 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -5,13 +5,13 @@ io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-find + travertine-module-cmd-find 1.14-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml index bc5dc210..3d055bbc 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -5,13 +5,13 @@ io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-list + travertine-module-cmd-list 1.14-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml index f6642175..b594da47 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -5,13 +5,13 @@ io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-send + travertine-module-cmd-send 1.14-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml index c93ab2c9..a94a57db 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -5,13 +5,13 @@ io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-server + travertine-module-cmd-server 1.14-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml index aa604f35..520df1f0 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT pom - Waterfall Modules - Parent project for all Waterfall modules. + Travertine Modules + Parent project for all Travertine modules. cmd-alert @@ -35,7 +35,7 @@ io.github.waterfallmc - waterfall-api + travertine-api ${project.version} compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml index e34bac42..1d82a29b 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -5,13 +5,13 @@ io.github.waterfallmc - waterfall-module + travertine-module 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-reconnect-yaml + travertine-module-reconnect-yaml 1.14-SNAPSHOT jar diff --git a/native/pom.xml b/native/pom.xml index b5aeb99e..67386de0 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-native + travertine-native 1.14-SNAPSHOT jar - Waterfall-Native - Optional native code to speed up and enhance Waterfall functionality. + Travertine-Native + Optional native code to speed up and enhance Travertine functionality. diff --git a/pom.xml b/pom.xml index 98df957c..54ce1c08 100644 --- a/pom.xml +++ b/pom.xml @@ -5,19 +5,19 @@ io.github.waterfallmc - waterfall-super + travertine-super dev-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT pom - Waterfall-Parent - Parent project for all Waterfall modules. - https://github.com/WaterfallMC/Waterfall + Travertine-Parent + Parent project for all Travertine modules. + https://github.com/PaperMC/Travertine 2015 WaterfallMC @@ -65,17 +65,17 @@ - scm:git:git@github.com:com:WaterfallMC/Waterfall.git - scm:git:git@github.com:WaterfallMC/Waterfall.git - git@github.com:WaterfallMC/Waterfall.git + scm:git:git@github.com:com:PaperMC/Travertine.git + scm:git:git@github.com:PaperMC/Travertine.git + git@github.com:PaperMC/Travertine.git GitHub - https://github.com/PaperMC/Waterfall/issues + https://github.com/PaperMC/Travertine/issues jenkins - https://papermc.io/ci/job/Waterfall/ + https://papermc.io/ci/job/Travertine/ diff --git a/protocol/pom.xml b/protocol/pom.xml index 2493fc17..2bd55072 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-protocol + travertine-protocol 1.14-SNAPSHOT jar - Waterfall-Protocol - Minimal implementation of the Minecraft protocol for use in Waterfall + Travertine-Protocol + Minimal implementation of the Minecraft protocol for use in Travertine @@ -42,7 +42,7 @@ io.github.waterfallmc - waterfall-chat + travertine-chat ${project.version} compile diff --git a/proxy/pom.xml b/proxy/pom.xml index f15927ec..2d4e4d79 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -5,17 +5,17 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-proxy + travertine-proxy 1.14-SNAPSHOT jar - Waterfall-Proxy + Travertine-Proxy Proxy component of the Elastic Portal Suite @@ -41,14 +41,14 @@ ${netty.version} compile - + io.netty netty-resolver-dns ${netty.version} compile - + io.netty netty-handler @@ -64,31 +64,31 @@ io.github.waterfallmc - waterfall-api + travertine-api ${project.version} compile io.github.waterfallmc - waterfall-log4j + travertine-log4j ${project.version} compile io.github.waterfallmc - waterfall-native + travertine-native ${project.version} compile io.github.waterfallmc - waterfall-protocol + travertine-protocol ${project.version} compile io.github.waterfallmc - waterfall-query + travertine-query ${project.version} compile 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 1fd54029..86f7aabc 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -5,18 +5,18 @@ io.github.waterfallmc - waterfall-parent + travertine-parent 1.14-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-query + travertine-query 1.14-SNAPSHOT jar - Waterfall-Query - Minecraft query implementation based on the Waterfall API. + Travertine-Query + Minecraft query implementation based on the Travertine API. @@ -27,7 +27,7 @@ io.github.waterfallmc - waterfall-api + travertine-api ${project.version} compile -- 2.21.0