From d9420aa63bec61664dcae5f56ff49916a25b9b2b Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Sun, 3 Jul 2016 21:28:40 +0100 Subject: [PATCH] Fetch modules from the correct CI --- .../0005-Fetch-modules-from-the-Waterfall-CI.patch | 12 ++++++------ ...t-variant-to-connect-methods-Also-added-mo.patch} | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename BungeeCord-Patches/{0041-Add-timeout-variant-to-connect-methods.patch => 0041-Add-timeout-variant-to-connect-methods-Also-added-mo.patch} (98%) diff --git a/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch b/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch index 79d2ad5..e6abd28 100644 --- a/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch +++ b/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch @@ -1,4 +1,4 @@ -From 248f19f83a821f87e64714766803284e73187be8 Mon Sep 17 00:00:00 2001 +From 2b3864af48ff9c7a5bea57ea40e2f8a8ebe3336a Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 11:34:52 -0700 Subject: [PATCH] Fetch modules from the Waterfall CI @@ -6,7 +6,7 @@ Subject: [PATCH] Fetch modules from the Waterfall CI 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 -index 9bd2dc9..97a08da 100644 +index 9bd2dc9..fa14161 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 @@ -1,10 +1,11 @@ @@ -28,18 +28,18 @@ index 9bd2dc9..97a08da 100644 try { - URL website = new URL( "http://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); -+ URL website = new URL( "https://tc.demonwav.com/guestAuth/repository/download/Waterfall_Build/" + version.getBuild() + "/" + module.getName() + ".jar" ); ++ URL website = new URL( "https://ci.aquifermc.org/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); URLConnection con = website.openConnection(); // 15 second timeout at various stages con.setConnectTimeout( 15000 ); con.setReadTimeout( 15000 ); -+ con.setRequestProperty("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36"); ++ con.setRequestProperty( "User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" ); - Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() ); -+ Files.copy(con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING); ++ Files.copy( con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING ); System.out.println( "Download complete" ); } catch ( IOException ex ) { -- -2.8.3 +2.8.2 diff --git a/BungeeCord-Patches/0041-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0041-Add-timeout-variant-to-connect-methods-Also-added-mo.patch similarity index 98% rename from BungeeCord-Patches/0041-Add-timeout-variant-to-connect-methods.patch rename to BungeeCord-Patches/0041-Add-timeout-variant-to-connect-methods-Also-added-mo.patch index 4f5a68d..def53f7 100644 --- a/BungeeCord-Patches/0041-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0041-Add-timeout-variant-to-connect-methods-Also-added-mo.patch @@ -1,4 +1,4 @@ -From 22251b09127f2cebcb6853666cf391f6c07641dd Mon Sep 17 00:00:00 2001 +From d9dc3e5bcd370b01545288c9820dc0b57e329e03 Mon Sep 17 00:00:00 2001 From: Ichbinjoe Date: Sun, 3 Jul 2016 03:54:14 -0400 Subject: [PATCH] Add timeout variant to connect methods Also added more @@ -85,5 +85,5 @@ index ff103bf..47b37c0 100644 // Windows is bugged, multi homed users will just have to live with random connecting IPs if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() ) -- -2.7.4 (Apple Git-66) +2.8.2