updated to commons-compress 1.20 dependency via maven repository

pull/35/head
knaccc 4 years ago
parent 80319b9a67
commit 3da4a96515

@ -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.19/commons-compress-1.19.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.20/commons-compress-1.20.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 .

@ -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.19" ]; then
wget https://www.mirrorservice.org/sites/ftp.apache.org//commons/compress/binaries/commons-compress-1.19-bin.tar.gz
tar zxvf commons-compress-1.19-bin.tar.gz
if [ ! -d "$basedir/import/commons-compress-1.20" ]; then
mkdir -p commons-compress-1.20
wget --directory-prefix=commons-compress-1.20 https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar
fi
if [ ! -d "$basedir/import/jetty-lib" ]; then

@ -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.19/commons-compress-1.19.jar":"$basedir/target/org.getmonero.util.normalizeZip.jar" \
$JAVA_HOME/bin/java --module-path "$basedir/import/commons-compress-1.20/commons-compress-1.20.jar":"$basedir/target/org.getmonero.util.normalizeZip.jar" \
-m org.getmonero.util.normalizeZip 1546300800000 "$1"
}
Loading…
Cancel
Save