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 2017/12/01 15:49:46 UTC

[23/23] ant git commit: Merge branch '1.9.x'

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fc2bce53
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fc2bce53
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fc2bce53

Branch: refs/heads/master
Commit: fc2bce5326d8c3e0958e92531f3e58f58ad7a531
Parents: 4422804 0ed7f4a
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Dec 1 16:48:54 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Dec 1 16:48:54 2017 +0100

----------------------------------------------------------------------
 .../apache/tools/ant/types/selectors/ModifiedSelectorTest.java | 6 +++---
 src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/fc2bce53/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
----------------------------------------------------------------------
diff --cc src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
index 612c6ec,bf5b0d4..cf7d9b7
--- a/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
@@@ -53,8 -53,7 +53,8 @@@ public class StringUtilsTest 
          assertEquals("e", res.elementAt(4));
      }
  
 +    @SuppressWarnings("deprecation")
-         @Test
+     @Test
      public void testReplace() {
          final String data = "abcabcabca";
          String res = StringUtils.replace(data, "a", "");