From 8f28b1fe153b7dacf4eec675a40f67954b784bdd Mon Sep 17 00:00:00 2001
From: knaccc <knaccc@users.noreply.github.com>
Date: Mon, 21 Jan 2019 04:45:17 +0000
Subject: [PATCH] switched to Github hosted github.com/AdoptOpenJDK site for
 OpenJDK

---
 README.md             |  6 +++---
 bin/build-launcher.sh |  6 +++---
 bin/java-config.sh    | 20 +++++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index b01ca26..9459f37 100755
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ The zero-dependency distribution sizes are as follows:
 
 OS | Uncompressed size (MB) | xz Compressed size (MB)
 ------------ | ------------- | -------------
-Linux | 41.9 | 22.8
-MacOS | 29.9 | 17.8
-Windows | 33.9 | 20.4
+Linux | 42.6 | 23.4
+MacOS | 40.2 | 21.1
+Windows | 33.1 | 20.8
 
 ## Building the launchers
 
diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh
index d14ab0d..ee076ad 100755
--- a/bin/build-launcher.sh
+++ b/bin/build-launcher.sh
@@ -17,13 +17,13 @@ mkdir -p $basedir/dist/linux $basedir/dist/mac $basedir/dist/win
 
 # create OS specific launchers which will bundle together the code and a minimal JVM
 echo "*** Performing jlink (Linux)"
-$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/linux/jdk-${JDK_VERSION}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/linux/router --strip-debug --compress 2 --no-header-files --no-man-pages
+$JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_LINUX}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/linux/router --strip-debug --compress 2 --no-header-files --no-man-pages
 
 echo "*** Performing jlink (Mac)"
-$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/mac/jdk-${JDK_VERSION}.jdk/Contents/Home/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/mac/router --strip-debug --compress 2 --no-header-files --no-man-pages
+$JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_MAC}/Contents/Home/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/mac/router --strip-debug --compress 2 --no-header-files --no-man-pages
 
 echo "*** Performing jlink (Windows)"
-$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/win/jdk-${JDK_VERSION}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/win/router --strip-debug --compress 2 --no-header-files --no-man-pages
+$JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_WIN}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/win/router --strip-debug --compress 2 --no-header-files --no-man-pages
 
 
 for i in linux mac; do
diff --git a/bin/java-config.sh b/bin/java-config.sh
index 4400f59..c133db9 100644
--- a/bin/java-config.sh
+++ b/bin/java-config.sh
@@ -2,19 +2,21 @@
 
 basedir=$(dirname $(dirname $(readlink -fm $0)))
 
-JDK_VERSION=11.0.2
+JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz
+JDK_DOWNLOAD_FILENAME_MAC=OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz
+JDK_DOWNLOAD_FILENAME_WIN=OpenJDK11U-jdk_x64_windows_hotspot_11.0.1_13.zip
 
-JDK_DOWNLOAD_FILENAME_LINUX=openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
-JDK_DOWNLOAD_FILENAME_MAC=openjdk-${JDK_VERSION}_osx-x64_bin.tar.gz
-JDK_DOWNLOAD_FILENAME_WIN=openjdk-${JDK_VERSION}_windows-x64_bin.zip
+JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz
+JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz
+JDK_DOWNLOAD_URL_WIN=https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_windows_hotspot_11.0.1_13.zip
 
-JDK_DOWNLOAD_URL_LINUX=https://download.java.net/java/GA/jdk11/7/GPL/$JDK_DOWNLOAD_FILENAME_LINUX
-JDK_DOWNLOAD_URL_MAC=https://download.java.net/java/GA/jdk11/7/GPL/$JDK_DOWNLOAD_FILENAME_MAC
-JDK_DOWNLOAD_URL_WIN=https://download.java.net/java/GA/jdk11/7/GPL/$JDK_DOWNLOAD_FILENAME_WIN
+JAVA_HOME_LINUX=`realpath $basedir/import/jdks/linux/jdk-11.0.1+13`
+JAVA_HOME_MAC=`realpath $basedir/import/jdks/mac/jdk-11.0.1+13/Contents/Home`
+JAVA_HOME_WIN=`realpath $basedir/import/jdks/win/jdk-11.0.1+13`
 
 OS=`uname -s`
 if [ $OS = "Darwin" ]; then
-  export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-${JDK_VERSION}.jdk/Contents/Home`
+  export JAVA_HOME=$JAVA_HOME_MAC
 else
-  export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-${JDK_VERSION}`
+  export JAVA_HOME=$JAVA_HOME_LINUX
 fi