[ant] 03/03: Merge branch '1.9.x'

[bodewig]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 9379bf4ffc845361e1d68110952ce83828328623
Merge: 16be5c0 0f110ea
Author: Stefan Bodewig <bode...@apache.org>
AuthorDate: Sat Sep 25 13:17:52 2021 +0200

    Merge branch '1.9.x'

 src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --cc src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
index 86a6d9b,f747c42..249022b
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
@@@ -18,10 -18,9 +18,9 @@@
  
  package org.apache.tools.ant.taskdefs;
  
 -import java.io.IOException;
  import java.io.File;
  import java.io.FileInputStream;
- import java.io.FileNotFoundException;
 +import java.io.IOException;
  
  import org.apache.tools.ant.BuildException;
  import org.apache.tools.ant.BuildFileRule;