From 9a7bcc175eaff89ab25000683cd2c8d1085e6f04 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 10 Feb 2017 00:18:24 +0800
Subject: [PATCH] Apache Ant 1.10.1

---
 build.xml | 43 +++++++++++++++++++------------------------
 ivy.xml   | 13 ++++++-------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/build.xml b/build.xml
index f9625d17..e98b852e 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<project name="filebot" default="fatjar" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:cmp="antlib:org.apache.ant.compress">
+<project name="filebot" default="fatjar" xmlns:ivy="antlib:org.apache.ivy.ant">
 
 	<!-- define source dirs -->
 	<property name="dir.source" location="${basedir}/source" />
@@ -350,16 +350,14 @@
 			<bundledocument role="viewer" handlerRank="none" contentTypes="public.folder" name="Media folder" />
 		</bundleapp>
 
-		<!-- application bundle folder as .tar -->
-		<cmp:xz destfile="${dir.dist}/${release}-darwin.tar.xz">
-			<cmp:tar format="gnu" encoding="utf-8">
-				<cmp:tarfileset dir="${dir.dist}" includes="${application.name}.app/**" excludes="**/MacOS/**" />
-				<cmp:tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.dylib" />
+		<!-- application bundle folder as tar -->
+		<tar destfile="${dir.dist}/${release}-darwin.tar.xz" compression="xz" longfile="posix" encoding="utf-8">
+			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**" excludes="**/MacOS/**" />
+			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.dylib" />
 
-				<cmp:tarfileset dir="${dir.dist}" includes="${application.name}.app/**/fpcalc" filemode="755" />
-				<cmp:tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.sh" filemode="755" />
-			</cmp:tar>
-		</cmp:xz>
+			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**/fpcalc" filemode="755" />
+			<tarfileset dir="${dir.dist}" includes="${application.name}.app/**/**.sh" filemode="755" />
+		</tar>
 	</target>
 
 
@@ -663,19 +661,17 @@
 
 
 	<target name="portable" description="Build portable package" depends="revision">
-		<cmp:xz destfile="${dir.dist}/${release}-portable.tar.xz">
-			<cmp:tar format="gnu" encoding="utf-8">
-				<cmp:tarfileset file="${path.fatjar}" fullpath="FileBot.jar" />
-				<cmp:tarfileset dir="${dir.installer}/portable" includes="*.exe, *.ini, *.cmd" />
-				<cmp:tarfileset dir="${dir.installer}/portable" includes="*.sh" filemode="755" />
+		<tar destfile="${dir.dist}/${release}-portable.tar.xz" compression="xz" longfile="posix" encoding="utf-8">
+			<tarfileset file="${path.fatjar}" fullpath="FileBot.jar" />
+			<tarfileset dir="${dir.installer}/portable" includes="*.exe, *.ini, *.cmd" />
+			<tarfileset dir="${dir.installer}/portable" includes="*.sh" filemode="755" />
 
-				<!-- include native libraries for all supported platforms -->
-				<cmp:tarfileset prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="*.so" />
-				<cmp:tarfileset prefix="lib/armv8" dir="${dir.lib}/native/linux-armv8" includes="*.so" />
-				<cmp:tarfileset prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
-				<cmp:tarfileset prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
-			</cmp:tar>
-		</cmp:xz>
+			<!-- include native libraries for all supported platforms -->
+			<tarfileset prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="*.so" />
+			<tarfileset prefix="lib/armv8" dir="${dir.lib}/native/linux-armv8" includes="*.so" />
+			<tarfileset prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
+			<tarfileset prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
+		</tar>
 	</target>
 
 
@@ -775,7 +771,6 @@
 		<path id="lib.classpath">
 			<fileset dir="${dir.lib}" includes="**/*.jar" excludes="**/*-jdk14.jar" />
 		</path>
-		<taskdef uri="antlib:org.apache.ant.compress" resource="org/apache/ant/compress/antlib.xml" classpathref="lib.classpath" />
 		<taskdef resource="net/filebot/ant/spk/antlib.xml" classpathref="lib.classpath" />
 		<taskdef resource="org/vafer/jdeb/ant/antlib.xml" classpathref="lib.classpath" />
 		<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpathref="lib.classpath" />
@@ -935,7 +930,7 @@
 
 
 	<target name="deploy-beta-jar" depends="fatjar" description="Build and deploy the latest jar">
-		<cmp:xz srcfile="${path.fatjar}" destfile="${path.fatjar}.xz" />
+		<xz src="${path.fatjar}" dest="${path.fatjar}.xz" />
 		<scp file="${path.fatjar}.xz" remoteTofile="${deploy.release}/HEAD/filebot-r${revision}.jar.xz" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}" />
 		<scp file="${path.fatjar}.xz" remoteTofile="${deploy.release}/HEAD/FileBot.jar.xz" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}" />
 	</target>
diff --git a/ivy.xml b/ivy.xml
index 6363103f..31112d1b 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -28,16 +28,15 @@
 		<dependency rev="3.0.0-beta3" org="com.googlecode.lanterna" name="lanterna" />
 
 		<!-- FileBot Scripting -->
-		<dependency rev="1.10.0" org="org.apache.ant" name="ant" />
-		<dependency rev="1.10.0" org="org.apache.ant" name="ant-launcher" />
-		<dependency rev="1.10.0" org="org.apache.ant" name="ant-commons-net" />
-		<dependency rev="1.10.0" org="org.apache.ant" name="ant-javamail" />
-		<dependency rev="1.10.0" org="org.apache.ant" name="ant-jsch" />
+		<dependency rev="1.10.1" org="org.apache.ant" name="ant" />
+		<dependency rev="1.10.1" org="org.apache.ant" name="ant-launcher" />
+		<dependency rev="1.10.1" org="org.apache.ant" name="ant-commons-net" />
+		<dependency rev="1.10.1" org="org.apache.ant" name="ant-javamail" />
+		<dependency rev="1.10.1" org="org.apache.ant" name="ant-jsch" />
 		<dependency rev="2.4.0" org="org.apache.ivy" name="ivy" />
 
 		<!-- FileBot Ant Build -->
-		<dependency rev="1.10.0" org="org.apache.ant" name="ant-junit" />
-		<dependency rev="1.13" org="org.apache.commons" name="commons-compress" />
+		<dependency rev="1.10.1" org="org.apache.ant" name="ant-junit" />
 		<dependency rev="0.5" org="net.filebot" name="ant-spk" />
 		<dependency rev="1.5" org="org.vafer" name="jdeb" />
 	</dependencies>