Browse Source

Restore backwards compatibility

master
Gintas Grigelionis 7 years ago
parent
commit
1f4d6c8c28
2 changed files with 7 additions and 5 deletions
  1. +3
    -2
      src/main/org/apache/tools/ant/taskdefs/Concat.java
  2. +4
    -3
      src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

+ 3
- 2
src/main/org/apache/tools/ant/taskdefs/Concat.java View File

@@ -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);
}

/**


+ 4
- 3
src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -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();
}

/**


Loading…
Cancel
Save