Blame apache-ant-r529855.patch
|
Permaine Cheung |
bb868a |
Index: src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
|
|
Permaine Cheung |
bb868a |
===================================================================
|
|
Permaine Cheung |
bb868a |
--- src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java (revision 529854)
|
|
Permaine Cheung |
bb868a |
+++ src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java (revision 529855)
|
|
Permaine Cheung |
bb868a |
@@ -321,10 +321,10 @@
|
|
Permaine Cheung |
bb868a |
if (attributes.getSource() != null && !assumeJava13()) {
|
|
Permaine Cheung |
bb868a |
cmd.createArgument().setValue("-source");
|
|
Permaine Cheung |
bb868a |
String source = attributes.getSource();
|
|
Permaine Cheung |
bb868a |
- if ((assumeJava14() || assumeJava15())
|
|
Permaine Cheung |
bb868a |
- && (source.equals("1.1") || source.equals("1.2"))) {
|
|
Permaine Cheung |
bb868a |
+ if (source.equals("1.1") || source.equals("1.2")) {
|
|
Permaine Cheung |
bb868a |
// support for -source 1.1 and -source 1.2 has been
|
|
Permaine Cheung |
bb868a |
- // added with JDK 1.4.2 - and isn't present in 1.5.0 either
|
|
Permaine Cheung |
bb868a |
+ // added with JDK 1.4.2 - and isn't present in 1.5.0
|
|
Permaine Cheung |
bb868a |
+ // or 1.6.0 either
|
|
Permaine Cheung |
bb868a |
cmd.createArgument().setValue("1.3");
|
|
Permaine Cheung |
bb868a |
} else {
|
|
Permaine Cheung |
bb868a |
cmd.createArgument().setValue(source);
|