From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 17 Apr 2019 00:59:32 +0000 (+0100)
Subject: JAL-3224 Add commons-compress-1.18.jar
X-Git-Tag: Release_2_11_0~17^2~7^2~23
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=inline;h=f7ddd8a333c145dfdcf5f525a094f15ca3761bc2;p=jalview.git

JAL-3224 Add commons-compress-1.18.jar
---

diff --git a/build.gradle b/build.gradle
index 291d718..41a09ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ import org.gradle.internal.os.OperatingSystem
 buildscript {
   dependencies {
         classpath 'org.openclover:clover:4.3.1'
+        classpath 'org.apache.commons:commons-compress:1.18'
   }
 }
 
@@ -488,6 +489,7 @@ ext {
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
   getdownLauncher = jalviewDir + '/' + getdown_launcher
   getdownFilesDir = jalviewDir + '/' + getdown_files_dir
+  getdownLib1 = jalviewDir + '/' + getdown_lib1
 }
 
 task getdownWebsite() {
@@ -598,6 +600,16 @@ task getdownWebsite() {
     }
 
     copy {
+      from getdownLib1
+      into project.ext.getdownFilesDir
+    }
+
+    copy {
+      from getdownLib1
+      into project.ext.getdownWebsiteDir
+    }
+
+    copy {
       from jalviewDir + '/' + project.getProperty('getdown_txt_ui.background_image')
       from jalviewDir + '/' + project.getProperty('getdown_txt_ui.error_background')
       from jalviewDir + '/' + project.getProperty('getdown_txt_ui.progress_image')
@@ -615,6 +627,7 @@ task getdownWebsite() {
 task getdownDigest(type: JavaExec) {
   dependsOn getdownWebsite
   classpath = files(jalviewDir + '/' + getdown_core)
+  classpath file(jalviewDir + '/' + getdown_lib1)
   main = "com.threerings.getdown.tools.Digester"
   args project.ext.getdownWebsiteDir
   outputs.file(project.ext.getdownWebsiteDir + '/' + "digest2.txt")
diff --git a/getdown/lib/commons-compress-1.18.jar b/getdown/lib/commons-compress-1.18.jar
new file mode 100644
index 0000000..e401046
Binary files /dev/null and b/getdown/lib/commons-compress-1.18.jar differ
diff --git a/gradle.properties b/gradle.properties
index c794c66..d7dddcb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
 #org.gradle.java.home = /Users/bsoares/Java/installs/OpenJDK8U-jdk_x64_mac_hotspot_8u192b12/jdk8u192-b12/Contents/Home
 jalviewDir = .
 
+JAVA_VERSION = 1.8
 JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
 jalview_keystore = keys/.keystore
@@ -50,6 +51,7 @@ getdown_j11lib_dir = j11lib
 getdown_files_dir = getdown/files
 getdown_launcher = getdown/lib/getdown-launcher.jar
 getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
+getdown_lib1 = getdown/lib/commons-compress-1.18.jar
 getdown_base_txt = getdown/files/getdown.txt
 getdown_txt_title = Jalview
 getdown_txt_appbase = http://www.jalview.org/getdown/jalview/DEV
diff --git a/utils/install4j/commons-compress-1.18.jar b/utils/install4j/commons-compress-1.18.jar
new file mode 100644
index 0000000..e401046
Binary files /dev/null and b/utils/install4j/commons-compress-1.18.jar differ
diff --git a/utils/install4j/jalview_getdown.install4j b/utils/install4j/jalview_getdown.install4j
index 666e846..0282247 100644
--- a/utils/install4j/jalview_getdown.install4j
+++ b/utils/install4j/jalview_getdown.install4j
@@ -91,6 +91,7 @@
       <java mainClass="com.threerings.getdown.launcher.GetdownApp" mainMode="1" vmParameters="" arguments="." allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
         <classPath>
           <archive location="getdown-launcher.jar" failOnError="false" />
+          <archive location="commons-compress-1.18.jar" failOnError="false" />
         </classPath>
         <modulePath />
         <nativeLibraryDirectories />
@@ -124,6 +125,7 @@
       <java mainClass="com.threerings.getdown.launcher.GetdownApp" mainMode="1" vmParameters="" arguments="." allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
         <classPath>
           <archive location="getdown-launcher.jar" failOnError="false" />
+          <archive location="commons-compress-1.18.jar" failOnError="false" />
         </classPath>
         <modulePath />
         <nativeLibraryDirectories />
@@ -157,6 +159,7 @@
       <java mainClass="com.threerings.getdown.launcher.GetdownApp" mainMode="1" vmParameters="" arguments="." allowVMPassthroughParameters="true" preferredVM="" bundleRuntime="true">
         <classPath>
           <archive location="getdown-launcher.jar" failOnError="false" />
+          <archive location="commons-compress-1.18.jar" failOnError="false" />
         </classPath>
         <modulePath />
         <nativeLibraryDirectories />