1f603e
--- build.xml~	2021-05-17 12:32:48.406394876 +0200
1f603e
+++ build.xml	2021-05-17 12:32:39.990389601 +0200
1f603e
@@ -145,8 +145,6 @@
1f603e
      -->
1f603e
     <pathelement location="${src.junit}"/>
1f603e
     <pathelement location="${tests.etc.dir}"/>
1f603e
-    
1f603e
-    <pathelement location="${java.home}/../lib/tools.jar"/>
1f603e
   </path>
1f603e
 
1f603e
   
1f603e
@@ -819,7 +817,6 @@
1f603e
       </metainf>
1f603e
       <manifest>
1f603e
         <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
1f603e
-        <attribute name="Class-Path" value="ant.jar xalan.jar"/>
1f603e
       </manifest>
1f603e
     </jar>
1f603e
 
1f603e
@@ -1562,7 +1559,25 @@
1f603e
              verbose="${javadoc.verbose}"
1f603e
              additionalparam="${javadoc.doclint.none}">
1f603e
 
1f603e
-      <packageset dir="${java.dir}"/>
1f603e
+      <fileset dir="${java.dir}">
1f603e
+        <include name="**/*.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
1f603e
+        <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
1f603e
+      </fileset>
1f603e
 
1f603e
       
1f603e
       <tag name="todo" description="To do:" scope="all"/>