git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1040148 13f79535-47bb-0310-9956-ffa450edef68master
@@ -275,6 +275,12 @@ Other changes: | |||||
* Initial support for OpenJDK7 has been added. | * Initial support for OpenJDK7 has been added. | ||||
* Ant now uses java.net.CookieStore rather than | |||||
java.util.ServiceLocator to detect whether the environment is a | |||||
Java 1.6 system. This means releases of gcj/gij at the time of | |||||
this release of Ant are detected as Java 1.5 and not 1.6. | |||||
Bugzilla Report 50256. | |||||
Changes from Ant 1.8.0 TO Ant 1.8.1 | Changes from Ant 1.8.0 TO Ant 1.8.1 | ||||
=================================== | =================================== | ||||
@@ -351,7 +351,7 @@ | |||||
</condition> | </condition> | ||||
<property name="ignoresystemclasses" value="false"/> | <property name="ignoresystemclasses" value="false"/> | ||||
<available property="jdk1.5+" classname="java.net.Proxy"/> | <available property="jdk1.5+" classname="java.net.Proxy"/> | ||||
<available property="jdk1.6+" classname="java.util.ServiceLoader"/> | |||||
<available property="jdk1.6+" classname="java.net.CookieStore"/> | |||||
<available property="jdk1.7+" classname="java.nio.file.FileSystem"/> | <available property="jdk1.7+" classname="java.nio.file.FileSystem"/> | ||||
<available property="kaffe" classname="kaffe.util.NotImplemented"/> | <available property="kaffe" classname="kaffe.util.NotImplemented"/> | ||||
<available property="harmony" | <available property="harmony" | ||||
@@ -134,7 +134,7 @@ public final class JavaEnvUtils { | |||||
Class.forName("java.net.Proxy"); | Class.forName("java.net.Proxy"); | ||||
javaVersion = JAVA_1_5; | javaVersion = JAVA_1_5; | ||||
javaVersionNumber++; | javaVersionNumber++; | ||||
Class.forName("java.util.ServiceLoader"); | |||||
Class.forName("java.net.CookieStore"); | |||||
javaVersion = JAVA_1_6; | javaVersion = JAVA_1_6; | ||||
javaVersionNumber++; | javaVersionNumber++; | ||||
Class.forName("java.nio.file.FileSystem"); | Class.forName("java.nio.file.FileSystem"); | ||||