diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 933a8fd0f..944f3f494 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,9 +2,11 @@ Amongst other, the following people contributed to ant: Adam Blinkinsop Adam Bryzak +Adam Murdoch Adam Retter Adam Sotona Adrian Nistor +Adrien Grand Aleksandr Ishutin Alex Rosen Alexei Yudichev @@ -28,13 +30,16 @@ Anthony Wat Antoine Baudoux Antoine Levy-Lambert Anton Mazkovoi +Arcadius Ahouansou Arjan Veenstra Arnaud Vandyck Arnout J. Kuiper +Arun Jamwal Aslak Hellesôy Atsuhiko Yamanaka Avik Sengupta Balazs Fejes 2 +barney2k7 Bart Vanhaute Ben Galbraith Ben Gertzfield @@ -50,6 +55,7 @@ Brian Felder Brian Repko Bruce Atherton Cedomir Igaly +Charles Duffy Charles Hudak Charlie Hubbard Chris Hegarty @@ -66,6 +72,7 @@ Clemens Hammacher Clement OUDOT Clive Brettingham-Moore Conor MacNeill +Costin Manolache Craeg Strong Craig Cottingham Craig R. McClanahan @@ -87,6 +94,7 @@ Daniel Trebbien Danno Ferrin Danny Yates Dante Briones +Darrell DeBoer Davanum Srinivas Dave Brondsema Dave Brosius @@ -111,6 +119,7 @@ Don Brown Don Ferguson Don Jeffery Donal Quinlan +Donald Leslie Drew Sudell Earl Hood Edison Guo @@ -133,6 +142,7 @@ Frank Zeyda František Kučera Frédéric Bothamy Frederic Lavigne +Gal Shachor Gary S. Weaver Gautam Guliani Gene-Sung Chung @@ -165,8 +175,10 @@ Ivan Ivanov J Bleijenbergh JC Mann Jack J. Woehr +Jacobus Martinus Kruithof Jaikiran Pai James Duncan Davidson +James Todd Jan Cumps Jan Matèrne Jan Mynarik @@ -201,12 +213,14 @@ John Sisson Jon Dickinson Jon Skeet Jon S. Stevens +Jonathan K. Schneider Jose Alberto Fernandez Joseph Walton Josh Lucas Juerg Wanner Julian Simpson Justin Vallon +Justyna Horwat Karl Jansen Keiron Liddle Keith Visco @@ -281,10 +295,13 @@ Mounir El Hajj Nathan Beyer Nick Chalko Nick Crossley +Nick Davis Nick Fortescue +Nick King Nick Pellow Nico Seessle Nicola Ken Barozzi +Nicolas Lalevée Nigel Magnay Oliver Merkel Oliver Rossmueller @@ -316,11 +333,13 @@ Philip Hourihane Phillip Wells Pierre Delisle Pierre Dittgen +Preston Bannister Ralf Hergert Rami Ojares Randy Watler Raphael Pierquin Ray Waldin +Razzi Abuissa Reinhard Pointner Remie Bolte René Krell @@ -360,6 +379,7 @@ Sean P. Kane Sebastian Kantha Sebastien Arod Shiraz Kanga +Simeon Fitch Simon Law Simone Bordet Stefan Bodewig @@ -408,10 +428,12 @@ Ulrich Schmidt Uwe Schindler Valentino Miazzo Victor Toni +Ville Skyttä Vimil Saju Vincent Legoll Vincent Privat Vitold Sedyshev +Vladislav Bauer Volker Leidl Waldek Herka Wang Weijun diff --git a/contributors.xml b/contributors.xml index c0ed60ba4..bd7560e29 100644 --- a/contributors.xml +++ b/contributors.xml @@ -38,6 +38,10 @@ Adam Bryzak + + Adam + Murdoch + Adam Retter @@ -50,6 +54,10 @@ Adrian Nistor + + Adrien + Grand + Aleksandr Ishutin @@ -139,6 +147,10 @@ Anton Mazkovoi + + Arcadius + Ahouansou + Arjan Veenstra @@ -152,6 +164,10 @@ J. Kuiper + + Arun + Jamwal + Aslak Hellesôy @@ -168,6 +184,9 @@ Balazs Fejes 2 + + barney2k7 + Bart Vanhaute @@ -229,6 +248,10 @@ Cedomir Igaly + + Charles + Duffy + Charles Hudak @@ -294,6 +317,10 @@ Conor MacNeill + + Costin + Manolache + Craeg Strong @@ -379,6 +406,10 @@ Dante Briones + + Darrell + DeBoer + Davanum Srinivas @@ -480,6 +511,10 @@ Donal Quinlan + + Donald + Leslie + Drew Sudell @@ -564,6 +599,10 @@ Frederic Lavigne + + Gal + Shachor + Gary S. @@ -694,6 +733,11 @@ J. Woehr + + Jacobus + Martinus + Kruithof + Jaikiran Pai @@ -703,6 +747,10 @@ Duncan Davidson + + James + Todd + Jan Cumps @@ -841,6 +889,11 @@ S. Stevens + + Jonathan + K. + Schneider + Jose Alberto @@ -866,6 +919,10 @@ Justin Vallon + + Justyna + Horwat + Karl Jansen @@ -1166,10 +1223,18 @@ Nick Crossley + + Nick + Davis + Nick Fortescue + + Nick + King + Nick Pellow @@ -1183,6 +1248,10 @@ Ken Barozzi + + Nicolas + Lalevée + Nigel Magnay @@ -1310,6 +1379,10 @@ Pierre Dittgen + + Preston + Bannister + Ralf Hergert @@ -1330,6 +1403,10 @@ Ray Waldin + + Razzi + Abuissa + Reinhard Pointner @@ -1489,6 +1566,10 @@ Shiraz Kanga + + Simeon + Fitch + Simon Law @@ -1682,6 +1763,10 @@ Victor Toni + + Ville + Skyttä + Vimil Saju @@ -1698,6 +1783,10 @@ Vitold Sedyshev + + Vladislav + Bauer + Volker Leidl diff --git a/manual/Tasks/available.html b/manual/Tasks/available.html index 39cffe98a..e28aadc78 100644 --- a/manual/Tasks/available.html +++ b/manual/Tasks/available.html @@ -28,6 +28,8 @@

Description

Sets a property if a resource is available at run time. This resource can be a file, a directory, a class in the classpath, or a JVM system resource.

+

Note: a class is available in the classpath when it can be loaded; i.e., all +classes it depends on must be in the classpath, too.

If the resource is present, the property value is set to true by default; otherwise, the property is not set. You can set the value to something other than the default by specifying the value attribute.

diff --git a/manual/Tasks/junitlauncher.html b/manual/Tasks/junitlauncher.html index bc360a9a1..c818f797b 100644 --- a/manual/Tasks/junitlauncher.html +++ b/manual/Tasks/junitlauncher.html @@ -109,7 +109,7 @@ include all other relevant jars in the classpath by passing them as a -lib option, while invoking Ant
  • OR Use the nested <classpath> element to specify the location of the - test engines. For more details about this approach, please read the + test engines. For more details about this approach, please read the using classpath element to include test engines section. @@ -171,22 +171,22 @@
    Using the classpath element to include test engines

    The <classpath> can be used to include the test engines that you want to be - considered for execution of the tests. + considered for execution of the tests.

    -

    - NOTE: An important aspect to remember is that - whether or not you use this approach, the JUnit 5 platform libraries - listed earlier in this +

    + NOTE: An important aspect to remember is that + whether or not you use this approach, the JUnit 5 platform libraries + listed earlier in this document and the ant-junitlauncher.jar, shouldn't be part of this classpath - and instead they must be included in Ant runtime's classpath either by placing them + and instead they must be included in Ant runtime's classpath either by placing them in ANT_HOME/lib or by passing the -lib option.

    Below is an example of setting up the classpath to include the Jupiter test engine during the - execution of the tests. We assume that the JUnit 5 platform libraries and the + execution of the tests. We assume that the JUnit 5 platform libraries and the ant-junitlauncher.jar have been setup as explained previously.
    -

     
    +    
     <project>
     
         <property name="output.dir" value="${basedir}/build"/>
    @@ -206,35 +206,35 @@
             <javac srcdir="${src.test.dir}"
                destdir="${build.classes.dir}">
                <classpath refid="junit.engine.jupiter.classpath"/>
    -        </javac>  
    -    </target> 
    +        </javac>
    +    </target>
     
         <target name="test" depends="compile-test">
             <junitlauncher>
                 <classpath refid="junit.engine.jupiter.classpath"/>
                 <classpath>
                     <pathelement location="${build.classes.dir}"/>
    -            </classpath>  
    +            </classpath>
                 <testclasses outputdir="${output.dir}">
                     <fileset dir="${build.classes.dir}"/>
                     <listener type="legacy-brief" sendSysOut="true"/>
                     <listener type="legacy-xml" sendSysErr="true" sendSysOut="true"/>
    -         
    +
                 </testclasses>
             </junitlauncher>
    -    </target> 
    +    </target>
     </project>
         
    - In the example above, the src/lib/jupiter directory is expected to contain - the Jupiter test engine related jars (which have been + In the example above, the src/lib/jupiter directory is expected to contain + the Jupiter test engine related jars (which have been listed in an earlier section of this document). In the test target we use the classpath nested element to point to the junit.engine.jupiter.classpath containing those jars. In this - test target we also use another classpath element to point to - the location containing our test classes. If required, both these classpath can be combined + test target we also use another classpath element to point to + the location containing our test classes. If required, both these classpath can be combined into one. -

    +

    listener

    diff --git a/manual/install.html b/manual/install.html index 306e1378e..055de7c88 100644 --- a/manual/install.html +++ b/manual/install.html @@ -892,9 +892,10 @@ these tasks available. Please refer to the Installing A javax.mail.jar - mail task and deprecated mimemail task + mail task + and deprecated mimemail task https://javaee.github.io/javamail/ + target="_top">https://javaee.github.io/javamail/ activation.jar
    @@ -942,11 +943,11 @@ these tasks available. Please refer to the Installing A https://www.tukaani.org/xz/java.html - JUnit 5 Platform jars: + JUnit 5 Platform jars:
    • junit-platform-commons.jar
    • junit-platform-engine.jar
    • -
    • junit-platform-launcher.jar
    • +
    • junit-platform-launcher.jar
    junitlauncher task. Additional libraries maybe needed depending diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index 024efd215..9b573d98b 100644 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@ -20,7 +20,7 @@ Please contact us if you are not satisfied with the data contained in this POM. URL : http://ant.apache.org --> - org.apache.ant @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma 1.10.6-SNAPSHOT 4.0.0 - http://ant.apache.org/ + http://ant.apache.org/ org.apache.ant ant-javamail 1.10.6-SNAPSHOT @@ -52,7 +52,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma 1.6.1 compile - +