Repository: ant Updated Branches: refs/heads/master 9820327be -> 1f4d6c8c2
Restore backwards compatibility Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1f4d6c8c Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1f4d6c8c Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1f4d6c8c Branch: refs/heads/master Commit: 1f4d6c8c28d17f21c1f9d84c6bdfb5267db45cbb Parents: 9820327 Author: Gintas Grigelionis <gin...@apache.org> Authored: Tue Apr 10 17:07:30 2018 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Tue Apr 10 17:07:30 2018 +0200 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/taskdefs/Concat.java | 5 +++-- .../tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/1f4d6c8c/src/main/org/apache/tools/ant/taskdefs/Concat.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 86c0c2a..59802f9 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); } /** http://git-wip-us.apache.org/repos/asf/ant/blob/1f4d6c8c/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java ---------------------------------------------------------------------- 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 1e0ad54..078eda8 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(); } /**
