Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 21:25:47 +01:00
Code Issues Projects Releases Wiki Activity

This commit is dedicated to JetBrains

Browse Source 
Yep, I had thought no merge conflict was odd - didn't think much of it. Jetbrains ffs fix the refresh to actual bloody refresh!
This commit is contained in:
Jamie Mansfield 2017-03-07 21:28:08 +00:00
parent 1073945fba
commit 53eade81e8
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch
View File

@ -1,4 +1,4 @@
From f5b593bf418986576c964147923f5d429affc074 Mon Sep 17 00:00:00 2001 From 4a3bbce9c7aece2f8f6121dee46c24a94a5eb2de Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:34:52 -0700 Date: Thu, 19 May 2016 11:34:52 -0700
Subject: [PATCH] Fetch modules from the Waterfall CI Subject: [PATCH] Fetch modules from the Waterfall CI
@ -6,32 +6,33 @@ Subject: [PATCH] Fetch modules from the Waterfall CI
Don't fetch from the BungeeCord CI, as that only has their modules Don't fetch from the BungeeCord CI, as that only has their modules
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 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 2536435c..6eb10df7 100644 index 2536435c..11d9823f 100644
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
@@ -1,10 +1,11 @@ @@ -1,12 +1,13 @@
package net.md_5.bungee.module; package net.md_5.bungee.module;
-import com.google.common.io.ByteStreams; -import com.google.common.io.ByteStreams;
-import com.google.common.io.Files; -import com.google.common.io.Files;
+import lombok.Data;
+import net.md_5.bungee.Util;
+
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
-import lombok.Data;
-import net.md_5.bungee.Util;
+import java.nio.file.Files; +import java.nio.file.Files;
+import java.nio.file.StandardCopyOption; +import java.nio.file.StandardCopyOption;
+
import lombok.Data;
import net.md_5.bungee.Util;
@@ -18,13 +19,18 @@ public class JenkinsModuleSource implements ModuleSource @Data
public class JenkinsModuleSource implements ModuleSource
@@ -18,13 +19,14 @@ public class JenkinsModuleSource implements ModuleSource
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() ); System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
try try
{ {
+<<<<<<< HEAD - URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
+=======
+ URL website = new URL( "https://ci.destroystokyo.com/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); + URL website = new URL( "https://ci.destroystokyo.com/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
+>>>>>>> Fetch modules from the Waterfall CI
URLConnection con = website.openConnection(); URLConnection con = website.openConnection();
// 15 second timeout at various stages // 15 second timeout at various stages
con.setConnectTimeout( 15000 ); con.setConnectTimeout( 15000 );