Merge branch '1.9.x'

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

@@ -1204,11 +1204,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
      *
      * @return the entry's certificates or null is the container is
      *         not a jar or it has no certificates.
-     *
-     * @exception IOException if the manifest cannot be read.
      */
-    private Certificate[] getCertificates(final File container, final String entry)
-        throws IOException {
+    private Certificate[] getCertificates(final File container, final String entry) {
         if (container.isDirectory()) {
             return null;
         }

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

@@ -383,7 +383,7 @@ public class Concat extends Task implements ResourceCollection {
         private ConcatResource(ResourceCollection c) {
             this.c = c;
         }
-        public InputStream getInputStream() throws IOException {
+        public InputStream getInputStream() {
             if (binary) {
                 ConcatResourceInputStream result = new ConcatResourceInputStream(c);
                 result.setManagingComponent(this);

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

@@ -1024,8 +1024,7 @@ public class Jar extends Zip {
      * @since Ant 1.6.2
      */
     protected final void writeIndexLikeList(List<String> dirs, List<String> files,
-                                            PrintWriter writer)
-        throws IOException {
+                                            PrintWriter writer) {
         // JarIndex is sorting the directories by ascending order.
         // it has no value but cosmetic since it will be read into a
         // hashtable by the classloader, but we'll do so anyway.

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

@@ -1026,8 +1026,7 @@ public class Zip extends MatchingTask {
      * Determine a Resource's Unix mode or return the given default
      * value if not available.
      */
-    private int getUnixMode(final Resource r, final ZipFile zf, final int defaultMode)
-        throws IOException {
+    private int getUnixMode(final Resource r, final ZipFile zf, final int defaultMode) {
 
         int unixMode = defaultMode;
         if (zf != null) {

src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java

@@ -378,8 +378,6 @@ public class Symlink extends DispatchTask {
      *
      * @param path    A string containing the path of the symlink to delete.
      *
-     * @throws FileNotFoundException   When the path results in a
-     *                                   <code>File</code> that doesn't exist.
      * @throws IOException             If calls to <code>File.rename</code>
      *                                   or <code>File.delete</code> fail.
      * @deprecated use
@@ -388,7 +386,7 @@ public class Symlink extends DispatchTask {
      */
     @Deprecated
     public static void deleteSymlink(String path)
-        throws IOException, FileNotFoundException {
+        throws IOException {
         SYMLINK_UTILS.deleteSymbolicLink(new File(path), null);
     }
 

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

@@ -81,7 +81,7 @@ public class UUEncoder {
     /**
      * Encode a string to the output.
      */
-    private void encodeString(String n) throws IOException {
+    private void encodeString(String n) {
         PrintStream writer = new PrintStream(out);
         writer.print(n);
         writer.flush();