diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bc935a7c2..22299a85d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -36,6 +36,7 @@ Arcadius Ahouansou
 Arjan Veenstra
 Arnaud Vandyck
 Arnout J. Kuiper
+Arturo Bernal
 Arun Jamwal
 Aslak Hellesôy
 Atsuhiko Yamanaka
diff --git a/contributors.xml b/contributors.xml
index c84ec148b..bbdbc1f45 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -172,6 +172,10 @@
     <middle>J.</middle>
     <last>Kuiper</last>
   </name>
+  <name>
+    <first>Arturo</first>
+    <last>Bernal</last>
+  </name>
   <name>
     <first>Arun</first>
     <last>Jamwal</last>
diff --git a/src/main/org/apache/tools/ant/NoBannerLogger.java b/src/main/org/apache/tools/ant/NoBannerLogger.java
index b2e5c1450..628390d1f 100644
--- a/src/main/org/apache/tools/ant/NoBannerLogger.java
+++ b/src/main/org/apache/tools/ant/NoBannerLogger.java
@@ -88,7 +88,7 @@ public class NoBannerLogger extends DefaultLogger {
 
         synchronized (this) {
             if (null != targetName) {
-                out.println(String.format("%n%s:", targetName));
+                out.printf("%n%s:%n", targetName);
                 targetName = null;
             }
         }
diff --git a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
index 62237ef82..6d8b21177 100644
--- a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
@@ -107,9 +107,9 @@ public class RecorderEntry implements BuildLogger, SubBuildListener {
             Throwable error = event.getException();
 
             if (error == null) {
-                out.println(String.format("%nBUILD SUCCESSFUL"));
+                out.printf("%nBUILD SUCCESSFUL%n");
             } else {
-                out.println(String.format("%nBUILD FAILED%n"));
+                out.printf("%nBUILD FAILED%n%n");
                 error.printStackTrace(out); //NOSONAR
             }
         }
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
index 637e9bdf6..8ce805900 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
@@ -94,8 +94,8 @@ public class JavacExternal extends DefaultCompilerAdapter {
         for(int i = nonArgFileOptionIdx + 1; i < commandLine.length; i++) {
             if (!isArgFileEligible(commandLine[i])) {
                 String option = commandLine[i];
-                for(int j = i - 1; j >= nonArgFileOptionIdx; j--) {
-                    commandLine[j + 1] = commandLine[j];
+                if (i - nonArgFileOptionIdx >= 0) {
+                    System.arraycopy( commandLine, nonArgFileOptionIdx, commandLine, nonArgFileOptionIdx + 1, i - nonArgFileOptionIdx );
                 }
                 commandLine[nonArgFileOptionIdx] = option;
                 nonArgFileOptionIdx++;
diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
index 7919a6a57..37cfe3283 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
@@ -1210,6 +1210,7 @@ public class CBZip2OutputStream extends OutputStream
             for (int j = 16; --j >= 0;) {
                 if (inUse[i16 + j]) {
                     inUse16[i] = true;
+                    break;
                 }
             }
         }