From 35aee5ccea917873433c9c3caf2482c03fe16c72 Mon Sep 17 00:00:00 2001 From: Sam Ruby Date: Fri, 8 Jun 2001 19:39:49 +0000 Subject: [PATCH] Prep for JDK 1.4. Note: I did a complete scan of the code. Mostly it the version checks are safe (e.g., things not supported with 1.1). The only place where it wasn't obvious to me was RMIC, but it seemed OK. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269132 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Javac.java | 3 ++- src/main/org/apache/tools/ant/taskdefs/optional/Javah.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index 7917f84bd..f648bc0ab 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -438,7 +438,8 @@ public class Javac extends MatchingTask { String compiler = project.getProperty("build.compiler"); if (compiler == null) { - if (Project.getJavaVersion().startsWith("1.3")) { + if (Project.getJavaVersion() != Project.JAVA_1_1 && + Project.getJavaVersion() != Project.JAVA_1_2) { compiler = "modern"; } else { compiler = "classic"; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index 0c0d6aae2..3813295a0 100755 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -276,7 +276,8 @@ public class Javah extends Task { String compiler = project.getProperty("build.compiler"); if (compiler == null) { - if (Project.getJavaVersion().startsWith("1.3")) { + if (Project.getJavaVersion() != Project.JAVA_1_1 && + Project.getJavaVersion() != Project.JAVA_1_2) { compiler = "modern"; } else { compiler = "classic";