Repository: ant Updated Branches: refs/heads/master c9c41729a -> 1afbe154a
Update contributor lists, trim trailing whitespace Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1afbe154 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1afbe154 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1afbe154 Branch: refs/heads/master Commit: 1afbe154ab4048d7804486101b82d4cd3fb9ba30 Parents: c9c4172 Author: Gintas Grigelionis <[email protected]> Authored: Mon Aug 13 20:27:54 2018 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Mon Aug 13 20:27:54 2018 +0200 ---------------------------------------------------------------------- CONTRIBUTORS | 22 +++++++++ contributors.xml | 89 ++++++++++++++++++++++++++++++++++ manual/Tasks/available.html | 2 + manual/Tasks/junitlauncher.html | 38 +++++++-------- manual/install.html | 9 ++-- src/etc/poms/ant-javamail/pom.xml | 6 +-- 6 files changed, 140 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/1afbe154/CONTRIBUTORS ---------------------------------------------------------------------- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 933a8fd..944f3f4 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 LaleveÌ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 http://git-wip-us.apache.org/repos/asf/ant/blob/1afbe154/contributors.xml ---------------------------------------------------------------------- diff --git a/contributors.xml b/contributors.xml index c0ed60b..bd7560e 100644 --- a/contributors.xml +++ b/contributors.xml @@ -40,6 +40,10 @@ </name> <name> <first>Adam</first> + <last>Murdoch</last> + </name> + <name> + <first>Adam</first> <last>Retter</last> </name> <name> @@ -51,6 +55,10 @@ <last>Nistor</last> </name> <name> + <first>Adrien</first> + <last>Grand</last> + </name> + <name> <first>Aleksandr</first> <last>Ishutin</last> </name> @@ -140,6 +148,10 @@ <last>Mazkovoi</last> </name> <name> + <first>Arcadius</first> + <last>Ahouansou</last> + </name> + <name> <first>Arjan</first> <last>Veenstra</last> </name> @@ -153,6 +165,10 @@ <last>Kuiper</last> </name> <name> + <first>Arun</first> + <last>Jamwal</last> + </name> + <name> <first>Aslak</first> <last>Hellesôy</last> </name> @@ -169,6 +185,9 @@ <last>Fejes 2</last> </name> <name> + <last>barney2k7</last> + </name> + <name> <first>Bart</first> <last>Vanhaute</last> </name> @@ -231,6 +250,10 @@ </name> <name> <first>Charles</first> + <last>Duffy</last> + </name> + <name> + <first>Charles</first> <last>Hudak</last> </name> <name> @@ -295,6 +318,10 @@ <last>MacNeill</last> </name> <name> + <first>Costin</first> + <last>Manolache</last> + </name> + <name> <first>Craeg</first> <last>Strong</last> </name> @@ -380,6 +407,10 @@ <last>Briones</last> </name> <name> + <first>Darrell</first> + <last>DeBoer</last> + </name> + <name> <first>Davanum</first> <last>Srinivas</last> </name> @@ -481,6 +512,10 @@ <last>Quinlan</last> </name> <name> + <first>Donald</first> + <last>Leslie</last> + </name> + <name> <first>Drew</first> <last>Sudell</last> </name> @@ -565,6 +600,10 @@ <last>Lavigne</last> </name> <name> + <first>Gal</first> + <last>Shachor</last> + </name> + <name> <first>Gary</first> <middle>S.</middle> <last>Weaver</last> @@ -695,6 +734,11 @@ <last>Woehr</last> </name> <name> + <first>Jacobus</first> + <middle>Martinus</middle> + <last>Kruithof</last> + </name> + <name> <first>Jaikiran</first> <last>Pai</last> </name> @@ -704,6 +748,10 @@ <last>Davidson</last> </name> <name> + <first>James</first> + <last>Todd</last> + </name> + <name> <first>Jan</first> <last>Cumps</last> </name> @@ -842,6 +890,11 @@ <last>Stevens</last> </name> <name> + <first>Jonathan</first> + <middle>K.</middle> + <last>Schneider</last> + </name> + <name> <first>Jose</first> <middle>Alberto</middle> <last>Fernandez</last> @@ -867,6 +920,10 @@ <last>Vallon</last> </name> <name> + <first>Justyna</first> + <last>Horwat</last> + </name> + <name> <first>Karl</first> <last>Jansen</last> </name> @@ -1168,10 +1225,18 @@ </name> <name> <first>Nick</first> + <last>Davis</last> + </name> + <name> + <first>Nick</first> <last>Fortescue</last> </name> <name> <first>Nick</first> + <last>King</last> + </name> + <name> + <first>Nick</first> <last>Pellow</last> </name> <name> @@ -1184,6 +1249,10 @@ <last>Barozzi</last> </name> <name> + <first>Nicolas</first> + <last>LaleveÌe</last> + </name> + <name> <first>Nigel</first> <last>Magnay</last> </name> @@ -1311,6 +1380,10 @@ <last>Dittgen</last> </name> <name> + <first>Preston</first> + <last>Bannister</last> + </name> + <name> <first>Ralf</first> <last>Hergert</last> </name> @@ -1331,6 +1404,10 @@ <last>Waldin</last> </name> <name> + <first>Razzi</first> + <last>Abuissa</last> + </name> + <name> <first>Reinhard</first> <last>Pointner</last> </name> @@ -1490,6 +1567,10 @@ <last>Kanga</last> </name> <name> + <first>Simeon</first> + <last>Fitch</last> + </name> + <name> <first>Simon</first> <last>Law</last> </name> @@ -1683,6 +1764,10 @@ <last>Toni</last> </name> <name> + <first>Ville</first> + <last>Skyttä</last> + </name> + <name> <first>Vimil</first> <last>Saju</last> </name> @@ -1699,6 +1784,10 @@ <last>Sedyshev</last> </name> <name> + <first>Vladislav</first> + <last>Bauer</last> + </name> + <name> <first>Volker</first> <last>Leidl</last> </name> http://git-wip-us.apache.org/repos/asf/ant/blob/1afbe154/manual/Tasks/available.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/available.html b/manual/Tasks/available.html index 39cffe9..e28aadc 100644 --- a/manual/Tasks/available.html +++ b/manual/Tasks/available.html @@ -28,6 +28,8 @@ <h3>Description</h3> <p>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.</p> +<p><strong>Note</strong>: 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.</p> <p>If the resource is present, the property value is set to <q>true</q> by default; otherwise, the property is not set. You can set the value to something other than the default by specifying the <var>value</var> attribute.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/1afbe154/manual/Tasks/junitlauncher.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/junitlauncher.html b/manual/Tasks/junitlauncher.html index bc360a9..c818f79 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 <kbd>-lib</kbd> option, while invoking Ant</li> <li>OR Use the nested <code><classpath></code> 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 <a href=#test-engine-in-classpath>using classpath element to include test engines</a> section. </ul> @@ -171,22 +171,22 @@ <h5 id="test-engine-in-classpath">Using the classpath element to include test engines</h5> <p> The <code><classpath></code> 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. </p> -<p> - <strong>NOTE:</strong> An important aspect to remember is that - whether or not you use this approach, the JUnit 5 platform libraries - <a href="#junit-platform-libraries">listed earlier in this +<p> + <strong>NOTE:</strong> An important aspect to remember is that + whether or not you use this approach, the JUnit 5 platform libraries + <a href="#junit-platform-libraries">listed earlier in this document</a> and the <code>ant-junitlauncher.jar</code>, <i>shouldn't</i> 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 <code>ANT_HOME/lib</code> or by passing the <code>-lib</code> option. </p> <p> 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 <code>ant-junitlauncher.jar</code> have been setup as explained previously. <br/> - <pre> + <pre> <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> </pre> - In the example above, the <code>src/lib/jupiter</code> directory is expected to contain - the Jupiter test engine related jars (which have been + In the example above, the <code>src/lib/jupiter</code> directory is expected to contain + the Jupiter test engine related jars (which have been <a href="#junit-jupiter-engine-libraries">listed in an earlier section of this document</a>). In the <code>test</code> target we use the <code>classpath</code> nested element to point to the <code>junit.engine.jupiter.classpath</code> containing those jars. In this - <code>test</code> target we also use another <code>classpath</code> element to point to - the location containing our test classes. If required, both these classpath can be combined + <code>test</code> target we also use another <code>classpath</code> element to point to + the location containing our test classes. If required, both these classpath can be combined into one. -</p> +</p> <h4>listener</h4> http://git-wip-us.apache.org/repos/asf/ant/blob/1afbe154/manual/install.html ---------------------------------------------------------------------- diff --git a/manual/install.html b/manual/install.html index 306e137..055de7c 100644 --- a/manual/install.html +++ b/manual/install.html @@ -892,9 +892,10 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A </tr> <tr> <td>javax.mail.jar</td> - <td><a href="Tasks/mail.html">mail</a> task and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td> + <td><a href="Tasks/mail.html">mail</a> task + and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td> <td><a href="https://javaee.github.io/javamail/"; - target="_top">https://javaee.github.io/javamail/</a></td> + target="_top">https://javaee.github.io/javamail/</a></td> </tr> <tr> <td>activation.jar<br/> @@ -942,11 +943,11 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A <td><a href="https://www.tukaani.org/xz/java.html"; target="_top">https://www.tukaani.org/xz/java.html</a></td> </tr> <tr> - <td>JUnit 5 Platform jars: + <td>JUnit 5 Platform jars: <ul> <li>junit-platform-commons.jar</li> <li>junit-platform-engine.jar</li> - <li>junit-platform-launcher.jar</li> + <li>junit-platform-launcher.jar</li> </ul> </td> <td><a href="Tasks/junitlauncher.html">junitlauncher</a> task. Additional libraries maybe needed depending http://git-wip-us.apache.org/repos/asf/ant/blob/1afbe154/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index 024efd2..9b573d9 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 --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.ant</groupId> @@ -29,7 +29,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.10.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <url>http://ant.apache.org/</url> + <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-javamail</artifactId> <version>1.10.6-SNAPSHOT</version> @@ -52,7 +52,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <version>1.6.1</version> <scope>compile</scope> </dependency> - </dependencies> + </dependencies> <build> <plugins> <plugin>
