diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 86c0c2a9e..59802f947 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -595,7 +595,7 @@ public class Concat extends Task implements ResourceCollection { */ @Deprecated public void setForce(boolean forceOverwrite) { - setOverwrite(forceOverwrite); + this.forceOverwrite = forceOverwrite; } /** @@ -605,8 +605,9 @@ public class Concat extends Task implements ResourceCollection { * input files. * @since Ant 1.8.2 */ + @SuppressWarnings("deprecated") public void setOverwrite(boolean forceOverwrite) { - this.forceOverwrite = forceOverwrite; + setForce(forceOverwrite); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 1e0ad54d7..078eda8a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -697,7 +697,8 @@ public abstract class DefaultCompilerAdapter */ @Deprecated protected boolean assumeJava19() { - return assumeJava9(); + return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_9) + || assumeJavaXY("javac9", JavaEnvUtils.JAVA_9); } /** @@ -705,9 +706,9 @@ public abstract class DefaultCompilerAdapter * @return true if JDK 9 * @since Ant 1.9.8 */ + @SuppressWarnings("deprecated") protected boolean assumeJava9() { - return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_9) - || assumeJavaXY("javac9", JavaEnvUtils.JAVA_9); + return assumeJava19(); } /**