Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant

WHATSNEW

@@ -26,6 +26,10 @@ Changes that could break older environments:
  * The Log4jListener is marked as deprecated as the required log4j library
    (in version 1.x) is not maintained any more.
 
+ * Image task is marked as deprecated as the required JAI library is not
+   maintained any more and internal APIs that JAI depended on are no longer
+   available in Java 9.
+
 Fixed bugs:
 -----------
 

manual/Tasks/concat.html

@@ -232,25 +232,25 @@ Resource Collection</a>s are used to
           <td valign="top">
             Whether to filter the text provided by this sub element,
             default is "yes".
-          <td valign="top" align = "center">No</td>
+          <td valign="top" align="center">No</td>
         </tr>
         <tr>
           <td valign="top">file</td>
           <td valign="top">A file to place at the head or tail of the
                            concatenated text.
-          <td valign="top" align = "center">No</td>
+          <td valign="top" align="center">No</td>
         </tr>
         <tr>
           <td valign="top">trim</td>
           <td valign="top">Whether to trim the value, default is "no"</td>
-          <td valign="top" align = "center">No</td>
+          <td valign="top" align="center">No</td>
         </tr>
         <tr>
           <td valign="top">trimleading</td>
           <td valign="top">
             Whether to trim leading white space on each line, default is "no"
           </td>
-          <td valign="top" align = "center">No</td>
+          <td valign="top" align="center">No</td>
         </tr>
       </table>
 

manual/Tasks/ejb.html

@@ -1614,67 +1614,67 @@ documentation for more details.</p>
 <table>
   <tbody>
     <tr>
-      <td valign="Top"><b>Attribute</b></td>
-      <td valign="Top"><b>Description</b></td>
-      <td align="Center" valign="Top"><b>Required</b></td>
+      <td valign="top"><b>Attribute</b></td>
+      <td valign="top"><b>Description</b></td>
+      <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
-      <td valign="Top">destdir</td>
-      <td valign="Top">The base directory into which the generated JAR files
+      <td valign="top">destdir</td>
+      <td valign="top">The base directory into which the generated JAR files
       will be written. Each JAR file is written in directories which correspond
       to their location within the "<code>descriptordir</code>" namespace.</td>
-      <td align="Center" valign="Top">Yes</td>
+      <td align="center" valign="top">Yes</td>
     </tr>
     <tr>
-      <td valign="Top">jonasroot</td>
-      <td valign="Top">The root directory for JOnAS.</td>
-      <td valign="Top" align="Center">Yes</td>
+      <td valign="top">jonasroot</td>
+      <td valign="top">The root directory for JOnAS.</td>
+      <td valign="top" align="center">Yes</td>
     </tr>
     <tr>
-      <td valign="Top">classpath</td>
-      <td valign="Top">The classpath used when generating EJB stubs and
+      <td valign="top">classpath</td>
+      <td valign="top">The classpath used when generating EJB stubs and
       skeletons. If omitted, the classpath specified in the "ejbjar" parent
       task will be used. If specified, the classpath elements will be prepended
       to the classpath specified in the parent "ejbjar" task (see also the ORB
       attribute documentation below). Note that nested "classpath" elements may
       also be used.</td>
-      <td valign="Top" align="Center">No</td>
+      <td valign="top" align="center">No</td>
     </tr>
     <tr>
-      <td valign="Top">keepgenerated</td>
-      <td valign="Top"><code>true</code> if the intermediate Java
+      <td valign="top">keepgenerated</td>
+      <td valign="top"><code>true</code> if the intermediate Java
       source files generated by GenIC must be deleted or not. If
       omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">nocompil</td>
-      <td valign="Top"><code>true</code> if the generated source files
+      <td valign="top">nocompil</td>
+      <td valign="top"><code>true</code> if the generated source files
       must not be compiled via the java and rmi compilers. If omitted,
       it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">novalidation</td>
-      <td valign="Top"><code>true</code> if the XML deployment descriptors must
+      <td valign="top">novalidation</td>
+      <td valign="top"><code>true</code> if the XML deployment descriptors must
       be parsed without validation. If omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">javac</td>
-      <td valign="Top">Java compiler to use. If omitted, it defaults
+      <td valign="top">javac</td>
+      <td valign="top">Java compiler to use. If omitted, it defaults
       to the value of <code>build.compiler</code> property.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">javacopts</td>
-      <td valign="Top">Options to pass to the java compiler.</td>
-      <td align="Center" valign="Top">No</td>
+      <td valign="top">javacopts</td>
+      <td valign="top">Options to pass to the java compiler.</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">rmicopts</td>
-      <td valign="Top">Options to pass to the rmi compiler.</td>
-      <td align="Center" valign="Top">No</td>
+      <td valign="top">rmicopts</td>
+      <td valign="top">Options to pass to the rmi compiler.</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
       <td valign="top">secpropag</td>
@@ -1685,42 +1685,42 @@ documentation for more details.</p>
       <td valign="top" align="center">No</td>
     </tr>
     <tr>
-      <td valign="Top">verbose</td>
-      <td valign="Top">Indicates whether or not to use -verbose switch. If
+      <td valign="top">verbose</td>
+      <td valign="top">Indicates whether or not to use -verbose switch. If
       omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">additionalargs</td>
-      <td valign="Top">Add additional args to GenIC.</td>
-      <td align="Center" valign="Top">No</td>
+      <td valign="top">additionalargs</td>
+      <td valign="top">Add additional args to GenIC.</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">keepgeneric</td>
-      <td valign="Top"><code>true</code> if the generic JAR file used as input
+      <td valign="top">keepgeneric</td>
+      <td valign="top"><code>true</code> if the generic JAR file used as input
       to GenIC must be retained. If omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">jarsuffix</td>
+      <td valign="top">jarsuffix</td>
       <td>String value appended to the JAR filename when creating each JAR.  If
       omitted, it defaults to ".jar".</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">orb</td>
+      <td valign="top">orb</td>
       <td>Choose your ORB : RMI, JEREMIE, DAVID. If omitted, it defaults to the
       one present in classpath. If specified, the corresponding JOnAS JAR is
       automatically added to the classpath.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
-      <td valign="Top">nogenic</td>
-      <td valign="Top">If this attribute is set to <code>true</code>,
+      <td valign="top">nogenic</td>
+      <td valign="top">If this attribute is set to <code>true</code>,
       JOnAS's GenIC will not be run on the EJB JAR. Use this if you
       prefer to run GenIC at deployment time. If omitted, it defaults
       to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td align="center" valign="top">No</td>
     </tr>
     <tr>
   </tbody>

src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java

@@ -53,9 +53,12 @@ import com.sun.media.jai.codec.FileSeekableStream;
  * href="http://java.sun.com/products/java-media/jai/forDevelopers/jai1_0_1guide-unc/">
  * JAI Programming Guide</a>.
  *
+ * @deprecated JAI is not developed any more. Internal APIs that JAI depends on were
+ * scheduled for removal in Java 7 and finally removed in Java 9.
  * @see org.apache.tools.ant.types.optional.image.ImageOperation
  * @see org.apache.tools.ant.types.DataType
  */
+@Deprecated
 public class Image extends MatchingTask {
     // CheckStyle:VisibilityModifier OFF - bc
     protected Vector<ImageOperation> instructions = new Vector<>();

src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java

@@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.image;
 import org.apache.tools.ant.AntAssert;
 import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.JavaEnvUtils;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -29,6 +30,7 @@ import org.junit.Test;
 import java.io.File;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 
@@ -48,6 +50,8 @@ public class ImageTest {
 
     @Before
     public void setUp() {
+        /* JAI depends on internal API removed in Java 9 */
+        assumeFalse(JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
         buildRule.configureProject(TASKDEFS_DIR + "image.xml");
     }
 
@@ -72,7 +76,7 @@ public class ImageTest {
         buildRule.executeTarget("testSimpleScale");
         AntAssert.assertContains("Processing File", buildRule.getLog());
         File f = new File(buildRule.getOutputDir(), LARGEIMAGE);
-        assumeTrue("Could not change file modificaiton date",
+        assumeTrue("Could not change file modification date",
                 f.setLastModified(f.lastModified() - FILE_UTILS.getFileTimestampGranularity() * 2));
         long lastModified = f.lastModified();
         buildRule.executeTarget("testOverwriteTrue");