diff --git a/WHATSNEW b/WHATSNEW index 6c090c2a0..65c747513 100644 --- a/WHATSNEW +++ b/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: ----------- diff --git a/manual/Tasks/concat.html b/manual/Tasks/concat.html index e436d2acd..1bdbd5a07 100644 --- a/manual/Tasks/concat.html +++ b/manual/Tasks/concat.html @@ -232,25 +232,25 @@ Resource Collections are used to Whether to filter the text provided by this sub element, default is "yes". - No + No file A file to place at the head or tail of the concatenated text. - No + No trim Whether to trim the value, default is "no" - No + No trimleading Whether to trim leading white space on each line, default is "no" - No + No diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html index 5eb6c3f2a..c08d940dc 100644 --- a/manual/Tasks/ejb.html +++ b/manual/Tasks/ejb.html @@ -1614,67 +1614,67 @@ documentation for more details.

- - - + + + - - + - + - - - + + + - - + - + - - + - + - - + - + - - + - + - - + - + - - - + + + - - - + + + @@ -1685,42 +1685,42 @@ documentation for more details.

- - + - + - - - + + + - - + - + - + - + - + - + - - + - + diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java index b4f173d8a..6ab58c034 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java +++ b/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. * + * @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 instructions = new Vector<>(); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java index b39832ba8..40d0caacf 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java +++ b/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");
AttributeDescriptionRequiredAttributeDescriptionRequired
destdirThe base directory into which the generated JAR files + destdirThe 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 "descriptordir" namespace.YesYes
jonasrootThe root directory for JOnAS.YesjonasrootThe root directory for JOnAS.Yes
classpathThe classpath used when generating EJB stubs and + classpathThe 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.NoNo
keepgeneratedtrue if the intermediate Java + keepgeneratedtrue if the intermediate Java source files generated by GenIC must be deleted or not. If omitted, it defaults to false.NoNo
nocompiltrue if the generated source files + nocompiltrue if the generated source files must not be compiled via the java and rmi compilers. If omitted, it defaults to false.NoNo
novalidationtrue if the XML deployment descriptors must + novalidationtrue if the XML deployment descriptors must be parsed without validation. If omitted, it defaults to false.NoNo
javacJava compiler to use. If omitted, it defaults + javacJava compiler to use. If omitted, it defaults to the value of build.compiler property.NoNo
javacoptsOptions to pass to the java compiler.NojavacoptsOptions to pass to the java compiler.No
rmicoptsOptions to pass to the rmi compiler.NormicoptsOptions to pass to the rmi compiler.No
secpropag No
verboseIndicates whether or not to use -verbose switch. If + verboseIndicates whether or not to use -verbose switch. If omitted, it defaults to false.NoNo
additionalargsAdd additional args to GenIC.NoadditionalargsAdd additional args to GenIC.No
keepgenerictrue if the generic JAR file used as input + keepgenerictrue if the generic JAR file used as input to GenIC must be retained. If omitted, it defaults to false.NoNo
jarsuffixjarsuffix String value appended to the JAR filename when creating each JAR. If omitted, it defaults to ".jar".NoNo
orborb 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.NoNo
nogenicIf this attribute is set to true, + nogenicIf this attribute is set to true, 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 false.NoNo