You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/03/05 11:00:08 UTC
ant git commit: java 11's javac whines if @Deprecated Annotation is
missing
Repository: ant
Updated Branches:
refs/heads/1.9.x cd32b65ac -> e50fdd719
java 11's javac whines if @Deprecated Annotation is missing
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e50fdd71
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e50fdd71
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e50fdd71
Branch: refs/heads/1.9.x
Commit: e50fdd719c88e52c5e6d97f4893648b8e1706491
Parents: cd32b65
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Mar 5 11:58:55 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Mar 5 11:58:55 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/BuildException.java | 1 +
src/main/org/apache/tools/ant/Diagnostics.java | 2 ++
src/main/org/apache/tools/ant/ProjectComponent.java | 3 +++
src/main/org/apache/tools/ant/ProjectHelper.java | 5 +++++
src/main/org/apache/tools/ant/PropertyHelper.java | 11 +++++++++++
src/main/org/apache/tools/ant/RuntimeConfigurable.java | 1 +
src/main/org/apache/tools/ant/Task.java | 4 ++++
src/main/org/apache/tools/ant/taskdefs/CopyPath.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/DefBase.java | 1 +
src/main/org/apache/tools/ant/taskdefs/Deltree.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Jikes.java | 1 +
.../org/apache/tools/ant/taskdefs/JikesOutputParser.java | 1 +
src/main/org/apache/tools/ant/taskdefs/KeySubst.java | 1 +
src/main/org/apache/tools/ant/taskdefs/Rename.java | 1 +
src/main/org/apache/tools/ant/taskdefs/SendEmail.java | 1 +
.../org/apache/tools/ant/taskdefs/TaskOutputStream.java | 2 +-
.../org/apache/tools/ant/taskdefs/compilers/Javac12.java | 1 +
src/main/org/apache/tools/ant/types/DataType.java | 2 ++
src/main/org/apache/tools/ant/types/Mapper.java | 1 +
src/main/org/apache/tools/ant/types/Reference.java | 2 ++
.../tools/ant/types/resources/FileResourceIterator.java | 3 +++
src/main/org/apache/tools/ant/util/CollectionUtils.java | 3 +++
src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 3 +++
src/main/org/apache/tools/ant/util/StringUtils.java | 1 +
24 files changed, 52 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/BuildException.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/BuildException.java b/src/main/org/apache/tools/ant/BuildException.java
index 34c1605..a4ed05f 100644
--- a/src/main/org/apache/tools/ant/BuildException.java
+++ b/src/main/org/apache/tools/ant/BuildException.java
@@ -118,6 +118,7 @@ public class BuildException extends RuntimeException {
* exception is associated with this one
* @deprecated Use {@link #getCause} instead.
*/
+ @Deprecated
public Throwable getException() {
return getCause();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/Diagnostics.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index 74e1182..e5b7913 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -90,6 +90,7 @@ public final class Diagnostics {
* @deprecated Obsolete since Ant 1.8.2
* @return <tt>true</tt>
*/
+ @Deprecated
public static boolean isOptionalAvailable() {
return true;
}
@@ -98,6 +99,7 @@ public final class Diagnostics {
* Doesn't do anything.
* @deprecated Obsolete since Ant 1.8.2
*/
+ @Deprecated
public static void validateVersion() throws BuildException {
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/ProjectComponent.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ProjectComponent.java b/src/main/org/apache/tools/ant/ProjectComponent.java
index 767d0c0..830c9d6 100644
--- a/src/main/org/apache/tools/ant/ProjectComponent.java
+++ b/src/main/org/apache/tools/ant/ProjectComponent.java
@@ -32,6 +32,7 @@ public abstract class ProjectComponent implements Cloneable {
* You should access project object via the getProject()
* or setProject() accessor/mutators.
*/
+ @Deprecated
protected Project project;
/**
@@ -40,6 +41,7 @@ public abstract class ProjectComponent implements Cloneable {
* You should not be accessing this variable directly.
* Please use the {@link #getLocation()} method.
*/
+ @Deprecated
protected Location location = Location.UNKNOWN_LOCATION;
/**
@@ -47,6 +49,7 @@ public abstract class ProjectComponent implements Cloneable {
* @deprecated since 1.6.x.
* You should not be accessing this variable directly.
*/
+ @Deprecated
protected String description;
// CheckStyle:VisibilityModifier ON
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/ProjectHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 0c73b26..5bc1cf5 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -309,6 +309,7 @@ public class ProjectHelper {
* @return the current context class loader, or <code>null</code>
* if the context class loader is unavailable.
*/
+ @Deprecated
public static ClassLoader getContextClassLoader() {
return LoaderUtils.isContextLoaderAvailable() ? LoaderUtils.getContextClassLoader() : null;
}
@@ -331,6 +332,7 @@ public class ProjectHelper {
* @exception BuildException if any of the attributes can't be handled by
* the target
*/
+ @Deprecated
public static void configure(Object target, AttributeList attrs,
Project project) throws BuildException {
if (target instanceof TypeAdapter) {
@@ -434,6 +436,7 @@ public class ProjectHelper {
* Use project.replaceProperties().
* @since 1.5
*/
+ @Deprecated
public static String replaceProperties(Project project, String value) throws BuildException {
// needed since project properties are not accessible
return project.replaceProperties(value);
@@ -459,6 +462,7 @@ public class ProjectHelper {
* @deprecated since 1.6.x.
* Use PropertyHelper.
*/
+ @Deprecated
public static String replaceProperties(Project project, String value, Hashtable<String, Object> keys)
throws BuildException {
PropertyHelper ph = PropertyHelper.getPropertyHelper(project);
@@ -486,6 +490,7 @@ public class ProjectHelper {
* @exception BuildException if the string contains an opening
* <code>${</code> without a closing <code>}</code>
*/
+ @Deprecated
public static void parsePropertyString(String value, Vector<String> fragments, Vector<String> propertyRefs)
throws BuildException {
PropertyHelper.parsePropertyStringDefault(value, fragments, propertyRefs);
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/PropertyHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java
index 9f94bda..7561e73 100644
--- a/src/main/org/apache/tools/ant/PropertyHelper.java
+++ b/src/main/org/apache/tools/ant/PropertyHelper.java
@@ -360,6 +360,7 @@ public class PropertyHelper implements GetProperty {
* @param next the next property helper in the chain.
* @deprecated use the delegate mechanism instead
*/
+ @Deprecated
public void setNext(PropertyHelper next) {
this.next = next;
}
@@ -375,6 +376,7 @@ public class PropertyHelper implements GetProperty {
* @return the next property helper.
* @deprecated use the delegate mechanism instead
*/
+ @Deprecated
public PropertyHelper getNext() {
return next;
}
@@ -445,6 +447,7 @@ public class PropertyHelper implements GetProperty {
* has a good reason not to).
* @deprecated PropertyHelper chaining is deprecated.
*/
+ @Deprecated
public boolean setPropertyHook(String ns, String name,
Object value,
boolean inherited, boolean user,
@@ -472,6 +475,7 @@ public class PropertyHelper implements GetProperty {
* @return The property, if returned by a hook, or null if none.
* @deprecated PropertyHelper chaining is deprecated.
*/
+ @Deprecated
public Object getPropertyHook(String ns, String name, boolean user) {
if (getNext() != null) {
Object o = getNext().getPropertyHook(ns, name, user);
@@ -519,6 +523,7 @@ public class PropertyHelper implements GetProperty {
* <code>}</code>
* @deprecated use the other mechanisms of this class instead
*/
+ @Deprecated
public void parsePropertyString(String value, Vector<String> fragments,
Vector<String> propertyRefs) throws BuildException {
parsePropertyStringDefault(value, fragments, propertyRefs);
@@ -618,6 +623,7 @@ public class PropertyHelper implements GetProperty {
* @return true if the property is set.
* @deprecated namespaces are unnecessary.
*/
+ @Deprecated
public boolean setProperty(String ns, String name, Object value, boolean verbose) {
return setProperty(name, value, verbose);
}
@@ -675,6 +681,7 @@ public class PropertyHelper implements GetProperty {
* @since Ant 1.6
* @deprecated namespaces are unnecessary.
*/
+ @Deprecated
public void setNewProperty(String ns, String name, Object value) {
setNewProperty(name, value);
}
@@ -726,6 +733,7 @@ public class PropertyHelper implements GetProperty {
* Must not be <code>null</code>.
* @deprecated namespaces are unnecessary.
*/
+ @Deprecated
public void setUserProperty(String ns, String name, Object value) {
setUserProperty(name, value);
}
@@ -768,6 +776,7 @@ public class PropertyHelper implements GetProperty {
* Must not be <code>null</code>.
* @deprecated namespaces are unnecessary.
*/
+ @Deprecated
public void setInheritedProperty(String ns, String name, Object value) {
setInheritedProperty(name, value);
}
@@ -814,6 +823,7 @@ public class PropertyHelper implements GetProperty {
* or if a <code>null</code> name is provided.
* @deprecated namespaces are unnecessary.
*/
+ @Deprecated
public Object getProperty(String ns, String name) {
return getProperty(name);
}
@@ -862,6 +872,7 @@ public class PropertyHelper implements GetProperty {
* or if a <code>null</code> name is provided.
* @deprecated namespaces are unnecessary.
*/
+ @Deprecated
public Object getUserProperty(String ns, String name) {
return getUserProperty(name);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/RuntimeConfigurable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index 6c4953f..477ae3a 100644
--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -64,6 +64,7 @@ public class RuntimeConfigurable implements Serializable {
* XML attributes for the element.
* @deprecated since 1.6.x
*/
+ @Deprecated
private transient AttributeList attributes;
// The following is set to true if any of the attributes are namespaced
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/Task.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java
index 0d08eb0..7e349cb 100644
--- a/src/main/org/apache/tools/ant/Task.java
+++ b/src/main/org/apache/tools/ant/Task.java
@@ -39,6 +39,7 @@ public abstract class Task extends ProjectComponent {
* You should not be accessing this variable directly.
* Please use the {@link #getOwningTarget()} method.
*/
+ @Deprecated
protected Target target;
/**
@@ -52,6 +53,7 @@ public abstract class Task extends ProjectComponent {
* You should not be accessing this variable directly.
* Please use the {@link #getTaskName()} method.
*/
+ @Deprecated
protected String taskName;
/**
@@ -61,6 +63,7 @@ public abstract class Task extends ProjectComponent {
* You should not be accessing this variable directly.
* Please use the {@link #getTaskType()} method.
*/
+ @Deprecated
protected String taskType;
/**
@@ -70,6 +73,7 @@ public abstract class Task extends ProjectComponent {
* You should not be accessing this variable directly.
* Please use the {@link #getWrapper()} method.
*/
+ @Deprecated
protected RuntimeConfigurable wrapper;
// CheckStyle:VisibilityModifier ON
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
index bad9e5d..afedf70 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
@@ -39,7 +39,7 @@ import org.apache.tools.ant.util.FileUtils;
* obsoleted by ResourceCollection support in Copy available since Ant
* 1.7.0. Don't use it.
*/
-
+@Deprecated
public class CopyPath extends Task {
// Error messages
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/DefBase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/DefBase.java b/src/main/org/apache/tools/ant/taskdefs/DefBase.java
index b52bbb7..ca38fdd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/DefBase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/DefBase.java
@@ -51,6 +51,7 @@ public abstract class DefBase extends AntlibDefinition {
* stop using this attribute
* @ant.attribute ignore="true"
*/
+ @Deprecated
public void setReverseLoader(boolean reverseLoader) {
getDelegate().setReverseLoader(reverseLoader);
log("The reverseloader attribute is DEPRECATED. It will be removed",
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/Deltree.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Deltree.java b/src/main/org/apache/tools/ant/taskdefs/Deltree.java
index 098d6e5..7290a63 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Deltree.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Deltree.java
@@ -32,7 +32,7 @@ import org.apache.tools.ant.Task;
* @deprecated The deltree task is deprecated since Ant 1.2. Use
* delete instead.
*/
-
+@Deprecated
public class Deltree extends Task {
private File dir;
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/Jikes.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
index 4bc6835..c94beca 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
@@ -38,6 +38,7 @@ import org.apache.tools.ant.util.FileUtils;
* @deprecated since 1.2.
* Merged into the class Javac.
*/
+@Deprecated
public class Jikes {
// There have been reports that 300 files could be compiled
// on a command line so 250 is a conservative approach
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
index 18bce30..b0fc19d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
@@ -38,6 +38,7 @@ import org.apache.tools.ant.Task;
* @deprecated since 1.2.
* Use Jikes' exit value to detect compilation failure.
*/
+@Deprecated
public class JikesOutputParser implements ExecuteStreamHandler {
// CheckStyle:VisibilityModifier OFF - bc
protected Task task;
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
index 4e331da..ee476e7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
+++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
@@ -43,6 +43,7 @@ import org.apache.tools.ant.util.StringUtils;
* @deprecated KeySubst is deprecated since Ant 1.1. Use Filter + Copy
* instead.
*/
+@Deprecated
public class KeySubst extends Task {
private File source = null;
private File dest = null;
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/Rename.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rename.java b/src/main/org/apache/tools/ant/taskdefs/Rename.java
index 382c2a7..f4199bb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rename.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rename.java
@@ -32,6 +32,7 @@ import org.apache.tools.ant.util.FileUtils;
* @deprecated The rename task is deprecated since Ant 1.2. Use move instead.
* @since Ant 1.1
*/
+@Deprecated
public class Rename extends Task {
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SendEmail.java b/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
index 58d5cdc..1db8de3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
@@ -39,6 +39,7 @@ public class SendEmail extends EmailTask {
* @deprecated since 1.5.x.
* Use {@link #setMailport(int)} instead.
*/
+ @Deprecated
public void setMailport(Integer value) {
setMailport(value.intValue());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
index 0fdeeff..2ba5a61 100644
--- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
+++ b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
@@ -38,7 +38,7 @@ import org.apache.tools.ant.Task;
* @deprecated since 1.2.x.
* Use LogOutputStream instead.
*/
-
+@Deprecated
public class TaskOutputStream extends OutputStream {
private Task task;
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
index 1bb2595..6865e05 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
@@ -37,6 +37,7 @@ import org.apache.tools.ant.util.JavaEnvUtils;
* @since Ant 1.3
* @deprecated Use {@link Javac13} instead.
*/
+@Deprecated
public class Javac12 extends DefaultCompilerAdapter {
protected static final String CLASSIC_COMPILER_CLASSNAME = "sun.tools.javac.Main";
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/types/DataType.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java
index 7b2ec7a..f4306af 100644
--- a/src/main/org/apache/tools/ant/types/DataType.java
+++ b/src/main/org/apache/tools/ant/types/DataType.java
@@ -47,6 +47,7 @@ public abstract class DataType extends ProjectComponent implements Cloneable {
* The user should not be directly referencing
* variable. Please use {@link #getRefid} instead.
*/
+ @Deprecated
protected Reference ref;
/**
@@ -62,6 +63,7 @@ public abstract class DataType extends ProjectComponent implements Cloneable {
* variable. Please use {@link #setChecked} or
* {@link #isChecked} instead.
*/
+ @Deprecated
protected boolean checked = true;
// CheckStyle:VisibilityModifier ON
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/types/Mapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java
index c02e782..925597f 100644
--- a/src/main/org/apache/tools/ant/types/Mapper.java
+++ b/src/main/org/apache/tools/ant/types/Mapper.java
@@ -274,6 +274,7 @@ public class Mapper extends DataType {
* FileNameMapper implementation directly.
* @return the referenced Mapper
*/
+ @Deprecated
protected Mapper getRef() {
return getCheckedRef(Mapper.class, getDataTypeName());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/types/Reference.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Reference.java b/src/main/org/apache/tools/ant/types/Reference.java
index e5e9b25..eefabcf 100644
--- a/src/main/org/apache/tools/ant/types/Reference.java
+++ b/src/main/org/apache/tools/ant/types/Reference.java
@@ -36,6 +36,7 @@ public class Reference {
* Please use {@link Reference#Reference(Project,String)}
* instead.
*/
+ @Deprecated
public Reference() {
}
@@ -46,6 +47,7 @@ public class Reference {
* Please use {@link Reference#Reference(Project,String)}
* instead.
*/
+ @Deprecated
public Reference(String id) {
setRefId(id);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java b/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java
index 6d8849c..c1b5f7f 100644
--- a/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java
+++ b/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java
@@ -38,6 +38,7 @@ public class FileResourceIterator implements Iterator<Resource> {
* Construct a new FileResourceIterator.
* @deprecated in favor of {@link FileResourceIterator#FileResourceIterator(Project)}
*/
+ @Deprecated
public FileResourceIterator() {
}
@@ -56,6 +57,7 @@ public class FileResourceIterator implements Iterator<Resource> {
* @param basedir the base directory of this instance.
* @deprecated in favor of {@link FileResourceIterator#FileResourceIterator(Project, File)}
*/
+ @Deprecated
public FileResourceIterator(File basedir) {
this(null, basedir);
}
@@ -79,6 +81,7 @@ public class FileResourceIterator implements Iterator<Resource> {
* @param filenames the String[] of filenames.
* @deprecated in favor of {@link FileResourceIterator#FileResourceIterator(Project, File, String[])}
*/
+ @Deprecated
public FileResourceIterator(File basedir, String[] filenames) {
this(null, basedir, filenames);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java b/src/main/org/apache/tools/ant/util/CollectionUtils.java
index 23f67a4..d0ee552 100644
--- a/src/main/org/apache/tools/ant/util/CollectionUtils.java
+++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java
@@ -48,6 +48,7 @@ public class CollectionUtils {
* @since Ant 1.5
* @deprecated since 1.6.x.
*/
+ @Deprecated
public static boolean equals(Vector<?> v1, Vector<?> v2) {
if (v1 == v2) {
return true;
@@ -71,6 +72,7 @@ public class CollectionUtils {
* @since Ant 1.5
* @deprecated since 1.6.x.
*/
+ @Deprecated
public static boolean equals(Dictionary<?, ?> d1, Dictionary<?, ?> d2) {
if (d1 == d2) {
return true;
@@ -128,6 +130,7 @@ public class CollectionUtils {
* @since Ant 1.6
* @deprecated since 1.6.x.
*/
+ @Deprecated
public static <K, V> void putAll(Dictionary<? super K, ? super V> m1, Dictionary<? extends K, ? extends V> m2) {
for (Enumeration<? extends K> it = m2.keys(); it.hasMoreElements();) {
K key = it.nextElement();
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index 7206d77..d8a7bd8 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -111,11 +111,13 @@ public final class JavaEnvUtils {
* Version constant for Java 1.9
* @deprecated use #JAVA_9 instead
*/
+ @Deprecated
public static final String JAVA_1_9 = "1.9";
/**
* Number Version constant for Java 1.9
* @deprecated use #VERSION_9 instead
*/
+ @Deprecated
public static final int VERSION_1_9 = 19;
/**
@@ -250,6 +252,7 @@ public final class JavaEnvUtils {
* be 0 for all versions of Java starting with Java 9.
* @deprecated use #getParsedJavaVersion instead
*/
+ @Deprecated
public static int getJavaVersionNumber() {
return javaVersionNumber;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/e50fdd71/src/main/org/apache/tools/ant/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index 4ce9ee3..4bb3497 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -81,6 +81,7 @@ public final class StringUtils {
* @return the new string with replaced occurrences.
* @deprecated Use {@link String#replace(CharSequence, CharSequence)} now.
*/
+ @Deprecated
public static String replace(String data, String from, String to) {
return data.replace(from, to);
}