indicated when methods/classes became deprecated, as to give us the possibility to remove deprecated methods in the future.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@396012 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/AntClassLoader.java

@@ -550,7 +550,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
      * @param theClass The class to initialize.
      *                 Must not be <code>null</code>.
      *
-     * @deprecated use Class.forName with initialize=true instead.
+     * @deprecated since 1.6.x.
+     *             Use Class.forName with initialize=true instead.
      */
     public static void initializeClass(Class theClass) {
         // ***HACK*** We ask the VM to create an instance

src/main/org/apache/tools/ant/DirectoryScanner.java

@@ -135,8 +135,9 @@ public class DirectoryScanner
      * that has only been kept around for backwards compatibility
      * reasons.</p>
      *
-     * @deprecated use the {@link #getDefaultExcludes
-     * getDefaultExcludes} method instead.
+     * @deprecated since 1.6.x.
+     *             Use the {@link #getDefaultExcludes getDefaultExcludes} 
+     *             method instead.
      */
     protected static final String[] DEFAULTEXCLUDES = {
         // Miscellaneous typical temporary files

src/main/org/apache/tools/ant/IntrospectionHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -540,7 +540,8 @@ public final class IntrospectionHelper implements BuildListener {
      *                    Must not be <code>null</code>.
      *
      * @return an instance of the specified element type
-     * @deprecated This is not a namespace aware method.
+     * @deprecated since 1.6.x.
+     *             This is not a namespace aware method.
      *
      * @exception BuildException if no method is available to create the
      *                           element instance, or if the creating method

src/main/org/apache/tools/ant/Main.java

@@ -252,7 +252,7 @@ public class Main implements AntMain {
      * @exception BuildException if the specified build file doesn't exist
      *                           or is a directory.
      *
-     * @deprecated
+     * @deprecated since 1.6.x
      */
     protected Main(String[] args) throws BuildException {
         processArgs(args);
@@ -513,7 +513,7 @@ public class Main implements AntMain {
      * Helper to get the parent file for a given file.
      * <p>
      * Added to simulate File.getParentFile() from JDK 1.2.
-     * @deprecated
+     * @deprecated since 1.6.x
      *
      * @param file   File to find parent of. Must not be <code>null</code>.
      * @return       Parent file or null if none

src/main/org/apache/tools/ant/Project.java

@@ -85,31 +85,36 @@ public class Project implements ResourceFactory {
     /**
      * Version constant for Java 1.0 .
      *
-     * @deprecated Use {@link JavaEnvUtils#JAVA_1_0} instead.
+     * @deprecated since 1.5.x.
+     *             Use {@link JavaEnvUtils#JAVA_1_0} instead.
      */
     public static final String JAVA_1_0 = JavaEnvUtils.JAVA_1_0;
     /**
      * Version constant for Java 1.1 .
      *
-     * @deprecated Use {@link JavaEnvUtils#JAVA_1_1} instead.
+     * @deprecated since 1.5.x.
+     *             Use {@link JavaEnvUtils#JAVA_1_1} instead.
      */
     public static final String JAVA_1_1 = JavaEnvUtils.JAVA_1_1;
     /**
      * Version constant for Java 1.2 .
      *
-     * @deprecated Use {@link JavaEnvUtils#JAVA_1_2} instead.
+     * @deprecated since 1.5.x.
+     *             Use {@link JavaEnvUtils#JAVA_1_2} instead.
      */
     public static final String JAVA_1_2 = JavaEnvUtils.JAVA_1_2;
     /**
      * Version constant for Java 1.3 .
      *
-     * @deprecated Use {@link JavaEnvUtils#JAVA_1_3} instead.
+     * @deprecated since 1.5.x.
+     *             Use {@link JavaEnvUtils#JAVA_1_3} instead.
      */
     public static final String JAVA_1_3 = JavaEnvUtils.JAVA_1_3;
     /**
      * Version constant for Java 1.4 .
      *
-     * @deprecated Use {@link JavaEnvUtils#JAVA_1_4} instead.
+     * @deprecated since 1.5.x.
+     *             Use {@link JavaEnvUtils#JAVA_1_4} instead.
      */
     public static final String JAVA_1_4 = JavaEnvUtils.JAVA_1_4;
 
@@ -188,12 +193,6 @@ public class Project implements ResourceFactory {
      */
     private boolean loggingMessage = false;
 
-    /**
-     * Property used to store the java version ant is running in.
-     * @deprecated
-     */
-    public static final String ANT_JAVA_VERSION = MagicNames.ANT_JAVA_VERSION;
-
     /**
      * Set the input handler.
      *
@@ -616,7 +615,8 @@ public class Project implements ResourceFactory {
      *                      May be <code>null</code>, indicating that there is
      *                      no default target.
      *
-     * @deprecated use setDefault
+     * @deprecated since 1.5.x.
+     *             Use setDefault.
      * @see #setDefault(String)
      */
     public void setDefaultTarget(String defaultTarget) {
@@ -694,7 +694,8 @@ public class Project implements ResourceFactory {
      *              Must not be <code>null</code>.
      * @param value The replacement value.
      *              Must not be <code>null</code>.
-     * @deprecated Use getGlobalFilterSet().addFilter(token,value)
+     * @deprecated since 1.4.x.
+     *             Use getGlobalFilterSet().addFilter(token,value)
      *
      * @see #getGlobalFilterSet()
      * @see FilterSet#addFilter(String,String)
@@ -712,7 +713,8 @@ public class Project implements ResourceFactory {
      * @return a hashtable of global filters, mapping tokens to values
      *         (String to String).
      *
-     * @deprecated Use getGlobalFilterSet().getFilterHash()
+     * @deprecated since 1.4.x 
+     *             Use getGlobalFilterSet().getFilterHash().
      *
      * @see #getGlobalFilterSet()
      * @see FilterSet#getFilterHash()
@@ -805,7 +807,8 @@ public class Project implements ResourceFactory {
      * Return the version of Java this class is running under.
      * @return the version of Java as a String, e.g. "1.1" .
      * @see org.apache.tools.ant.util.JavaEnvUtils#getJavaVersion
-     * @deprecated use org.apache.tools.ant.util.JavaEnvUtils instead
+     * @deprecated since 1.5.x.
+     *             Use org.apache.tools.ant.util.JavaEnvUtils instead.
      */
     public static String getJavaVersion() {
         return JavaEnvUtils.getJavaVersion();
@@ -1319,7 +1322,7 @@ public class Project implements ResourceFactory {
      *
      * @return the resolved File.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public File resolveFile(String fileName, File rootDir) {
         return FILE_UTILS.resolveFile(rootDir, fileName);
@@ -1336,6 +1339,9 @@ public class Project implements ResourceFactory {
      *
      * @return the resolved File.
      *
+     * @deprecated since 1.7 
+     *             Use @see {FileUtils#resolveFile FileUtils.resolveFile} 
+     *             instead.
      */
     public File resolveFile(String fileName) {
         return FILE_UTILS.resolveFile(baseDir, fileName);
@@ -1355,7 +1361,8 @@ public class Project implements ResourceFactory {
      * @return the native version of the specified path or
      *         an empty string if the path is <code>null</code> or empty.
      *         
-     * @deprecated use FileUtils.translatePath instead.
+     * @deprecated since 1.7
+     *             Use FileUtils.translatePath instead.
      *
      * @see PathTokenizer
      */
@@ -1374,7 +1381,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the copying fails.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(String sourceFile, String destFile)
           throws IOException {
@@ -1394,7 +1401,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the copying fails.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(String sourceFile, String destFile, boolean filtering)
         throws IOException {
@@ -1418,7 +1425,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the copying fails.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(String sourceFile, String destFile, boolean filtering,
                          boolean overwrite) throws IOException {
@@ -1447,7 +1454,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the copying fails.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(String sourceFile, String destFile, boolean filtering,
                          boolean overwrite, boolean preserveLastModified)
@@ -1467,7 +1474,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the copying fails.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(File sourceFile, File destFile) throws IOException {
         FILE_UTILS.copyFile(sourceFile, destFile);
@@ -1486,7 +1493,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the copying fails.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(File sourceFile, File destFile, boolean filtering)
         throws IOException {
@@ -1510,7 +1517,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the file cannot be copied.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(File sourceFile, File destFile, boolean filtering,
                          boolean overwrite) throws IOException {
@@ -1539,7 +1546,7 @@ public class Project implements ResourceFactory {
      *
      * @exception IOException if the file cannot be copied.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      */
     public void copyFile(File sourceFile, File destFile, boolean filtering,
                          boolean overwrite, boolean preserveLastModified)
@@ -1557,7 +1564,7 @@ public class Project implements ResourceFactory {
      *
      * @param time the required modification time.
      *
-     * @deprecated
+     * @deprecated since 1.4.x
      *
      * @exception BuildException if the last modified time cannot be set
      *                           despite running on a platform with a version

src/main/org/apache/tools/ant/ProjectComponent.java

@@ -26,9 +26,10 @@ public abstract class ProjectComponent {
 
     /**
      * Project object of this component.
-     * @deprecated You should not be directly accessing this variable
-     *   directly. You should access project object via the getProject()
-     *   or setProject() accessor/mutators.
+     * @deprecated since 1.6.x. 
+     *             You should not be directly accessing this variable directly. 
+     *             You should access project object via the getProject()
+     *             or setProject() accessor/mutators.
      */
     protected Project project;
 

src/main/org/apache/tools/ant/ProjectHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -266,7 +266,9 @@ public class ProjectHelper {
      * JDK1.1 compatible access to the context class loader.
      * Cut&paste from JAXP.
      *
-     * @deprecated Use LoaderUtils.getContextClassLoader()
+     * @deprecated since 1.6.x. 
+     *             Use LoaderUtils.getContextClassLoader()
+     *
      * @return the current context class loader, or <code>null</code>
      * if the context class loader is unavailable.
      */
@@ -290,7 +292,9 @@ public class ProjectHelper {
      * @param project The project containing the target.
      *                Must not be <code>null</code>.
      *
-     * @deprecated Use IntrospectionHelper for each property
+     * @deprecated since 1.6.x. 
+     *             Use IntrospectionHelper for each property.
+     *
      * @exception BuildException if any of the attributes can't be handled by
      *                           the target
      */
@@ -403,7 +407,8 @@ public class ProjectHelper {
      * @return the original string with the properties replaced, or
      *         <code>null</code> if the original string is <code>null</code>.
      *
-     * @deprecated Use project.replaceProperties()
+     * @deprecated since 1.6.x.
+     *             Use project.replaceProperties().
      * @since 1.5
      */
      public static String replaceProperties(Project project, String value)
@@ -429,7 +434,8 @@ public class ProjectHelper {
      *                           <code>}</code>
      * @return the original string with the properties replaced, or
      *         <code>null</code> if the original string is <code>null</code>.
-     * @deprecated Use PropertyHelper
+     * @deprecated since 1.6.x. 
+     *             Use PropertyHelper.
      */
      public static String replaceProperties(Project project, String value,
          Hashtable keys) throws BuildException {
@@ -450,7 +456,8 @@ public class ProjectHelper {
      * @param propertyRefs List to add property names to.
      *                     Must not be <code>null</code>.
      *
-     * @deprecated Use PropertyHelper
+     * @deprecated since 1.6.x.
+     *             Use PropertyHelper.
      * @exception BuildException if the string contains an opening
      *                           <code>${</code> without a closing
      *                           <code>}</code>

src/main/org/apache/tools/ant/RuntimeConfigurable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -58,8 +58,8 @@ public class RuntimeConfigurable implements Serializable {
     private transient IntrospectionHelper.Creator creator;
 
     /**
-     * @deprecated
      * XML attributes for the element.
+     * @deprecated since 1.6.x
      */
     private transient AttributeList attributes;
 
@@ -148,7 +148,7 @@ public class RuntimeConfigurable implements Serializable {
     /**
      * Sets the attributes for the wrapped element.
      *
-     * @deprecated
+     * @deprecated since 1.6.x.
      * @param attributes List of attributes defined in the XML for this
      *                   element. May be <code>null</code>.
      */

src/main/org/apache/tools/ant/Task.java

@@ -33,21 +33,24 @@ import java.io.IOException;
 public abstract class Task extends ProjectComponent {
     /**
      * Target this task belongs to, if any.
-     * @deprecated You should not be accessing this variable directly.
-     *   Please use the {@link #getOwningTarget()} method.
+     * @deprecated since 1.6.x.
+     *             You should not be accessing this variable directly.
+     *             Please use the {@link #getOwningTarget()} method.
      */
     protected Target target;
 
     /**
      * Description of this task, if any.
-     * @deprecated You should not be accessing this variable directly.
+     * @deprecated since 1.6.x. 
+     *             You should not be accessing this variable directly.
      */
     protected String description;
 
     /**
      * Location within the build file of this task definition.
-     * @deprecated You should not be accessing this variable directly.
-     *   Please use the {@link #getLocation()} method.
+     * @deprecated since 1.6.x. 
+     *             You should not be accessing this variable directly.
+     *             Please use the {@link #getLocation()} method.
      */
     protected Location location = Location.UNKNOWN_LOCATION;
 
@@ -58,24 +61,27 @@ public abstract class Task extends ProjectComponent {
      * isn't terribly descriptive for a task used within
      * another task - the outer task code can probably
      * provide a better one.
-     * @deprecated You should not be accessing this variable directly.
-     *   Please use the {@link #getTaskName()} method.
+     * @deprecated since 1.6.x. 
+     *             You should not be accessing this variable directly.
+     *             Please use the {@link #getTaskName()} method.
      */
     protected String taskName;
 
     /**
      * Type of this task.
      *
-     * @deprecated You should not be accessing this variable directly.
-     *   Please use the {@link #getTaskType()} method.
+     * @deprecated since 1.6.x. 
+     *             You should not be accessing this variable directly.
+     *             Please use the {@link #getTaskType()} method.
      */
     protected String taskType;
 
     /**
      * Wrapper for this object, used to configure it at runtime.
      *
-     * @deprecated You should not be accessing this variable directly.
-     *   Please use the {@link #getWrapper()} method.
+     * @deprecated since 1.6.x. 
+     *             You should not be accessing this variable directly.
+     *             Please use the {@link #getWrapper()} method.
      */
     protected RuntimeConfigurable wrapper;
 

src/main/org/apache/tools/ant/launch/Launcher.java

@@ -39,7 +39,7 @@ public class Launcher {
     /**
      * The Ant Home (installation) Directory property.
      * {@value}
-     * @deprecated
+     * @deprecated since 1.7
      */
     public static final String ANTHOME_PROPERTY = MagicNames.ANT_HOME;
 

src/main/org/apache/tools/ant/loader/AntClassLoader2.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@ package org.apache.tools.ant.loader;
 import org.apache.tools.ant.AntClassLoader;
 
 /**
- * @deprecated Just use {@link AntClassLoader} itself.
+ * @deprecated since 1.7 
+ *             Just use {@link AntClassLoader} itself.
  */
 public class AntClassLoader2 extends AntClassLoader {
     public AntClassLoader2() {}

src/main/org/apache/tools/ant/taskdefs/Available.java

@@ -159,7 +159,8 @@ public class Available extends Task implements Condition {
     }
 
     /**
-     * @deprecated setType(String) is deprecated and is replaced with
+     * @deprecated since 1.5.x. 
+     *             setType(String) is deprecated and is replaced with
      *             setType(Available.FileDir) to make Ant's Introspection
      *             mechanism do the work and also to encapsulate operations on
      *             the type in its own class.

src/main/org/apache/tools/ant/taskdefs/Copy.java

@@ -155,7 +155,8 @@ public class Copy extends Task {
     /**
      * Give the copied files the same last modified time as the original files.
      * @param preserve a boolean string.
-     * @deprecated setPreserveLastModified(String) has been deprecated and
+     * @deprecated since 1.5.x. 
+     *             setPreserveLastModified(String) has been deprecated and
      *             replaced with setPreserveLastModified(boolean) to
      *             consistently let the Introspection mechanism work.
      */

src/main/org/apache/tools/ant/taskdefs/DefBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ public abstract class DefBase extends AntlibDefinition {
     /**
      * @param reverseLoader if true a delegated loader will take precedence over
      *                      the parent
-     * @deprecated stop using this attribute
+     * @deprecated since 1.6.x. 
+     *             stop using this attribute
      * @ant.attribute ignore="true"
      */
     public void setReverseLoader(boolean reverseLoader) {

src/main/org/apache/tools/ant/taskdefs/Ear.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2005 The Apache Software Foundation
+ * Copyright  2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -49,7 +49,8 @@ public class Ear extends Jar {
     /**
      * Set the destination file.
      * @param earFile the destination file
-     * @deprecated Use setDestFile(destfile) instead
+     * @deprecated since 1.5.x. 
+     *             Use setDestFile(destfile) instead.
      */
     public void setEarfile(File earFile) {
         setDestFile(earFile);

src/main/org/apache/tools/ant/taskdefs/Exec.java

@@ -38,7 +38,8 @@ import org.apache.tools.ant.Task;
  * dead code by the Ant developers and is unmaintained.  Don't use
  * it.</strong></p>
  *
- * @deprecated delegate to {@link org.apache.tools.ant.taskdefs.Execute Execute}
+ * @deprecated since 1.2. 
+ *             delegate to {@link org.apache.tools.ant.taskdefs.Execute Execute}
  *             instead.
  */
 public class Exec extends Task {

src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -91,7 +91,8 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
      * Set the stream to which all output (System.out as well as System.err)
      * will be written.
      * @param out the PrintStream where output should be sent.
-     * @deprecated manage output at the task level.
+     * @deprecated since 1.4.x. 
+     *             manage output at the task level.
      */
     public void setOutput(PrintStream out) {
     }

src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -68,7 +68,8 @@ public class ExecuteWatchdog implements TimeoutObserver {
 
     /**
      * @see #ExecuteWatchdog(long)
-     * @deprecated Use constructor with a long type instead.
+     * @deprecated since 1.5.x. 
+     *             Use constructor with a long type instead.
      * (1.4.x compatibility)
      */
     public ExecuteWatchdog(int timeout) {

src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2005 The Apache Software Foundation
+ * Copyright 2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -167,7 +167,8 @@ public class FixCRLF extends MatchingTask implements ChainableReader {
      * <li>remove: remove all CR characters
      * </ul>
      *
-     * @deprecated use {@link #setEol setEol} instead.
+     * @deprecated since 1.4.x. 
+     *             Use {@link #setEol setEol} instead.
      */
     public void setCr(AddAsisRemove attr) {
         log("DEPRECATED: The cr attribute has been deprecated,",

src/main/org/apache/tools/ant/taskdefs/Jar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -180,7 +180,8 @@ public class Jar extends Zip {
     /**
      * Set the destination file.
      * @param jarFile the destination file
-     * @deprecated Use setDestFile(File) instead
+     * @deprecated since 1.5.x.
+     *             Use setDestFile(File) instead.
      */
     public void setJarfile(File jarFile) {
         setDestFile(jarFile);

src/main/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -819,7 +819,8 @@ public class Javadoc extends Task {
      * Set the location of the extensions directories.
      *
      * @param path the string version of the path.
-     * @deprecated Use the {@link #setExtdirs(Path)} version.
+     * @deprecated since 1.5.x.
+     *             Use the {@link #setExtdirs(Path)} version.
      */
     public void setExtdirs(String path) {
         cmd.createArgument().setValue("-extdirs");

src/main/org/apache/tools/ant/taskdefs/Jikes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000,2002-2005 The Apache Software Foundation
+ * Copyright  2000,2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -34,7 +34,8 @@ import org.apache.tools.ant.util.FileUtils;
  * by the Ant developers and is unmaintained.  Don't use
  * it.</strong></p>
  *
- * @deprecated merged into the class Javac.
+ * @deprecated since 1.2.
+ *             Merged into the class Javac.
  */
 public class Jikes {
 

src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000,2002-2005 The Apache Software Foundation
+ * Copyright  2000,2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@ import org.apache.tools.ant.Task;
  * by the Ant developers and is unmaintained.  Don't use
  * it.</strong></p>
  *
- * @deprecated use Jikes' exit value to detect compilation failure.
+ * @deprecated since 1.2. 
+ *             Use Jikes' exit value to detect compilation failure.
  */
 public class JikesOutputParser implements ExecuteStreamHandler {
     protected Task task;

src/main/org/apache/tools/ant/taskdefs/MacroInstance.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2005 The Apache Software Foundation
+ * Copyright  2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
      * Method present for BC purposes.
      * @param name not used
      * @return nothing
-     * @deprecated
+     * @deprecated since 1.6.x.
      * @throws BuildException always
      */
     public Object createDynamicElement(String name) throws BuildException {

src/main/org/apache/tools/ant/taskdefs/PathConvert.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2005 The Apache Software Foundation
+ * Copyright  2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -209,7 +209,8 @@ public class PathConvert extends Task {
      * Set targetos to a platform to one of
      * "windows", "unix", "netware", or "os/2";
      * current platform settings are used by default.
-     * @deprecated use the method taking a TargetOs argument instead.
+     * @deprecated since 1.5.x.
+     *             Use the method taking a TargetOs argument instead.
      * @see #setTargetos(PathConvert.TargetOs)
      */
     public void setTargetos(String target) {

src/main/org/apache/tools/ant/taskdefs/Property.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -332,8 +332,9 @@ public class Property extends Task {
 
     /**
      * @param userProperty ignored
-     * @deprecated This was never a supported feature and has been
-     * deprecated without replacement
+     * @deprecated since 1.5.x.
+     *             This was never a supported feature and has been 
+     *             deprecated without replacement.
      * @ant.attribute ignore="true"
      */
     public void setUserProperty(boolean userProperty) {

src/main/org/apache/tools/ant/taskdefs/SQLExec.java

@@ -607,7 +607,8 @@ public class SQLExec extends JDBCTask {
 
     /**
      * print any results in the statement
-     * @deprecated use {@link #printResults(java.sql.ResultSet, java.io.PrintStream)
+     * @deprecated since 1.6.x.
+     *             Use {@link #printResults(java.sql.ResultSet, java.io.PrintStream)
      *             the two arg version} instead.
      * @param out the place to print results
      * @throws SQLException on SQL problems.

src/main/org/apache/tools/ant/taskdefs/SendEmail.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2002,2004 The Apache Software Foundation
+ * Copyright  2000-2002,2004,2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@ public class SendEmail extends EmailTask {
      * Sets the mailport parameter of this build task.
      * @param value mail port name.
      *
-     * @deprecated Use {@link #setMailport(int)} instead.
+     * @deprecated since 1.5.x.
+     *             Use {@link #setMailport(int)} instead.
      */
     public void setMailport(Integer value) {
         setMailport(value.intValue());

src/main/org/apache/tools/ant/taskdefs/Tar.java

@@ -59,27 +59,32 @@ import org.apache.tools.tar.TarOutputStream;
 public class Tar extends MatchingTask {
 
     /**
-     * @deprecated Tar.WARN is deprecated and is replaced with
+     * @deprecated since 1.5.x.
+     *             Tar.WARN is deprecated and is replaced with
      *             Tar.TarLongFileMode.WARN
      */
     public static final String WARN = "warn";
     /**
-     * @deprecated Tar.FAIL is deprecated and is replaced with
+     * @deprecated since 1.5.x.
+     *             Tar.FAIL is deprecated and is replaced with
      *             Tar.TarLongFileMode.FAIL
      */
     public static final String FAIL = "fail";
     /**
-     * @deprecated Tar.TRUNCATE is deprecated and is replaced with
+     * @deprecated since 1.5.x.
+     *             Tar.TRUNCATE is deprecated and is replaced with
      *             Tar.TarLongFileMode.TRUNCATE
      */
     public static final String TRUNCATE = "truncate";
     /**
-     * @deprecated Tar.GNU is deprecated and is replaced with
+     * @deprecated since 1.5.x.
+     *             Tar.GNU is deprecated and is replaced with
      *             Tar.TarLongFileMode.GNU
      */
     public static final String GNU = "gnu";
     /**
-     * @deprecated Tar.OMIT is deprecated and is replaced with
+     * @deprecated since 1.5.x.
+     *             Tar.OMIT is deprecated and is replaced with
      *             Tar.TarLongFileMode.OMIT
      */
     public static final String OMIT = "omit";
@@ -127,7 +132,8 @@ public class Tar extends MatchingTask {
     /**
      * Set is the name/location of where to create the tar file.
      * @param tarFile the location of the tar file.
-     * @deprecated for consistency with other tasks, please use setDestFile()
+     * @deprecated since 1.5.x. 
+     *             For consistency with other tasks, please use setDestFile().
      */
     public void setTarfile(File tarFile) {
         this.tarFile = tarFile;
@@ -163,7 +169,8 @@ public class Tar extends MatchingTask {
      * <li>  omit - paths greater than the maximum are omitted from the archive
      * </ul>
      * @param mode the mode string to handle long files.
-     * @deprecated setLongFile(String) is deprecated and is replaced with
+     * @deprecated since 1.5.x.
+     *             setLongFile(String) is deprecated and is replaced with
      *             setLongFile(Tar.TarLongFileMode) to make Ant's Introspection
      *             mechanism do the work and also to encapsulate operations on
      *             the mode in its own class.
@@ -472,7 +479,8 @@ public class Tar extends MatchingTask {
      * Is the archive up to date in relationship to a list of files.
      * @param files the files to check
      * @return true if the archive is up to date.
-     * @deprecated use the two-arg version instead.
+     * @deprecated since 1.5.x. 
+     *             use the two-arg version instead.
      */
     protected boolean archiveIsUpToDate(String[] files) {
         return archiveIsUpToDate(files, baseDir);

src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000,2002-2005 The Apache Software Foundation
+ * Copyright  2000,2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@ import org.apache.tools.ant.Task;
  * by the Ant developers and is unmaintained.  Don't use
  * it.</strong></p>
  *
- * @deprecated use LogOutputStream instead.
+ * @deprecated since 1.2.x.
+ * Use LogOutputStream instead.
  */
 
 public class TaskOutputStream extends OutputStream {

src/main/org/apache/tools/ant/taskdefs/Touch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -317,7 +317,7 @@ public class Touch extends Task {
      * backwards-compatibility only.
      * @param file file to touch
      * @throws BuildException on error
-     * @deprecated
+     * @deprecated since 1.6.x.
      */
     protected void touch(File file) {
         touch(file, getTimestamp());

src/main/org/apache/tools/ant/taskdefs/Tstamp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -201,7 +201,8 @@ public class Tstamp extends Task {
         /**
          * Set the unit type (using String).
          * @param unit the unit to use.
-         * @deprecated setUnit(String) is deprecated and is replaced with
+         * @deprecated since 1.5.x.
+         *             setUnit(String) is deprecated and is replaced with
          *             setUnit(Tstamp.Unit) to make Ant's
          *             Introspection mechanism do the work and also to
          *             encapsulate operations on the unit in its own

src/main/org/apache/tools/ant/taskdefs/Unpack.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2002,2004-2005 The Apache Software Foundation
+ * Copyright  2001-2002,2004-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,8 @@ public abstract class Unpack extends Task {
     protected Resource srcResource;
 
     /**
-     * @deprecated setSrc(String) is deprecated and is replaced with
+     * @deprecated since 1.5.x. 
+     *             setSrc(String) is deprecated and is replaced with
      *             setSrc(File) to make Ant's Introspection
      *             mechanism do the work and also to encapsulate operations on
      *             the type in its own class.
@@ -52,7 +53,8 @@ public abstract class Unpack extends Task {
     }
 
     /**
-     * @deprecated setDest(String) is deprecated and is replaced with
+     * @deprecated since 1.5.x. 
+     *             setDest(String) is deprecated and is replaced with
      *             setDest(File) to make Ant's Introspection
      *             mechanism do the work and also to encapsulate operations on
      *             the type in its own class.

src/main/org/apache/tools/ant/taskdefs/War.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -68,7 +68,8 @@ public class War extends Jar {
      * <i>Deprecated<i> name of the file to create
      * -use <tt>destfile</tt> instead.
      * @param warFile the destination file
-     * @deprecated Use setDestFile(File) instead
+     * @deprecated since 1.5.x.
+     *             Use setDestFile(File) instead
      * @ant.attribute ignore="true"
      */
     public void setWarfile(File warFile) {

src/main/org/apache/tools/ant/taskdefs/Zip.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -133,7 +133,8 @@ public class Zip extends MatchingTask {
      * This is the name/location of where to
      * create the .zip file.
      * @param zipFile the path of the zipFile
-     * @deprecated Use setDestFile(File) instead.
+     * @deprecated since 1.5.x.
+     *             Use setDestFile(File) instead.
      * @ant.attribute ignore="true"
      */
     public void setZipfile(File zipFile) {
@@ -145,7 +146,8 @@ public class Zip extends MatchingTask {
      * create the file.
      * @param file the path of the zipFile
      * @since Ant 1.5
-     * @deprecated Use setDestFile(File) instead
+     * @deprecated since 1.5.x.
+     *             Use setDestFile(File) instead.
      * @ant.attribute ignore="true"
      */
     public void setFile(File file) {

src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

@@ -514,7 +514,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
     /**
      * Add extdirs to classpath
      * @param classpath the classpath to use
-     * @deprecated use org.apache.tools.ant.types.Path#addExtdirs instead
+     * @deprecated since 1.5.x. 
+     *             Use org.apache.tools.ant.types.Path#addExtdirs instead.
      */
     protected void addExtdirsToClasspath(Path classpath) {
         classpath.addExtdirs(extdirs);

src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000,2002,2004-2005 The Apache Software Foundation
+ * Copyright  2000,2002,2004-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,8 @@ import org.apache.tools.ant.types.Mapper;
  *
  * @version 1.2
  *
- * @deprecated Use <move> instead
+ * @deprecated since 1.5.x. 
+ *             Use <move> instead
  */
 public class RenameExtensions extends MatchingTask {
 

src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2005 The Apache Software Foundation
+ * Copyright  2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -209,7 +209,8 @@ public class ReplaceRegExp extends Task {
      * each line, which is not easy to do when processing the file as a whole.
      * Defaults to <i>false</i>.</td>
      * @param byline the byline attribute as a string
-     * @deprecated - use setByLine(boolean)
+     * @deprecated since 1.6.x. 
+     *             Use setByLine(boolean).
      */
     public void setByLine(String byline) {
         Boolean res = Boolean.valueOf(byline);

src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2002,2004-2005 The Apache Software Foundation
+ * Copyright  2000-2002,2004-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@ import org.apache.tools.ant.taskdefs.Java;
  * and options are available. Do not set any apart from the <tt>classpath</tt>
  * as they are not guaranteed to be there in future.
  * @todo stop extending from Java.
- * @deprecated This task is considered unsupported by the Ant developers
+ * @deprecated since 1.7. 
+ *             This task is considered unsupported by the Ant developers
  */
 public class StyleBook extends Java {
     protected File m_targetDirectory;

src/main/org/apache/tools/ant/taskdefs/optional/Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000,2002-2005 The Apache Software Foundation
+ * Copyright  2000,2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,8 +24,9 @@ import org.apache.tools.ant.taskdefs.Java;
  * This is a primitive task to execute a unit test in the
  * org.apache.testlet framework.
  *
- * @deprecated testlet has been abandoned in favor of JUnit by the
- * Avalon community
+ * @deprecated since 1.5.x. 
+ *             Testlet has been abandoned in favor of JUnit by the
+ * Avalon community.
  *
  * @ant.task ignore="true"
  */

src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java

@@ -432,7 +432,8 @@ public class TraXLiaison implements XSLTLiaison2, ErrorListener, XSLTLoggerAware
     /**
      * @param file the filename to use for the systemid
      * @return the systemid
-     * @deprecated use org.apache.tools.ant.util.JAXPUtils#getSystemId instead
+     * @deprecated since 1.5.x. 
+     *             Use org.apache.tools.ant.util.JAXPUtils#getSystemId instead.
      */
     protected String getSystemId(File file) {
         return JAXPUtils.getSystemId(file);

src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2005 The Apache Software Foundation
+ * Copyright  2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -185,7 +185,7 @@ public class JDependTask extends Task {
     /**
      * Adds a path to source code to analyze.
      * @return a source path
-     * @deprecated
+     * @deprecated since 1.6.x.
      */
     public Path createSourcespath() {
         if (sourcesPath == null) {
@@ -197,8 +197,7 @@ public class JDependTask extends Task {
     /**
      * Gets the sourcepath.
      * @return the sources path
-     * @deprecated
-     *
+     * @deprecated since 1.6.x.
      */
     public Path getSourcespath() {
         return sourcesPath;

src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

@@ -1203,7 +1203,8 @@ public class FTP
      * Sets the FTP action to be taken. Currently accepts "put", "get", "del",
      * "mkdir", "chmod", "list", and "site".
      *
-     * @deprecated setAction(String) is deprecated and is replaced with
+     * @deprecated since 1.5.x. 
+     *             setAction(String) is deprecated and is replaced with
      *      setAction(FTP.Action) to make Ant's Introspection mechanism do the
      *      work and also to encapsulate operations on the type in its own
      *      class.

src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2002,2004 The Apache Software Foundation
+ * Copyright  2001-2002,2004,2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@ import org.apache.tools.ant.taskdefs.email.EmailTask;
 /**
  * A task to send SMTP email; Use <tt>mail</tt> instead
  *
- * @deprecated Use {@link EmailTask} instead.
+ * @deprecated since 1.6.x. 
+ *             Use {@link EmailTask} instead.
  *
  * @since Ant1.4
  */

src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -295,7 +295,8 @@ public class ScriptDef extends DefBase {
      *
      * @param attributes collection of attributes
      * @param elements a list of nested element values.
-     * @deprecated use executeScript(attribute, elements, instance) instead
+     * @deprecated since 1.7. 
+     *             Use executeScript(attribute, elements, instance) instead.
      */
     public void executeScript(Map attributes, Map elements) {
         executeScript(attributes, elements,null);

src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2002-2005 The Apache Software Foundation
+ * Copyright  2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -60,7 +60,8 @@ public class SplashTask extends Task {
      * flag to enable proxy settings; optional, deprecated : consider
      * using <setproxy> instead
      * @param useProxy if ture, enable proxy settings
-     * @deprecated use org.apache.tools.ant.taskdefs.optional.SetProxy
+     * @deprecated since 1.5.x. 
+     *             Use org.apache.tools.ant.taskdefs.optional.SetProxy
      */
     public void setUseproxy(boolean useProxy) {
         this.useProxy = useProxy;

src/main/org/apache/tools/ant/types/CommandlineJava.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -508,7 +508,9 @@ public class CommandlineJava implements Cloneable {
      * operation, as it has to evaluate the size of many components.
      * @return the total number of arguments in the java command line.
      * @see #getCommandline()
-     * @deprecated please dont use this--it effectively creates the entire command.
+     * @deprecated since 1.7. 
+     *             Please dont use this, it effectively creates the 
+     *             entire command.
      */
     public int size() {
         int size = getActualVMCommand().size() + javaCommand.size()

src/main/org/apache/tools/ant/types/DataType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -41,17 +41,19 @@ public abstract class DataType extends ProjectComponent {
     /**
      * The description the user has set.
      *
-     * @deprecated The user should not be directly referencing
-     *   variable. Please use {@link #setDescription} or
-     *   {@link #getDescription} instead.
+     * @deprecated since 1.7.
+     *             The user should not be directly referencing
+     *             variable. Please use {@link #setDescription} or
+     *             {@link #getDescription} instead.
      */
     protected String description;
 
     /**
      * Value to the refid attribute.
      *
-     * @deprecated The user should not be directly referencing
-     *   variable. Please use {@link #getRefid} instead.
+     * @deprecated since 1.7. 
+     *             The user should not be directly referencing
+     *             variable. Please use {@link #getRefid} instead.
      */
     protected Reference ref;
 
@@ -63,9 +65,10 @@ public abstract class DataType extends ProjectComponent {
      * child element has been added that is a subclass of
      * DataType).</p>
      *
-     * @deprecated The user should not be directly referencing
-     *   variable. Please use {@link #setChecked} or
-     *   {@link #isChecked} instead.
+     * @deprecated since 1.7. 
+     *             The user should not be directly referencing
+     *             variable. Please use {@link #setChecked} or 
+     *             {@link #isChecked} instead.
      */
     protected boolean checked = true;
 

src/main/org/apache/tools/ant/types/Reference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2002,2004-2005 The Apache Software Foundation
+ * Copyright  2000-2002,2004-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,7 +31,9 @@ public class Reference {
 
     /**
      * Create a reference.
-     * @deprecated Please use {@link Reference#Reference(Project,String)} instead.
+     * @deprecated since 1.7. 
+     *             Please use {@link Reference#Reference(Project,String)}
+     *             instead.
      */
     public Reference() {
     }
@@ -39,7 +41,9 @@ public class Reference {
     /**
      * Create a reference to a named ID.
      * @param id the name of this reference
-     * @deprecated Please use {@link Reference#Reference(Project,String)} instead.
+     * @deprecated since 1.7. 
+     *             Please use {@link Reference#Reference(Project,String)}
+     *             instead.
      */
     public Reference(String id) {
         setRefId(id);

src/main/org/apache/tools/ant/util/CollectionUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2002-2005 The Apache Software Foundation
+ * Copyright  2002-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ public class CollectionUtils {
      * @param v2 the second vector.
      * @return true if the vectors are equal.
      * @since Ant 1.5
-     * @deprecated
+     * @deprecated since 1.6.x.
      */
     public static boolean equals(Vector v1, Vector v2) {
         if (v1 == v2) {
@@ -58,7 +58,7 @@ public class CollectionUtils {
      * @param d2 the second directory.
      * @return true if the directories are equal.
      * @since Ant 1.5
-     * @deprecated
+     * @deprecated since 1.6.x.
      */
     public static boolean equals(Dictionary d1, Dictionary d2) {
         if (d1 == d2) {
@@ -94,7 +94,7 @@ public class CollectionUtils {
      * @param m1 the to directory.
      * @param m2 the from directory.
      * @since Ant 1.6
-     * @deprecated
+     * @deprecated since 1.6.x.
      */
     public static void putAll(Dictionary m1, Dictionary m2) {
         for (Enumeration it = m2.keys(); it.hasMoreElements();) {

src/main/org/apache/tools/ant/util/FileUtils.java

@@ -84,7 +84,9 @@ public class FileUtils {
      * Factory method.
      *
      * @return a new instance of FileUtils.
-     * @deprecated Use getFileUtils instead, FileUtils do not have state.
+     * @deprecated since 1.7.
+     *             Use getFileUtils instead, 
+     * FileUtils do not have state.
      */
     public static FileUtils newFileUtils() {
         return new FileUtils();
@@ -870,7 +872,8 @@ public class FileUtils {
      * @return the given file's parent, or null if the file does not have a
      *         parent.
      * @since 1.10
-     * @deprecated Just use {@link File#getParentFile} directly.
+     * @deprecated since 1.7.
+     *             Just use {@link File#getParentFile} directly.
      */
     public File getParentFile(File f) {
         return (f == null) ? null : f.getParentFile();

src/main/org/apache/tools/ant/util/WeakishReference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@ import org.apache.tools.ant.util.optional.WeakishReference12;
  * This is a weak reference on java1.2 and up, that is all
  * platforms Ant1.6 supports.
  * @since ant1.6
- * @deprecated Just use {@link java.lang.ref.WeakReference} directly.
+ * @deprecated since 1.7.
+ *             Just use {@link java.lang.ref.WeakReference} directly.
  */
 public abstract class WeakishReference  {
 
@@ -47,7 +48,8 @@ public abstract class WeakishReference  {
 
     /**
      * A hard reference for Java 1.1.
-     * @deprecated Hopefully nobody is using this.
+     * @deprecated since 1.7. 
+     *             Hopefully nobody is using this.
      */
     public static class HardReference extends WeakishReference {
         private Object object;

src/main/org/apache/tools/ant/util/optional/WeakishReference12.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@ import java.lang.ref.WeakReference;
 /**
  * This is a reference that really is is Weak, as it uses the
  * appropriate java.lang.ref class.
- * @deprecated Just use {@link WeakReference} directly.
+ * @deprecated since 1.7.
+ *             Just use {@link WeakReference} directly.
  */
 public class WeakishReference12 extends WeakishReference  {
 

src/main/org/apache/tools/zip/ZipEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright  2001-2005 The Apache Software Foundation
+ * Copyright  2001-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -296,7 +296,8 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
      * <p>This either stores the size for later usage or invokes
      * setCompressedSize via reflection.</p>
      * @param size the size to use
-     * @deprecated use setCompressedSize directly. 
+     * @deprecated since 1.7.
+     *             Use setCompressedSize directly. 
      * @since 1.2
      */
     public void setComprSize(long size) {