ant/apache-ant-r529855.patch

19 lines
1.1 KiB
Diff
Raw Normal View History

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