--- build.xml.java1.5	2011-10-24 22:10:29.000000000 +0100

+++ build.xml	2016-09-15 14:52:27.047032691 +0100

@@ -17,14 +17,14 @@

     </target>

     <target name="compile" description="Compile everything">

-	<javac destdir="${build_dir}" debug="true" target="1.4" source="1.4">

+	<javac destdir="${build_dir}" debug="true" target="1.5" source="1.4">

 	    <src path="${src_dir}"/>

 	    <exclude name="tests/**"/>

 	</javac>

     </target>

     <target name="spi" description="Compile the Name Service Provider code">

-	<javac destdir="${build_dir}" debug="true" target="1.4" source="1.4">

+	<javac destdir="${build_dir}" debug="true" target="1.5" source="1.4">

 	    <src path="${src_dir}"/>

 	    <include name="org/xbill/DNS/spi/*.java"/>

 	</javac>

@@ -35,6 +35,7 @@

 		basedir="${build_dir}" includes="**/*.class **/*.properties">

 	    <exclude name="org/xbill/DNS/tests/*.class"/>

 	    <exclude name="tests/**"/>

+	    <exclude name="*.class"/>

 	    <manifest>

 		<attribute name="Implementation-Title" value="dnsjava"/>

 		<attribute name="Implementation-Version" value="${version}"/>

@@ -46,21 +47,18 @@

     </target>

 	<target name="bundle" description="Creates an OSGi bundle" depends="jar">

-		<get src="http://www.aqute.biz/repo/biz/aQute/bnd/0.0.384/bnd-0.0.384.jar"

-			dest="${build_dir}/bnd.jar"/>

-		<taskdef resource="aQute/bnd/ant/taskdef.properties"

-			classpath="${build_dir}/bnd.jar"/> 

+		<taskdef resource="aQute/bnd/ant/taskdef.properties"/>

 		<echo file="${dist_dir}/dnsjava-${version}.bnd" append="false">

 			Bundle-Version: ${version}

 			Bundle-Name: dnsjava is an implementation of DNS in Java

 			Bundle-SymbolicName: org.xbill.dns

 			Export-Package: org.xbill.DNS;version=${version},org.xbill.DNS.spi;version=${version},org.xbill.DNS.utils;version=${version},org.xbill.DNS.windows;version=${version}

 			Bundle-Vendor: dnsjava.org

-			Bundle-RequiredExecutionEnvironment: J2SE-1.4

+			Bundle-RequiredExecutionEnvironment: J2SE-1.5

 			Import-Package: !org.xbill.DNS*,!sun.*,*

 		</echo>

 		<bndwrap

-			definitions="${dist_dir}"

+			definitions="${dist_dir}/dnsjava-${version}.bnd"

 			jars="${dist_dir}/${jarname}"

 			output="${dist_dir}/org.xbill.dns_${version}.jar"/>

 		<delete file="${dist_dir}/dnsjava-${version}.bnd"/>

@@ -77,7 +75,7 @@

 	<javadoc destdir="${doc_dir}"

 		 sourcepath="${src_dir}"

 		 packagenames="org.xbill.DNS,org.xbill.DNS.utils,org.xbill.DNS.spi"

-		 windowtitle="dnsjava documentation">

+		 windowtitle="dnsjava documentation" additionalparam="-Xdoclint:none">

 	    <link href="${j2se.javadoc}"/>

 	</javadoc>

@@ -107,7 +105,7 @@

     </target>

     <target name="compile_tests" depends="compile">

-	<javac destdir="${tests_dir}" debug="true" target="1.4" source="1.4">

+	<javac destdir="${tests_dir}" debug="true" target="1.5" source="1.4">

 	    <src path="${tests_dir}"/>

 	</javac>

     </target>