--- a/build.xml	2015-02-04 08:47:37.000000000 +0100
+++ b/build.xml	2015-02-17 14:06:42.455283148 +0100
@@ -43,16 +43,6 @@
 	<property name="textAreaPackage"
 		  location="../textarea"/>
 
-	<!-- Ivy Properties -->
-	<property name="config.ivy.version"
-		  value="2.2.0"/>
-	<property name="ivy.jar.dir"
-		  location="${lib.dir}/ivy"/>
-	<property name="ivy.jar.filename"
-		  value="ivy-${config.ivy.version}.jar"/>
-	<property name="ivy.jar.file"
-		  location="${ivy.jar.dir}/${ivy.jar.filename}"/>
-
 	<!-- Miscellaneous -->
 	<property name="jar.filename"
 		  value="${ant.project.name}.jar"/>
@@ -90,51 +80,8 @@
 			  value="true"/>
 	</target>
 
-	<target name="check-ivy"
-		depends="init">
-		<available property="ivy.jar.present"
-			   file="${ivy.jar.file}"
-			   type="file"/>
-	</target>
-
-	<target name="download-ivy"
-		depends="init,check-ivy"
-		unless="ivy.jar.present">
-		<mkdir dir="${ivy.jar.dir}"/>
-		<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${config.ivy.version}/ivy-${config.ivy.version}.jar"
-		     dest="${ivy.jar.file}"
-		     usetimestamp="true"/>
-	</target>
-
-	<target name="init-ivy"
-		depends="init,download-ivy"
-		unless="ivy.done">
-		<property name="ivy.retrieve.pattern"
-			  value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/>
-		<taskdef resource="org/apache/ivy/ant/antlib.xml"
-			 classpath="${ivy.jar.file}"
-			 loaderref="ivy.loader"
-			 uri="antlib:org.apache.ivy.ant"/>
-		<ivy:settings file="ivysettings.xml"/>
-	</target>
-
-	<target name="retrieve"
-		description="retrieve the dependencies"
-		depends="init,init-ivy"
-		unless="ivy.done">
-		<ivy:retrieve sync="true"/>
-		<ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"
-			      organisation="org.apache.ivy"
-			      module="ivy"
-			      revision="${config.ivy.version}"
-			      conf="default"
-			      inline="true"/>
-		<property name="ivy.done"
-			  value="true"/>
-	</target>
-
 	<target name="setup"
-		depends="init,retrieve">
+		depends="init">
 		<taskdef resource="net/sf/antcontrib/antlib.xml"
 			 uri="antlib:net.sf.antcontrib">
 			<classpath>
@@ -239,37 +186,6 @@
 		</javac>
 	</target>
 
-	<target name="compile-test"
-		depends="init,retrieve,compile">
-		<mkdir dir="${classes.dir}/test"/>
-		<depend srcDir="${basedir}/test"
-			destDir="${classes.dir}/test"
-			cache="${classes.dir}"/>
-		<dependset>
-			<srcfilelist files="build.xml"/>
-			<srcfilelist files="ivy.xml"/>
-			<targetfileset dir="${classes.dir}/test"/>
-		</dependset>
-		<javac srcdir="test"
-		       destdir="${classes.dir}/test"
-		       debug="true"
-		       debuglevel="${config.build.debuglevel}"
-		       nowarn="${config.build.nowarn}"
-		       deprecation="${config.build.deprecation}"
-		       source="${target.java.version}"
-		       target="${target.java.version}"
-		       compiler="modern"
-		       encoding="UTF-8"
-		       includeAntRuntime="false">
-			<classpath id="classpath.test">
-				<fileset dir="${lib.dir}/test"
-					 includes="*.jar"/>
-				<pathelement location="${classes.dir}/core"/>
-			</classpath>
-			<compilerarg line="${config.build.compilerarg}"/>
-		</javac>
-	</target>
-
 	<target name="prepare-textArea"
 		depends="init">
 		<delete includeemptydirs="true"
@@ -423,33 +339,8 @@
 		</javac>
 	</target>
 
-	<target name="test"
-		depends="init,retrieve,compile,compile-test"
-		description="run unit tests"
-		unless="skip.tests">
-		<delete dir="${build.dir}/test/raw-reports"/>
-		<mkdir dir="${build.dir}/test/raw-reports"/>
-		<junit printsummary="true"
-		       failureproperty="tests.failed"
-		       enabletestlistenerevents="true">
-			<classpath refid="classpath.test"/>
-			<classpath location="${classes.dir}/test"/>
-			<formatter type="xml"/>
-			<batchtest todir="${build.dir}/test/raw-reports">
-				<fileset dir="test"/>
-			</batchtest>
-		</junit>
-		<mkdir dir="${build.dir}/test/merged-reports"/>
-		<junitreport todir="${build.dir}/test/merged-reports">
-			<fileset dir="${build.dir}/test/raw-reports"/>
-			<report todir="${build.dir}/test/reports"/>
-		</junitreport>
-		<fail message="Unit test(s) failed! See reports at ${build.dir}/test/reports/index.html"
-		      if="tests.failed"/>
-	</target>
-
 	<target name="build"
-		depends="init,retrieve,setup,compile"
+		depends="init,setup,compile"
 		description="build the jEdit JAR-file with full debug-information">
 		<mkdir dir="${jar.location}"/>
 		<jar destfile="${jar.location}/${jar.filename}"
@@ -504,11 +395,10 @@
 				</copy>
 			</contrib:then>
 		</contrib:if>
-		<antcall target="test" />
 	</target>
 
 	<target name="build-exe-launcher"
-		depends="init,retrieve,setup,filter-package-files"
+		depends="init,setup,filter-package-files"
 		description="build the EXE launcher">
 		<contrib:if>
 			<os family="windows"/>
@@ -622,7 +512,7 @@
 	</target>
 
 	<target name="unpack-docbook-xsl"
-		depends="init,retrieve">
+		depends="init">
 		<unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip"
 		       dest="${build.dir}/docbook-xsl/"/>
 	</target>
@@ -668,7 +558,7 @@
 	</presetdef>
 
 	<target name="generate-doc-faq"
-		depends="init,retrieve,setup,unpack-docbook-xsl">
+		depends="init,setup,unpack-docbook-xsl">
 		<dependset.html>
 			<srcfileset dir="doc/FAQ"/>
 			<targetfileset dir="${jar.location}/doc/FAQ"/>
@@ -692,7 +582,7 @@
 	</target>
 
 	<target name="generate-doc-news"
-		depends="init,retrieve,setup,unpack-docbook-xsl">
+		depends="init,setup,unpack-docbook-xsl">
 		<dependset.html>
 			<srcfileset dir="doc/whatsnew"/>
 			<targetfileset dir="${jar.location}/doc/whatsnew"/>
@@ -716,7 +606,7 @@
 	</target>
 
 	<target name="generate-doc-users-guide"
-		depends="init,retrieve,setup,unpack-docbook-xsl">
+		depends="init,setup,unpack-docbook-xsl">
 		<dependset.html>
 			<srcfileset dir="doc/users-guide"/>
 			<targetfileset dir="${jar.location}/doc/users-guide"/>
@@ -851,7 +741,7 @@
 	</target>
 
 	<target name="generate-pdf-users-guide"
-		depends="init,retrieve,setup,unpack-docbook-xsl">
+		depends="init,setup,unpack-docbook-xsl">
 		<fail message="Please set the property &quot;paper.type&quot;"
 		      unless="paper.type"/>
 		<contrib:switch value="${paper.type}">
@@ -1154,7 +1044,7 @@
 	</target>
 
 	<target name="compile-jarbundler"
-		depends="init,retrieve">
+		depends="init">
 		<mkdir dir="${classes.dir}/jarbundler"/>
 		<depend srcDir="${basedir}"
 			destDir="${classes.dir}/jarbundler"
@@ -1180,7 +1070,7 @@
 	</target>
 
 	<target name="dist-mac-finish"
-		depends="init,retrieve,setup"
+		depends="init,setup"
 		description="finish building the Mac OS X disk image (DMG-file) on Mac OS X">
 		<fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently">
 			<condition>
@@ -1295,7 +1185,7 @@
 	</target>
 
 	<target name="dist-mac"
-		depends="init,retrieve,setup,prepare-dist-files"
+		depends="init,setup,prepare-dist-files"
 		description="build the Mac OS X disk image (DMG-file)">
 		<antcall target="compile-jarbundler">
 			<param name="config.build.debuglevel"
@@ -1411,7 +1301,7 @@
 	</target>
 
 	<target name="prepare-dist-files"
-		depends="init,retrieve,setup">
+		depends="init,setup">
 		<antcall target="build">
 			<param name="config.build.debuglevel"
 			       value="lines,source"/>
@@ -1592,7 +1482,7 @@
 	</target>
 
 	<target name="dist-deb"
-		depends="init,retrieve,setup,prepare-dist-files"
+		depends="init,setup,prepare-dist-files"
 		description="build the DEB Package">
 		<antcall target="compile-ar">
 			<param name="config.build.debuglevel"
@@ -1838,7 +1728,7 @@
 	</target>
 
 	<target name="dist-sign-deb-Release"
-		depends="init,retrieve,setup"
+		depends="init,setup"
 		description="sign the DEB Release file">
 		<contrib:if>
 			<not>