From 781433259a76bc117f5a824e95b5be1de64eac7f Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 18 Apr 2007 04:17:52 +0000 Subject: [PATCH] Java 6's javac doesn't understand -source 1.1 either (found by Gump and the log4j build ) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@529855 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/compilers/DefaultCompilerAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ac822873a..4884f28de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -321,10 +321,10 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { 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);