From 32634d817a7a03ebff6112e987f3beb0b05a650b Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@gmx.de>
Date: Wed, 24 Feb 2016 22:31:50 -0500
Subject: [PATCH] @Override annotation is not supported at build time by Java
 1.5 for interface methods. Updating the STATUS file too.

---
 STATUS                                              | 6 +++---
 src/main/org/apache/tools/ant/taskdefs/Replace.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/STATUS b/STATUS
index 9bb904da2..874396d29 100644
--- a/STATUS
+++ b/STATUS
@@ -1,10 +1,10 @@
 Apache Ant Status
-Last modified at 2014-05-26
+Last modified at 2016-02-24
 
 Release:
-    Current:        1.9.4  (in GIT Tag: ANT_194)
+    Current:        1.9.6  (in GIT Tag: ANT_196)
     Maintenance:    1.9.x  (in GIT Branch: master)
-    Development:    1.9.5  (in GIT Branch: master)
+    Development:    1.9.7  (in GIT Branch: master)
 
 Assets:
     DNS:                ant.apache.org
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index 2cf59dd42..4b6819815 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -962,7 +962,7 @@ public class Replace extends MatchingTask {
     private Iterator<Object> getOrderedIterator(Properties props) {
         List<Object> keys = new ArrayList<Object>(props.keySet());
         Collections.sort(keys, new Comparator<Object>() {
-                @Override
+                //Override annotation is not supported as long as we want to support building Ant on Java 1.5
                 public int compare(Object key1, Object key2) {
                     return compare(key1.toString(), key2.toString());
                 }