Merge branch '1.9.x'

src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java

@@ -37,7 +37,7 @@ public class ChangeLogWriter {
     private final SimpleDateFormat outputDate
         = new SimpleDateFormat("yyyy-MM-dd");
     /** output format for times written to xml file */
-    private static SimpleDateFormat outputTime
+    private SimpleDateFormat outputTime
         = new SimpleDateFormat("HH:mm");
     /** stateless helper for writing the XML document */
     private static final DOMElementWriter DOM_WRITER = new DOMElementWriter();

src/main/org/apache/tools/ant/types/resources/StringResource.java

@@ -158,7 +158,7 @@ public class StringResource extends Resource {
      * @return hash code as int.
      */
     @Override
-    public synchronized int hashCode() {
+    public synchronized int hashCode() { //NOSONAR
         // super.equals + super.compareTo are consistent with this implementation
         if (isReference()) {
             return getCheckedRef().hashCode();