diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index 17a9bb6a9..d5c2616ba 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -38,6 +38,7 @@ import java.util.Stack;
 
 import org.apache.tools.ant.launch.Launcher;
 import org.apache.tools.ant.taskdefs.Definer;
+import org.apache.tools.ant.taskdefs.Property;
 import org.apache.tools.ant.taskdefs.Typedef;
 import org.apache.tools.ant.util.FileUtils;
 
@@ -522,7 +523,7 @@ public class ComponentHelper  {
         if (task == null && taskType.equals(ANT_PROPERTY_TASK)) {
             // quick fix for Ant.java use of property before
             // initializing the project
-            addTaskDefinition(ANT_PROPERTY_TASK, org.apache.tools.ant.taskdefs.Property.class);
+            addTaskDefinition(ANT_PROPERTY_TASK, Property.class);
             task = createNewTask(taskType);
         }
         return task;
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index 80180cd0a..7ba3cd905 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -445,6 +445,7 @@ public final class Diagnostics {
 
     /**
      * Call org.apache.env.Which if available
+     *
      * @param out the stream to print the content to.
      */
     private static void doReportWhich(PrintStream out) {
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index 8ad811154..8c5e825b2 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -17,6 +17,7 @@
  */
 package org.apache.tools.ant;
 
+import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -187,30 +188,30 @@ public final class IntrospectionHelper {
             final Class<?>[] args = m.getParameterTypes();
 
             // check of add[Configured](Class) pattern
-            if (args.length == 1 && java.lang.Void.TYPE.equals(returnType)
+            if (args.length == 1 && Void.TYPE.equals(returnType)
                     && ("add".equals(name) || "addConfigured".equals(name))) {
                 insertAddTypeMethod(m);
                 continue;
             }
             // not really user settable properties on tasks/project components
-            if (org.apache.tools.ant.ProjectComponent.class.isAssignableFrom(bean)
+            if (ProjectComponent.class.isAssignableFrom(bean)
                     && args.length == 1 && isHiddenSetMethod(name, args[0])) {
                 continue;
             }
             // hide addTask for TaskContainers
             if (isContainer() && args.length == 1 && "addTask".equals(name)
-                    && org.apache.tools.ant.Task.class.equals(args[0])) {
+                    && Task.class.equals(args[0])) {
                 continue;
             }
-            if ("addText".equals(name) && java.lang.Void.TYPE.equals(returnType)
-                    && args.length == 1 && java.lang.String.class.equals(args[0])) {
+            if ("addText".equals(name) && Void.TYPE.equals(returnType)
+                    && args.length == 1 && String.class.equals(args[0])) {
                 addTextMethod = methods[i];
-            } else if (name.startsWith("set") && java.lang.Void.TYPE.equals(returnType)
+            } else if (name.startsWith("set") && Void.TYPE.equals(returnType)
                     && args.length == 1 && !args[0].isArray()) {
                 final String propName = getPropertyName(name, "set");
                 AttributeSetter as = attributeSetters.get(propName);
                 if (as != null) {
-                    if (java.lang.String.class.equals(args[0])) {
+                    if (String.class.equals(args[0])) {
                         /*
                             Ignore method m, as there is an overloaded
                             form of this method that takes in a
@@ -219,7 +220,7 @@ public final class IntrospectionHelper {
                         */
                         continue;
                     }
-                    if (java.io.File.class.equals(args[0])) {
+                    if (File.class.equals(args[0])) {
                         // Ant Resources/FileProviders override java.io.File
                         if (Resource.class.equals(as.type) || FileProvider.class.equals(as.type)) {
                             continue;
@@ -251,8 +252,8 @@ public final class IntrospectionHelper {
                     nestedCreators.put(propName, new CreateNestedCreator(m));
                 }
             } else if (name.startsWith("addConfigured")
-                    && java.lang.Void.TYPE.equals(returnType) && args.length == 1
-                    && !java.lang.String.class.equals(args[0])
+                    && Void.TYPE.equals(returnType) && args.length == 1
+                    && !String.class.equals(args[0])
                     && !args[0].isArray() && !args[0].isPrimitive()) {
                 try {
                     Constructor<?> constructor = null;
@@ -269,8 +270,8 @@ public final class IntrospectionHelper {
                     // ignore
                 }
             } else if (name.startsWith("add")
-                    && java.lang.Void.TYPE.equals(returnType) && args.length == 1
-                    && !java.lang.String.class.equals(args[0])
+                    && Void.TYPE.equals(returnType) && args.length == 1
+                    && !String.class.equals(args[0])
                     && !args[0].isArray() && !args[0].isPrimitive()) {
                 try {
                     Constructor<?> constructor = null;
@@ -308,10 +309,10 @@ public final class IntrospectionHelper {
      * @return true if the given set method is to be hidden.
      */
     private boolean isHiddenSetMethod(final String name, final Class<?> type) {
-        if ("setLocation".equals(name) && org.apache.tools.ant.Location.class.equals(type)) {
+        if ("setLocation".equals(name) && Location.class.equals(type)) {
             return true;
         }
-        if ("setTaskType".equals(name) && java.lang.String.class.equals(type)) {
+        if ("setTaskType".equals(name) && String.class.equals(type)) {
             return true;
         }
         return false;
@@ -1060,7 +1061,7 @@ public final class IntrospectionHelper {
             };
         }
         // simplest case - setAttribute expects String
-        if (java.lang.String.class.equals(reflectedArg)) {
+        if (String.class.equals(reflectedArg)) {
             return new AttributeSetter(m, arg) {
                 @Override
                 public void set(final Project p, final Object parent, final String value)
@@ -1695,7 +1696,7 @@ public final class IntrospectionHelper {
                 if (exposedClass == null) {
                     continue;
                 }
-                final Method method  = findMatchingMethod(exposedClass, methods);
+                final Method method = findMatchingMethod(exposedClass, methods);
                 if (method == null) {
                     continue;
                 }
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 271421aff..9d4a99779 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -38,6 +38,7 @@ import java.util.WeakHashMap;
 import org.apache.tools.ant.helper.DefaultExecutor;
 import org.apache.tools.ant.input.DefaultInputHandler;
 import org.apache.tools.ant.input.InputHandler;
+import org.apache.tools.ant.launch.Locator;
 import org.apache.tools.ant.types.Description;
 import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
@@ -326,7 +327,7 @@ public class Project implements ResourceFactory {
      * to the result
      */
     private void setAntLib() {
-        final File antlib = org.apache.tools.ant.launch.Locator.getClassSource(
+        final File antlib = Locator.getClassSource(
             Project.class);
         if (antlib != null) {
             setPropertyInternal(MagicNames.ANT_LIB, antlib.getAbsolutePath());
diff --git a/src/main/org/apache/tools/ant/input/InputHandler.java b/src/main/org/apache/tools/ant/input/InputHandler.java
index aea60fcc0..a71546ffe 100644
--- a/src/main/org/apache/tools/ant/input/InputHandler.java
+++ b/src/main/org/apache/tools/ant/input/InputHandler.java
@@ -18,6 +18,8 @@
 
 package org.apache.tools.ant.input;
 
+import org.apache.tools.ant.BuildException;
+
 /**
  * Plugin to Ant to handle requests for user input.
  *
@@ -34,8 +36,8 @@ public interface InputHandler {
      * <p>Postcondition: request.getInput will return a non-null
      * value, request.isInputValid will return true.</p>
      * @param request the request to be processed
-     * @throws org.apache.tools.ant.BuildException if the input cannot be read from the console
+     * @throws BuildException if the input cannot be read from the console
      */
     void handleInput(InputRequest request)
-        throws org.apache.tools.ant.BuildException;
+        throws BuildException;
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
index 961a3c830..c4d3ad725 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
@@ -222,7 +222,7 @@ public class MakeUrl extends Task {
     /**
      * Create the url
      *
-     * @throws org.apache.tools.ant.BuildException
+     * @throws BuildException
      *          if something goes wrong with the build
      */
     @Override
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rename.java b/src/main/org/apache/tools/ant/taskdefs/Rename.java
index f4199bb2c..cce74e279 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rename.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rename.java
@@ -69,8 +69,8 @@ public class Rename extends Task {
 
     /**
      * Renames the file <code>src</code> to <code>dest</code>
-     * @exception org.apache.tools.ant.BuildException The exception is
-     * thrown, if the rename operation fails.
+     *
+     * @throws BuildException if the rename operation fails
      */
     public void execute() throws BuildException {
         log("DEPRECATED - The rename task is deprecated.  Use move instead.");
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index aa762b188..a645e8609 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -591,7 +591,7 @@ public class Rmic extends MatchingTask {
     /**
      * execute by creating an instance of an implementation
      * class and getting to do the work
-     * @throws org.apache.tools.ant.BuildException
+     * @throws BuildException
      * if there's a problem with baseDir or RMIC
      */
     @Override
@@ -697,7 +697,7 @@ public class Rmic extends MatchingTask {
     /**
      * Move the generated source file(s) to the base directory
      *
-     * @throws org.apache.tools.ant.BuildException When error
+     * @throws BuildException When error
      * copying/removing files.
      */
     private void moveGeneratedFile(File baseDir, File sourceBaseFile, String classname,
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
index 5a59c1925..e9f99b9f5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
@@ -154,10 +154,9 @@ public class Sleep extends Task {
     }
 
     /**
-     * Executes this build task. Throws org.apache.tools.ant.BuildException
-     * if there is an error during task execution.
+     * Executes this build task.
      *
-     * @exception BuildException Description of Exception
+     * @throws BuildException if there is an error during task execution
      */
     @Override
     public void execute()
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index c341dc856..a7c6fa2e5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -41,6 +41,7 @@ import org.apache.tools.ant.DynamicConfigurator;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.PropertyHelper;
+import org.apache.tools.ant.taskdefs.optional.TraXLiaison;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Environment;
 import org.apache.tools.ant.types.Mapper;
@@ -697,7 +698,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
      */
     private void resolveProcessor(final String proc) throws Exception {
         if (PROCESSOR_TRAX.equals(proc)) {
-            liaison = new org.apache.tools.ant.taskdefs.optional.TraXLiaison();
+            liaison = new TraXLiaison();
         } else {
             //anything else is a classname
             final Class<? extends XSLTLiaison> clazz = loadClass(proc).asSubclass(XSLTLiaison.class);
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index e73a2212a..e69a23de4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
@@ -176,7 +177,7 @@ import org.xml.sax.SAXException;
  *
  * @ant.task name="xmlproperty" category="xml"
  */
-public class XmlProperty extends org.apache.tools.ant.Task {
+public class XmlProperty extends Task {
     private static final String ID = "id";
     private static final String REF_ID = "refid";
     private static final String LOCATION = "location";
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
index 9083dd609..296208748 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
@@ -136,7 +136,7 @@ public class IsReachable extends ProjectComponent implements Condition {
      *
      * @return true if the condition is true.
      *
-     * @throws org.apache.tools.ant.BuildException
+     * @throws BuildException
      *          if an error occurs
      */
     @Override
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
index 4478f3375..5a0ac8171 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
@@ -31,7 +31,7 @@ public class Xor extends ConditionBase implements Condition {
     /**
      * Evaluate the contained conditions.
      * @return the result of xoring the conditions together.
-     * @throws org.apache.tools.ant.BuildException
+     * @throws BuildException
      *          if an error occurs.
      */
     @Override
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
index 9a9829eba..cb6faf81d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -431,7 +431,6 @@ public class CvsTagDiff extends AbstractCvsTask {
             if (writer.checkError()) {
                 throw new IOException("Encountered an error writing tagdiff");
             }
-            writer.close();
         } catch (UnsupportedEncodingException uee) {
             log(uee.toString(), Project.MSG_ERR);
         } catch (IOException ioe) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index 423fdbdb7..f2c6a0477 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
@@ -779,8 +779,8 @@ public class NetRexxC extends MatchingTask {
 
         final String eol = System.getProperty("line.separator");
         log(
-            compileList.stream().map(s -> "    " + s).collect(Collectors.joining(eol))
-            , Project.MSG_VERBOSE);
+            compileList.stream().map(s -> "    " + s).collect(Collectors.joining(eol)),
+                Project.MSG_VERBOSE);
 
         // create a single array of arguments for the compiler
         String[] compileArgs =
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
index 7a60589a9..6c1566cb2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
@@ -321,7 +321,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool
      * @param sourceJar java.io.File representing the produced jar file
      */
     private void verifyBorlandJarV4(File sourceJar) {
-        org.apache.tools.ant.taskdefs.Java javaTask = null;
+        Java javaTask = null;
         log("verify BAS " + sourceJar, Project.MSG_INFO);
         try  {
             String args = verifyArgs;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
index ab23491a9..8752583f6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
@@ -45,7 +45,7 @@ public class OrionDeploymentTool extends GenericDeploymentTool {
      * @param ejbFiles Hashtable&lt;String, File&gt;
      * @param baseName String
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String baseName) {
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String baseName) {
         String ddPrefix = usingBaseJarName() ? "" : baseName;
         File orionDD = new File(getConfig().descriptorDir, ddPrefix + ORION_DD);
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
index b5296bdfb..148542d61 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
@@ -85,7 +85,7 @@ public abstract class AbstractHotDeploymentTool implements HotDeploymentTool {
      *  validation of boilerplate attributes.
      *  <p>Only the "action" attribute is required in the
      *  base class.  Subclasses should check attributes accordingly.
-     *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
+     *  @throws BuildException if the attributes are invalid or incomplete.
      */
     @Override
     public void validateAttributes() throws BuildException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
index 1cb0a7eec..e2d878cb2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
@@ -90,7 +90,7 @@ public class GenericHotDeploymentTool extends AbstractHotDeploymentTool {
      *  Perform the actual deployment.
      *  For this generic implementation, a JVM is spawned using the
      *  supplied classpath, classname, JVM args, and command line arguments.
-     *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
+     *  @exception BuildException if the attributes are invalid or incomplete.
      */
     @Override
     public void deploy() throws BuildException {
@@ -104,7 +104,7 @@ public class GenericHotDeploymentTool extends AbstractHotDeploymentTool {
     /**
      *  Validates the passed in attributes.
      *  Ensures the className and arguments attribute have been set.
-     *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
+     *  @throws BuildException if the attributes are invalid or incomplete.
      */
     @Override
     public void validateAttributes() throws BuildException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java
index 16c55d8e7..dae9667c8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java
@@ -43,13 +43,13 @@ public interface HotDeploymentTool {
 
     /**
      *  Validates the passed in attributes.
-     *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
+     *  @exception BuildException if the attributes are invalid or incomplete.
      */
     void validateAttributes() throws BuildException;
 
     /**
      *  Perform the actual deployment.
-     *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
+     *  @throws BuildException if the attributes are invalid or incomplete.
      */
     void deploy() throws BuildException;
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java
index 7947a7b81..12901d703 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java
@@ -97,7 +97,7 @@ public class ServerDeploy extends Task {
      *  <p>This method calls the deploy() method on each of the vendor-specific tools
      *  in the <code>vendorTools</code> collection.  This performs the actual
      *  process of deployment on each tool.
-     *  @exception org.apache.tools.ant.BuildException if the attributes
+     *  @throws BuildException if the attributes
      *  are invalid or incomplete, or a failure occurs in the deployment process.
      */
     @Override
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 9a81ef1aa..2e56545a8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -33,6 +33,7 @@ import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
 import org.apache.tools.ant.taskdefs.LogOutputStream;
@@ -71,7 +72,7 @@ import org.apache.tools.ant.util.FileUtils;
  * discussion.
  *
  */
-public class Pvcs extends org.apache.tools.ant.Task {
+public class Pvcs extends Task {
     // CheckStyle - magic numbers
     // checking for "X:\ 0=dquote,1=letter,2=:,3=\
     private static final int POS_1 = 1;
@@ -157,7 +158,7 @@ public class Pvcs extends org.apache.tools.ant.Task {
     }
 
     /**
-     * @exception org.apache.tools.ant.BuildException Something is stopping the build...
+     * @throws BuildException Something is stopping the build...
      */
     @Override
     public void execute() throws BuildException {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
index 886d06da7..3cb120a36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
@@ -118,11 +118,8 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
             }
             getDir(channel, remoteFile, localFile);
         } catch (final SftpException e) {
-            final JSchException schException =
-                new JSchException("Could not get '" + remoteFile + "' to '"
-                    + localFile + "' - " + e.toString());
-            schException.initCause(e);
-            throw schException;
+            throw new JSchException("Could not get '" + remoteFile + "' to '"
+                + localFile + "' - " + e.toString(), e);
         } finally {
             if (channel != null) {
                 channel.disconnect();
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
index 83847ed34..0c61ecaae 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
@@ -32,6 +32,7 @@ package org.apache.tools.ant.taskdefs.optional.unix;
 import java.io.File;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.ExecuteOn;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.FileSet;
@@ -42,8 +43,7 @@ import org.apache.tools.ant.types.FileSet;
  * @ant.task category="filesystem"
  */
 
-public abstract class AbstractAccessTask
-    extends org.apache.tools.ant.taskdefs.ExecuteOn {
+public abstract class AbstractAccessTask extends ExecuteOn {
 
     /**
      * Chmod task for setting file and directory permissions.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index 3f8ec43a4..ba74f44a1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -211,7 +211,7 @@ public class Symlink extends DispatchTask {
                         // it's already a symlink and the symlink target is the same
                         // as the target noted in the properties file. So there's no
                         // need to recreate it
-                        log("not recreating " + lnk + " as it points to the correct target already" ,
+                        log("not recreating " + lnk + " as it points to the correct target already",
                             Project.MSG_DEBUG);
                         continue;
                     }
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index 3917833e6..7ad6a7d43 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -219,7 +219,7 @@ public class FilterSet extends DataType implements Cloneable {
             return getRef().getFilters();
         }
         dieOnCircularReference();
-        //silly hack to avoid stack overflow...
+        // silly hack to avoid stack overflow...
         if (!readingFiles) {
             readingFiles = true;
             final int size = filtersFiles.size();
diff --git a/src/main/org/apache/tools/ant/types/RedirectorElement.java b/src/main/org/apache/tools/ant/types/RedirectorElement.java
index b97abbcee..c21850f64 100644
--- a/src/main/org/apache/tools/ant/types/RedirectorElement.java
+++ b/src/main/org/apache/tools/ant/types/RedirectorElement.java
@@ -27,6 +27,7 @@ import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Redirector;
+import org.apache.tools.ant.util.MergingMapper;
 
 /**
  * Element representation of a <code>Redirector</code>.
@@ -556,8 +557,7 @@ public class RedirectorElement extends DataType {
      */
     protected Mapper createMergeMapper(File destfile) {
         Mapper result = new Mapper(getProject());
-        result.setClassname(
-            org.apache.tools.ant.util.MergingMapper.class.getName());
+        result.setClassname(MergingMapper.class.getName());
         result.setTo(destfile.getAbsolutePath());
         return result;
     }
diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java b/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
index 76b233762..4247a3fce 100644
--- a/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
+++ b/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
@@ -38,7 +38,7 @@ public class ScriptCondition extends AbstractScriptComponent implements Conditio
      *
      * @return true if the condition is true
      *
-     * @throws org.apache.tools.ant.BuildException
+     * @throws BuildException
      *          if an error occurs
      */
     @Override
diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java b/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java
index da9f0624c..d154d275b 100644
--- a/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java
+++ b/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java
@@ -86,7 +86,7 @@ public class ScriptSelector extends BaseSelector {
     /**
      * Initialize on demand.
      *
-     * @throws org.apache.tools.ant.BuildException
+     * @throws BuildException
      *          if something goes wrong
      */
     private void init() throws BuildException {
diff --git a/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java b/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
index 5a63fb79d..d94d08afe 100644
--- a/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
+++ b/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
@@ -77,7 +77,8 @@ public class TokenizedPath {
         tokenizedPath[parent.tokenizedPath.length] = child;
     }
 
-    /* package */ TokenizedPath(String path, String[] tokens) {
+    /* package */
+    TokenizedPath(String path, String[] tokens) {
         this.path = path;
         this.tokenizedPath = tokens;
     }
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index 3d050f8de..249d63c34 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -393,6 +393,7 @@ public class ModifiedSelector extends BaseExtendSelector
      * @param type the type to check against
      * @return a castable object
      */
+    @SuppressWarnings("unchecked")
     protected <T> T loadClass(String classname, String msg, Class<? extends T> type) {
         try {
             // load the specified class
diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java
index 971599214..8fd90f578 100644
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@ -295,9 +295,7 @@ public class TarInputStream extends FilterInputStream {
         try {
             currEntry = new TarEntry(headerBuf, encoding);
         } catch (IllegalArgumentException e) {
-            IOException ioe = new IOException("Error detected parsing the header");
-            ioe.initCause(e);
-            throw ioe;
+            throw new IOException("Error detected parsing the header", e);
         }
         if (debug) {
             System.err.println("TarInputStream: SET CURRENTRY '"
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
index 2a754ae76..4a73aec82 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -244,7 +244,7 @@ public class ZipTest {
 
     @Test
     public void testTarFileSet() throws IOException {
-       buildRule.executeTarget("testTarFileSet");
+        buildRule.executeTarget("testTarFileSet");
         org.apache.tools.zip.ZipFile zf = null;
         try {
             zf = new org.apache.tools.zip.ZipFile(new File(buildRule.getProject().getProperty("output"), "test3.zip"));
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RpmTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RpmTest.java
index ac4462d53..b557f4497 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RpmTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RpmTest.java
@@ -18,6 +18,7 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
 import org.apache.tools.ant.types.Commandline;
@@ -32,7 +33,7 @@ public class RpmTest {
     @Test
     public void testShouldThrowExceptionWhenRpmFails() throws Exception {
         Rpm rpm = new MyRpm();
-        rpm.setProject(new org.apache.tools.ant.Project());
+        rpm.setProject(new Project());
         rpm.setFailOnError(true);
         // execute
         try {
diff --git a/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java b/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java
index ce4f1620a..bb1b0daca 100644
--- a/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java
+++ b/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java
@@ -1,9 +1,9 @@
 package org.example.junitlauncher.vintage;
 
-import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  *
  */
@@ -11,6 +11,6 @@ public class AlwaysFailingJUnit4Test {
 
     @Test
     public void testWillFail() throws Exception {
-        Assert.assertEquals("Values weren't equal", 3, 4);
+        assertEquals("Values weren't equal", 3, 4);
     }
 }