Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-14 11:41:24 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source 
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:
281e731 Remove remaining CI references
caea6e6 Remove Jenkins references (#591)
This commit is contained in:
Shane Freeder 2021-01-11 16:37:55 +00:00
parent 35af3c4c59
commit a6ec94205c
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit a112cfe996753861d51f72b684f728bc674228ef
Subproject commit 281e7310b8999ef9cbaaf3ba348bfa50f9d531f9

11
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From cd812233e8e74d5c0a7b753df0076a2a9baab06a Mon Sep 17 00:00:00 2001
From dde9291ad00dd3ac85eef03195cf32dab89ec5f3 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
@ -452,7 +452,7 @@ index ec465dd3..28d1a02c 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index fd03c640..1b773cc5 100644
index d2bed7b5..10911a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -480,7 +480,7 @@ index fd03c640..1b773cc5 100644
<inceptionYear>2015</inceptionYear>
<organization>
<name>WaterfallMC</name>
@@ -65,17 +65,17 @@
@@ -65,13 +65,13 @@
</modules>
<scm>
@ -496,11 +496,6 @@ index fd03c640..1b773cc5 100644
- <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

15
Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
View File

@ -1,4 +1,4 @@
From 0017e5e4bc7a1c73963e5555d1acec8cd023e850 Mon Sep 17 00:00:00 2001
From 137ac0179db533a6f030c034a467af2f129848ea Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:47:46 -0600
Subject: [PATCH] Rename references from Waterfall to Travertine
@ -53,18 +53,9 @@ index 2938f2f1..f7f1e7cc 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index dc2c584d..ad9a6d0c 100644
index e830198d..cc05b1fc 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -49,7 +49,7 @@ public class BungeeCordLauncher
if ( buildDate.before( deadline.getTime() ) )
{
System.err.println( "*** Hey! This build is potentially outdated :( ***" );
- System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Waterfall/ ***" );
+ System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Travertine/ ***" );
System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" );
System.err.println( "*** Server will start in 10 seconds ***" );
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
@@ -58,7 +58,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
@ -114,5 +105,5 @@ index 65121ba2..d4fad294 100644
SocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.27.0
2.29.2