From 18877234f21782ea101f0049db2f85907e7f4c68 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 22 Dec 2016 06:29:09 +0100
Subject: [PATCH] accept generic exceptions because of backwards compatibility

---
 src/main/org/apache/tools/ant/Project.java                  | 2 +-
 src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java     | 6 +++---
 src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java     | 2 +-
 .../org/apache/tools/ant/taskdefs/optional/TraXLiaison.java | 2 +-
 .../org/apache/tools/ant/taskdefs/optional/jlink/jlink.java | 2 +-
 .../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 4 ++--
 src/main/org/apache/tools/ant/util/FileUtils.java           | 2 +-
 src/main/org/apache/tools/ant/util/StringUtils.java         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 827183d29..f7d3a3608 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -1430,7 +1430,7 @@ public class Project implements ResourceFactory {
                             "Target '" + curtarget.getName()
                             + "' failed with message '"
                             + thrownException.getMessage() + "'.", MSG_ERR);
-                        thrownException.printStackTrace(System.err);
+                        thrownException.printStackTrace(System.err); //NOSONAR
                         if (buildException == null) {
                             buildException =
                                 new BuildException(thrownException);
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
index 304995c68..5976bce9e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
@@ -44,7 +44,7 @@ public interface XSLTLiaison {
      * @throws Exception thrown if any problems happens.
      * @since Ant 1.4
      */
-    void setStylesheet(File stylesheet) throws Exception;
+    void setStylesheet(File stylesheet) throws Exception; //NOSONAR
 
     /**
      * Add a parameter to be set during the XSL transformation.
@@ -54,7 +54,7 @@ public interface XSLTLiaison {
      * @see XSLTLiaison4#addParam(java.lang.String, java.lang.Object)
      * @since Ant 1.3
      */
-    void addParam(String name, String expression) throws Exception;
+    void addParam(String name, String expression) throws Exception; //NOSONAR
 
     /**
      * Perform the transformation of a file into another.
@@ -64,6 +64,6 @@ public interface XSLTLiaison {
      * @see #setStylesheet(File)
      * @since Ant 1.4
      */
-    void transform(File infile, File outfile) throws Exception;
+    void transform(File infile, File outfile) throws Exception; //NOSONAR
 
 } //-- XSLTLiaison
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 75445928a..24b5bb62a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1380,7 +1380,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
      * @since Ant 1.7
      */
     private void setLiaisonDynamicFileParameters(
-        final XSLTLiaison liaison, final File inFile) throws Exception {
+        final XSLTLiaison liaison, final File inFile) throws Exception { //NOSONAR
         if (fileNameParameter != null) {
             liaison.addParam(fileNameParameter, inFile.getName());
         }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index 10620ee44..a6cd6d652 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -143,7 +143,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
      * Constructor for TraXLiaison.
      * @throws Exception never
      */
-    public TraXLiaison() throws Exception {
+    public TraXLiaison() throws Exception { //NOSONAR
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
index b2c5d0f52..0c143cfcd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
@@ -144,7 +144,7 @@ public class jlink {
      * a rational manner to outfile.
      * @throws Exception on error.
      */
-    public void link() throws Exception {
+    public void link() throws Exception { //NOSONAR
         ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outfile));
 
         if (compression) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index e15e11edb..edf63b667 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -702,10 +702,10 @@ public class JUnitTask extends Task {
     /**
      * Creates a new JUnitRunner and enables fork of a new Java VM.
      *
-     * @throws Exception under ??? circumstances
+     * @throws Exception never
      * @since Ant 1.2
      */
-    public JUnitTask() throws Exception {
+    public JUnitTask() throws Exception { //NOSONAR
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index c2a60ed6f..b22f5176f 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1603,7 +1603,7 @@ public class FileUtils {
      *
      * @since Ant 1.7
      */
-    public static String getRelativePath(File fromFile, File toFile) throws Exception {
+    public static String getRelativePath(File fromFile, File toFile) throws Exception { //NOSONAR
         String fromPath = fromFile.getCanonicalPath();
         String toPath = toFile.getCanonicalPath();
 
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index dcae2b81b..4ce9ee37e 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -195,7 +195,7 @@ public final class StringUtils {
      * @throws Exception if there is a problem.
      * @since Ant 1.7
      */
-    public static long parseHumanSizes(String humanSize) throws Exception {
+    public static long parseHumanSizes(String humanSize) throws Exception { //NOSONAR
         long factor = 1L;
         char s = humanSize.charAt(0);
         switch (s) {