Commit ccd26be1 authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 1.9.9

parent 2992beb8
Apache Ant
Copyright 1999-2016 The Apache Software Foundation
Copyright 1999-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
......
Changes from Ant 1.9.8 TO Ant 1.9.9
===================================
Fixed bugs:
-----------
* Ant 1.9.8 made Path#systemClasspath final which broke the Eclipse
integration.
Bugzilla Report 60582
* the wrapper script still didn't work on Solaris 10, but worked on
Solaris 11.
The "fixed" script should work in most cases but will not preserve
newlines present in command line arguments.
Bugzilla Report 60562
Changes from Ant 1.9.7 TO Ant 1.9.8
===================================
......
......@@ -34,10 +34,10 @@
<property name="name" value="ant"/>
<!-- this is the groupId of ant in the Maven repository -->
<property name="groupid" value="org/apache/ant"/>
<property name="project.version" value="1.9.8"/>
<property name="project.version" value="1.9.9"/>
<!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
<property name="pom.version" value="1.9.8"/>
<property name="manifest-version" value="1.9.8"/>
<property name="pom.version" value="1.9.9"/>
<property name="manifest-version" value="1.9.9"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
......
......@@ -19,14 +19,14 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<title>Apache Ant 1.9.8 User Manual</title>
<title>Apache Ant 1.9.9 User Manual</title>
</head>
<body bgcolor="#FFFFFF">
<div align="center">
<h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
<h1>Apache Ant&trade; 1.9.8 Manual</h1>
<p align="left">This is the manual for version 1.9.8 of
<h1>Apache Ant&trade; 1.9.9 Manual</h1>
<p align="left">This is the manual for version 1.9.9 of
<a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>.
If your version
of Ant (as verified with <tt>ant -version</tt>) is older or newer than this
......
......@@ -62,7 +62,7 @@
</ul>
<center>
<p>Version: 1.9.8</p>
<p>Version: 1.9.9</p>
</center>
......
......@@ -70,13 +70,13 @@ in the same order they've been found in an internal 'repository':
service declarations in the META-INF: it searches in the classpath for a
file <code>META-INF/services/org.apache.tools.ant.ProjectHelper</code>.
This file will just contain the fully qualified name of the
implementation of <code>ProjectHelper</code> to instanciate;</li>
implementation of <code>ProjectHelper</code> to instantiate;</li>
<li>it will also search with the system class loader for
<code>ProjectHelper</code> service declarations in the META-INF;</li>
<li>last but not least it will add its default <code>ProjectHelper</code>
that can parse classical build.xml files.</li>
</ul>
In case of an error while trying to instanciate a <code>ProjectHelper</code>, Ant
In case of an error while trying to instantiate a <code>ProjectHelper</code>, Ant
will log an error but won't stop. If you want further debugging
info about the <code>ProjectHelper</code> internal 'repository', use the <b>system</b>
property <code>ant.project-helper-repo.debug</code> and set it to
......@@ -104,7 +104,7 @@ The class <code>org.apache.tools.ant.ProjectHelper</code> is the API expected to
be implemented. So write your own <code>ProjectHelper</code> by extending that
abstract class. You are then expected to implement at least the function
<code>parse(Project project, Object source)</code>. Note also that your
implementation will be instanciated by Ant, and it is expecting a default
implementation will be instantiated by Ant, and it is expecting a default
constructor with no arguments.
</p>
......
......@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + ANTLR</name>
<description>antlr specific task.
The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
......
......@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bcel</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + BCEL</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bsf</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + BSF</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-log4j</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Log4J</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-oro</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Apache Oro</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Apache Regexp</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-resolver</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Apache Resolver</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-xalan2</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Xalan 2</name>
<description>contains Xalan2-specific features</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-logging</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Commons Logging</name>
<description>Ant Listener based on commons-logging</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-net</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Commons Net</name>
<description>ftp, rexec and telnet tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jai</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JAI</name>
<description>image task and corresponding types.
</description>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-javamail</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JavaMail</name>
<description>implementation of the mail task based on javamail.
Required to send emails to SMTP servers using user/password combinations
......@@ -41,7 +41,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jdepend</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JDepend</name>
<description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
jdepend parser available on the maven repository</description>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jmf</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JMF</name>
<description>contains the sound task and a soundplayer listener
download the dependency from http://java.sun.com/products/java-media/jmf/</description>
......@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
......@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JSch</name>
<description>contains the sshexec and scp tasks
</description>
......@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JUnit</name>
<description>contains the junit and junirreport tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -26,20 +26,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit4</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + JUnit 4</name>
<description>contains JUnit 4.x support</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant Launcher</name>
<build>
<plugins>
......
......@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-netrexx</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + NetRexx</name>
<description>NetRexxC task
dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
......@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<!-- Processed too early, before maven-antrun-plugin gets a chance to work:
......
......@@ -27,20 +27,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-swing</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant + Swing</name>
<description>a listener and a splash task based on Swing</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
......@@ -27,20 +27,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant Test Utilities</name>
<description>test utility classes</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.9.8</version>
<version>1.9.9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<name>Apache Ant Core</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<scope>compile</scope>
</dependency>
<dependency>
......
......@@ -25,7 +25,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<version>1.9.8</version>
<version>1.9.9</version>
<packaging>pom</packaging>
<description>master POM</description>
<licenses>
......
......@@ -32,10 +32,10 @@
<fail>
<condition>
<not>
<antversion exactly="1.9.8" />
<antversion exactly="1.9.9" />
</not>
</condition>
Should be exactly 1.9.8
Should be exactly 1.9.9
</fail>
</target>
......@@ -45,10 +45,10 @@
<fail>
<condition>
<not>
<antversion atleast="1.9.8" />
<antversion atleast="1.9.9" />
</not>
</condition>
Should be at least 1.9.8
Should be at least 1.9.9
</fail>
</target>
......@@ -57,10 +57,10 @@
<fail>
<condition>
<not>
<antversion exactly="1.9.8" />
<antversion exactly="1.9.9" />
</not>
</condition>
Should be exactly 1.9.8
Should be exactly 1.9.9
</fail>
</target>
</project>
......@@ -48,7 +48,7 @@ public class ArgumentProcessorRegistry {
private static final String DEBUG_ARGUMENT_PROCESSOR_REPOSITORY = "ant.argument-processor-repo.debug";
// The message log level is not accessible here because everything
// is instanciated statically
// is instantiated statically
private static final boolean DEBUG = "true".equals(System.getProperty(DEBUG_ARGUMENT_PROCESSOR_REPOSITORY));
private static final String SERVICE_ID = "META-INF/services/org.apache.tools.ant.ArgumentProcessor";
......@@ -128,7 +128,7 @@ public class ArgumentProcessorRegistry {
} catch (Exception e) {
throw new BuildException("The argument processor class"
+ processorClass.getClass().getName()
+ " could not be instanciated with a default constructor",
+ " could not be instantiated with a default constructor",
e);
}
return processor;
......
......@@ -46,7 +46,7 @@ public class ProjectHelperRepository {
"ant.project-helper-repo.debug";
// The message log level is not accessible here because everything
// is instanciated statically
// is instantiated statically
private static final boolean DEBUG =
"true".equals(System.getProperty(DEBUG_PROJECT_HELPER_REPOSITORY));
......
......@@ -66,8 +66,9 @@ import org.apache.tools.ant.util.JavaEnvUtils;
public class Path extends DataType implements Cloneable, ResourceCollection {
// CheckStyle:VisibilityModifier OFF - bc
// non-final as some IDE integrations (at least Eclipse) want to override it
/** The system classpath as a Path object */
public static final Path systemClasspath =
public static Path systemClasspath = //NOSONAR
new Path(null, System.getProperty("java.class.path"));
......
......@@ -22,15 +22,17 @@ use_jikes_default=false
ant_exec_debug=false
show_help=false
esc_tool=sed
# if awk esc_tool is chosen, use nawk when available
if [ "$esc_tool" = "awk" ]
if [ -z "$PROTECT_NL" ]
then
awk_exec=awk
# Solaris_awk does not support gsub, but Solaris_nawk does
# `command -v` behavior is part of posix spec
command -v nawk >/dev/null && awk_exec=nawk
PROTECT_NL=true
os=`uname -s`
rel=`uname -r`
# heirloom bourne-shell used by Solaris 10 is not POSIX
# it lacks features necessary to protect trailing NL from subshell trimming
if [ "$os" = SunOS -a "$rel" = "5.10" ]
then
PROTECT_NL=false
fi
fi
for arg in "$@" ; do
......@@ -48,42 +50,24 @@ for arg in "$@" ; do
show_help=true
fi