v1.13 upgrade to commons-compress-1.19.jar, upgrade to java 13 which will release memory to OS when not in use

README.md

@@ -51,9 +51,9 @@ Then, retrieve this project from git:
 
 `git clone https://github.com/knaccc/i2p-zero.git`
 
-Note that the current version of this script uses jdk-12. If this version of Java becomes no longer available for
+Note that the current version of this script uses jdk-13. If this version of Java becomes no longer available for
 download, then update the references in java-config.sh to the later version. To locate a recent
-JDK download URL, see https://jdk.java.net/12/
+JDK download URL, see https://jdk.java.net/13/
 
 Also note that JDKs for Linux, MacOS and Windows will be downloaded, which will total several hundred megabytes. You may need to ensure your system has zip, unzip and bzip2 installed to run the build script.
 

bin/build-normalize-zip.sh

@@ -9,7 +9,7 @@ fi
 source "$basedir/bin/java-config.sh"
 
 echo "*** Compiling Zip normalizer utility"
-"$JAVA_HOME"/bin/javac --module-path import/commons-compress-1.18/commons-compress-1.18.jar -d target/classes/org.getmonero.util.normalizeZip $(find org.getmonero.util.normalizeZip/src -name '*.java')
+"$JAVA_HOME"/bin/javac --module-path import/commons-compress-1.19/commons-compress-1.19.jar -d target/classes/org.getmonero.util.normalizeZip $(find org.getmonero.util.normalizeZip/src -name '*.java')
 
 echo "*** Packaging Zip normalizer as a modular jar"
 "$JAVA_HOME"/bin/jar --create --file target/org.getmonero.util.normalizeZip.jar --main-class org.getmonero.util.normalizeZip.NormalizeZip -C target/classes/org.getmonero.util.normalizeZip .

bin/import-packages.sh

@@ -37,9 +37,9 @@ if [ ! -d "$basedir/import/apache-ant-1.10.7" ]; then
   tar zxvf apache-ant-1.10.7-bin.tar.gz
 fi
 
-if [ ! -d "$basedir/import/commons-compress-1.18" ]; then
+if [ ! -d "$basedir/import/commons-compress-1.19" ]; then
-  wget https://www.mirrorservice.org/sites/ftp.apache.org//commons/compress/binaries/commons-compress-1.18-bin.tar.gz
+  wget https://www.mirrorservice.org/sites/ftp.apache.org//commons/compress/binaries/commons-compress-1.19-bin.tar.gz
-  tar zxvf commons-compress-1.18-bin.tar.gz
+  tar zxvf commons-compress-1.19-bin.tar.gz
 fi
 
 if [ ! -d "$basedir/import/jetty-lib" ]; then

bin/java-config.sh

@@ -8,19 +8,19 @@ fi
 
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
-JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz
+JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz
-JDK_DOWNLOAD_FILENAME_MAC=OpenJDK12U-jdk_x64_mac_hotspot_12_33.tar.gz
+JDK_DOWNLOAD_FILENAME_MAC=OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz
-JDK_DOWNLOAD_FILENAME_WIN=OpenJDK12U-jdk_x64_windows_hotspot_12_33.zip
+JDK_DOWNLOAD_FILENAME_WIN=OpenJDK13U-jdk_x64_windows_hotspot_13_33.zip
 
-JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz
+JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz
-JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_mac_hotspot_12_33.tar.gz
+JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz
-JDK_DOWNLOAD_URL_WIN=https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_windows_hotspot_12_33.zip
+JDK_DOWNLOAD_URL_WIN=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_windows_hotspot_13_33.zip
 
-JAVA_HOME_LINUX=$basedir/import/jdks/linux/jdk-12+33
+JAVA_HOME_LINUX=$basedir/import/jdks/linux/jdk-13+33
-JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-12+33/Contents/Home
+JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-13+33/Contents/Home
-JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-12+33
+JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-13+33
 
-JAVAFX_VERSION=12
+JAVAFX_VERSION=13
 JAVAFX_SDK_DOWNLOAD_URL_LINUX=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_linux-x64_bin-sdk.zip
 JAVAFX_SDK_DOWNLOAD_URL_MAC=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_osx-x64_bin-sdk.zip
 JAVAFX_SDK_DOWNLOAD_URL_WIN=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_windows-x64_bin-sdk.zip
@@ -59,6 +59,6 @@ getHash () {
 
 # normalizes the specified jar or zip for reproducible build. Enforces consistent zip file order and sets all timestamps to midnight on Jan 1 2019
 normalizeZip () {
-  $JAVA_HOME/bin/java --module-path "$basedir/import/commons-compress-1.18/commons-compress-1.18.jar":"$basedir/target/org.getmonero.util.normalizeZip.jar" \
+  $JAVA_HOME/bin/java --module-path "$basedir/import/commons-compress-1.19/commons-compress-1.19.jar":"$basedir/target/org.getmonero.util.normalizeZip.jar" \
   -m org.getmonero.util.normalizeZip 1546300800000 "$1"
 }

org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION

@@ -1 +1 @@
-1.12
+1.13