update bundled Ant to 1.10.12 (IDEA-286649)

GitOrigin-RevId: a08310f0732d3fb9b312499a1bd7e93c1d3d7a68

lib/ant/CONTRIBUTORS

@@ -2,10 +2,15 @@ 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
 Alex Rosen
+Alexander Grund
 Alexei Yudichev
 Alexey Panchenko
 Alexey Solofnenko
@@ -27,17 +32,22 @@ Anthony Wat
 Antoine Baudoux
 Antoine Levy-Lambert
 Anton Mazkovoi
+Arcadius Ahouansou
 Arjan Veenstra
 Arnaud Vandyck
 Arnout J. Kuiper
+Arturo Bernal
+Arun Jamwal
 Aslak Hellesôy
 Atsuhiko Yamanaka
 Avik Sengupta
 Balazs Fejes 2
+barney2k7
 Bart Vanhaute
-Benjamin Burgess
+Basil Crow
 Ben Galbraith
 Ben Gertzfield
+Benjamin Burgess
 Benoit Moussaud
 Bernd Dutkowski
 Bernhard Rosenkraenzer
@@ -49,6 +59,7 @@ Brian Felder
 Brian Repko
 Bruce Atherton
 Cedomir Igaly
+Charles Duffy
 Charles Hudak
 Charlie Hubbard
 Chris Hegarty
@@ -65,9 +76,11 @@ Clemens Hammacher
 Clement OUDOT
 Clive Brettingham-Moore
 Conor MacNeill
+Costin Manolache
 Craeg Strong
 Craig Cottingham
 Craig R. McClanahan
+Craig Pell
 Craig Richardson
 Craig Ryan
 Craig Sandvik
@@ -86,6 +99,7 @@ Daniel Trebbien
 Danno Ferrin
 Danny Yates
 Dante Briones
+Darrell DeBoer
 Davanum Srinivas
 Dave Brondsema
 Dave Brosius
@@ -106,10 +120,11 @@ Diane Holt
 dIon Gillard
 Dmitry A. Kuminov
 Dominique Devienne
-Donal Quinlan
 Don Brown
 Don Ferguson
 Don Jeffery
+Donal Quinlan
+Donald Leslie
 Drew Sudell
 Earl Hood
 Edison Guo
@@ -117,7 +132,9 @@ Eduard Wirch
 Edwin Woudt
 Eli Tucker
 Emmanuel Bourg
+Eugène Adell
 Eric Barboni
+Eric Delaunay
 Eric Olsen
 Eric Pugh
 Erik Costlow
@@ -129,9 +146,10 @@ Francesco Steccanella
 Frank Harnack
 Frank Somers
 Frank Zeyda
-Frantisek Kucera
-Frederic Bothamy
+František Kučera
+Frédéric Bothamy
 Frederic Lavigne
+Gal Shachor
 Gary S. Weaver
 Gautam Guliani
 Gene-Sung Chung
@@ -144,6 +162,7 @@ Gilles Querret
 Gilles Scokart
 Glenn McAllister
 Glenn Twiggs
+Gösen
 Greg Nelson
 Greg Roodt
 Greg Schueler
@@ -151,6 +170,7 @@ Grégoire Vatry
 Günther Kögel
 Harish Prabandham
 Haroon Rafique
+Helder Pereira
 Hiroaki Nakamura
 Holger Engels
 Holger Joest
@@ -162,9 +182,12 @@ Isaac Shabtay
 Issa Gorissen
 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
@@ -176,8 +199,6 @@ Jason Yip
 Jay Dickon Glanville
 Jay Peck
 Jay van der Meer
-JC Mann
-J D Glanville
 Jean-Francois Brousseau
 Jean-Louis Boudart
 Jeff Gettle
@@ -191,28 +212,33 @@ Jerome Lacoste
 Jesse Glick
 Jesse Stockall
 Jim Allers
-Joerg Wassmer
+Jimmy Casey
 Joel Tucci
+Joerg Wassmer
 Joey Richey
 Johann Herunter
 John Elion
 John Sisson
 Jon Dickinson
-Jon S. Stevens
 Jon Skeet
+Jon S. Stevens
+Jonathan K. Schneider
 Jose Alberto Fernandez
 Joseph Walton
 Josh Lucas
 Juerg Wanner
 Julian Simpson
+Julien Lepiller
 Justin Vallon
+Justyna Horwat
+Karl Jansen
 Keiron Liddle
 Keith Visco
 Kevin Connor Arpe
 Kevin Greiner
 Kevin Jackson
 Kevin Ross
-Kevin Z Grey
+Kevin Z. Grey
 Kim Hansen
 Kirk Wylie
 Kristian Rosenvold
@@ -229,12 +255,15 @@ Ludovic Claude
 Maarten Coene
 Magesh Umasankar
 Maneesh Sahu
+Marc Guillemot
+Marc Strapetz
 Marcel Schutte
-Marcus Börger
+Marcus Börger
 Mario Frasca 
 Mariusz Nowostawski
 Mark A. Ziesemer
 Mark DeLaFranier
+Mark Harmer
 Mark Hecker
 Mark Niggemann
 Mark R. Diggory
@@ -258,9 +287,12 @@ Matt Wildig
 Matthew Hawthorne
 Matthew Inger
 Matthew Kuperus Heun
+Matthew Warman
 Matthew Watson
 Matthew Yanos
 Matthias Bhend
+Matthias Gutheil
+Matthias Johann Vill
 Michael Bayne
 Michael Clarke
 Michael Davey
@@ -268,33 +300,36 @@ Michael J. Sikorsky
 Michael McCallum
 Michael Montuori
 Michael Newcomb
-Micheal Nygard
+Michael Nygard
 Michael Saunders
+Michael Seele
+Mickaël Guessant
 Miha
 Mike Davis
 Mike Roberts
 Mike Williams
 Miroslav Zaťko
-mnowostawski
 Mounir El Hajj
 Nathan Beyer
 Nick Chalko
-Nick Fortescue
 Nick Crossley
+Nick Davis
+Nick Fortescue
+Nick King
 Nick Pellow
-Nicola Ken Barozzi
 Nico Seessle
+Nicola Ken Barozzi
+Nicolas Lalevée
 Nigel Magnay
 Oliver Merkel
 Oliver Rossmueller
 Olivier Parent
-Ondra Medek
 Omer Shapira
-Oystein Gisnas
+Ondra Medek
 Patrick Altaie
 Patrick C. Beard
 Patrick Chanezon
-Patrick G. Heck (Gus Heck)
+Patrick Gus Heck
 Patrick Martin
 Paul Austin
 Paul Christmann
@@ -303,7 +338,7 @@ Paul King
 Paulo Gaspar
 Pavan Bayyapu
 Pavel Jisl
-Pawel Zuzelski
+Paweł Zuzelski
 Peter B. West
 Peter Donald
 Peter Doornbosch
@@ -316,13 +351,13 @@ Philip Hourihane
 Phillip Wells
 Pierre Delisle
 Pierre Dittgen
-riasol
-R Handerson
+Preston Bannister
 Ralf Hergert
 Rami Ojares
 Randy Watler
 Raphael Pierquin
 Ray Waldin
+Razzi Abuissa
 Reinhard Pointner
 Remie Bolte
 René Krell
@@ -330,8 +365,11 @@ Reudismam Rolim
 Richard Evans
 Richard Steele
 Rick Beton
+Rob Oxspring
+Rob van Oostrum
+Rob Riasol
 Robbie Gibson
-Robert Anderson
+Robert H. Anderson
 Robert Clark
 Robert Flaherty
 Robert Shaw
@@ -341,8 +379,6 @@ Roberto Scaramuzzi
 Robin Green
 Robin Power
 Robin Verduijn
-Rob Oxspring
-Rob van Oostrum
 Rodrigo Schmidt
 Roger Vaughn
 Roman Ivashin
@@ -358,18 +394,20 @@ Scott Johnson
 Scott M. Stirling
 Sean Egan
 Sean P. Kane
+Sebastian Kantha
 Sebastien Arod
 Shiraz Kanga
-Sebastian Kantha
+Simeon Fitch
 Simon Law
+Simon Legner
 Simone Bordet
 Stefan Bodewig
 Stefan Heimann
 Stefano Mazzocchi
-Stephan Strittmatter
-Stephane Bailliez
 stephan
 Stephan Michels
+Stephan Strittmatter
+Stephane Bailliez
 Stephen Chin
 Stephen Goetze
 Steve Cohen
@@ -396,6 +434,7 @@ Tim Stephenson
 Tim Whittington
 Timoteo Ohara
 Timothy Gerard Endres
+TJ Rothwell
 Tom Ball
 Tom Brus
 Tom Cunningham
@@ -404,18 +443,22 @@ Tom Eugelink
 Tom May
 Tomasz Bech
 Tomáš Zezula
+Tony Gravagno
 Trejkaz Xaoza
 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
+Wenjing Wang
 Will Wang
 William Bernardet
 William Ferguson
@@ -427,8 +470,10 @@ Wolfgang Glas
 Wolfgang Werner
 Xavier Hanin
 Xavier Witdouck
+Xia Li
 Yohann Roussel
 Yuji Yamano
 Yves Martin
 Zach Garner
 Zdenek Wagner
+Øystein Gisnås

lib/ant/INSTALL

@@ -1,2 +1,2 @@
 For installation instructions see the manual by opening manual/index.html
-or see it online at <http://ant.apache.org/manual/index.html>.
+or see it online at <https://ant.apache.org/manual/index.html>.

lib/ant/LICENSE

@@ -193,7 +193,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
@@ -203,7 +203,7 @@
  */
 
 W3C® SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+https://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other
 related items) is being provided by the copyright holders under the following

lib/ant/NOTICE

@@ -1,8 +1,8 @@
 Apache Ant
-Copyright 1999-2018 The Apache Software Foundation
+Copyright 1999-2021 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
 
 The <sync> task is based on code Copyright (c) 2002, Landmark
 Graphics Corp that has been kindly donated to the Apache Software

lib/ant/README

@@ -46,7 +46,7 @@
   ------------------
 
   Details of the latest version can be found on the Apache Ant
-  Project web site <http://ant.apache.org/>.
+  Project web site <https://ant.apache.org/>.
 
 
   Documentation
@@ -72,7 +72,7 @@
   encryption software.  BEFORE using any encryption software, please 
   check your country's laws, regulations and policies concerning the
   import, possession, or use, and re-export of encryption software, to 
-  see if this is permitted.  See <http://www.wassenaar.org/> for more
+  see if this is permitted.  See <https://www.wassenaar.org/> for more
   information.
 
   The U.S. Government Department of Commerce, Bureau of Industry and
@@ -91,10 +91,10 @@
   For the SSH family of tasks (<sshexec> and <scp>) Ant requires the
   JSch <http://www.jcraft.com/jsch/index.html> library as well as the
   Java Cryptography extensions
-  <http://java.sun.com/javase/technologies/security/>.  Ant does not
+  <https://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html>.  Ant does not
   include these libraries itself, but is designed to use them.
 
   Thanks for using Ant.
 
                                           The Apache Ant Project
-                                         <http://ant.apache.org/>
+                                         <https://ant.apache.org/>

lib/ant/WHATSNEW

@@ -1,3 +1,421 @@
+Changes from Ant 1.10.11 TO Ant 1.10.12
+=======================================
+
+Fixed bugs:
+-----------
+
+ * The http condition would follow redirects even when "followRedirects" attribute
+   was set to "false". This has now been fixed.
+   Bugzilla Report 65489
+
+ * Made sure setting build.compiler to the fully qualified classname
+   that corresponds to extJavac or modern has the same effect as using
+   the shorter alias names.
+   Bugzilla Report 65539
+
+ * Prevent potential deadlocks in org.apache.tools.ant.IntrospectionHelper.
+   Bugzilla Report 65424
+
+Other changes:
+--------------
+
+ * The implementation of AntClassLoader#findResources() has been changed to optimize
+   it for potential performance issues, as those noted at
+   https://issues.jenkins.io/browse/JENKINS-22310?focusedCommentId=197405&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-197405
+   Github Pull Request #151
+
+ * AntClassLoader now implements the ClassLoader#findResource(String) method.
+   Github Pull Request #150
+
+ * Ant tries to avoid file name canonicalization when possible.
+   Bugzilla Report 65499
+
+ * javadoc task will now look for warning messages in the STDERR stream too
+   when "failonwarning" is set to true to account for changes in JDK 17+
+
+ * The tar task now preserves symlinks of nested tarfilesets.
+   Github Pull Request #142
+
+Changes from Ant 1.10.10 TO Ant 1.10.11
+=======================================
+
+Fixed bugs:
+-----------
+
+ * a race condition could lead to NullPointerExceptions when running
+   tasks in parallel.
+   Bugzilla Report 65316
+
+ * fixed potential OutOfMemory errors when reading broken archives
+   using the tar or zip formats or formats derived from zip.
+
+Other changes:
+--------------
+
+ * org.apache.tools.ant.taskdefs.optional.junitlauncher.confined.JUnitLauncherTask now
+   has a new protected createExecuteWatchdog() method for allowing it to be overriden.
+   Github Pull Request #147
+
+ * Upgraded AntUnit to 1.4.1.
+
+
+Changes from Ant 1.10.9 TO Ant 1.10.10
+======================================
+
+Fixed bugs:
+-----------
+
+ * SCP (with sftp=true) task would fail if fetching file located in root directory
+   Bugzilla Report 64742
+
+ * javac task would fail if the arguments file it (internally) created didn't quote
+   the # character. This has now been fixed.
+   Bugzilla Reports 64912, 64790
+
+ * made sure LegacyXmlResultFormatter encodes characters illegal in
+   XML the same way JUnit5's built-in formatter would.
+   Bugzilla Report 65030
+
+ * LegacyXmlResultFormatter no longer double-encodes <>& in system-err
+   and system-out
+   Bugzilla Report 63436
+
+ * Fixes a bug in junitlauncher task's legacy-xml formatter, where the testcase
+   representing a @Parameterized JUnit4 test wasn't being reported in the XML.
+   Bugzilla Report 64952
+
+ * Fixes a bug where the ant-testutil-sources.jar that gets published to Maven
+   central repository didn't contain any source files.
+   Bugzilla Report 65110
+
+ * The <http> condition didn't follow redirects from http to https.
+   Bugzilla Report 65105
+
+ * ZipOutputStream now overrides write(int) in order to make sure
+   single byte writes get the same treatment as array writes.
+   Github Pull Request #145
+
+ * Fixes a potential deadlock in junitlauncher task when using legacy-xml
+   reporter.
+   Bugzilla Report 64733
+
+Other changes:
+--------------
+
+ * javaversion condition now has a new "atmost" attribute. See the javaversion
+   manual for more details
+
+ * The "listener" nested element of the "junitlauncher" task now has a new
+   "useLegacyReportingName" attribute which can be used to control the test
+   identifiers names that get reported by the listener. See the junitlauncher
+   manual for more details.
+   Note that this change also introduces a new "setUseLegacyReportingName" method
+   on the org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter
+   interface. This will break backward compatibility with any of your custom
+   result formatters which implemented this interface and such implementations
+   are now expected to implement this new method.
+
+ * a new attribute preserveduplicates allows <resourcelist> to return
+   the same resource multiple times when set to true.
+   Bugzilla Report 64854
+
+ * a new attribute filterbeforeconcat in <concat> can be used to
+   decide whether the filterchain should be applied to the
+   concatenated content (the default) or each nested resource
+   individually before concatenating them.
+   Bugzilla Report 64855
+
+ * the ssh tasks now share a new nested element additionalConfig that
+   can be used to set config values for the jsch Session used by the
+   task.
+   Bugzilla Report 65089
+
+ * added new discardOutput and discardError properties to redirector
+   and the exec, apply and java tasks which can be used to completely
+   discard any (error) output. This is a platform independent
+   alternative to directiong output to any kind of null device.
+
+ * junitlauncher now prints a more useful and instantaneous summary of
+   tests being run, closely matching the junit task's summary.
+   Bugzilla Report 64836
+
+Changes from Ant 1.10.8 TO Ant 1.10.9
+=====================================
+
+Fixed bugs:
+-----------
+
+ * the ftp task could throw a NullPointerException if an error occured
+   Bugzilla Report 64438
+
+ * propertyset now also sees in-scope local properties
+   Bugzilla Report 50179
+
+ * replaced our version of ReaderInputStream with the battle-tested
+   version of Apache Commons IO as our version had problems with
+   surrogate pairs (and likely other edge cases as well).
+   Bugzilla Report 40455
+
+ * <fixcrlf> will no longer remove the temporary file it just created
+   before writing to it.
+
+ * <sshexec> and <scp> didn't deal with wildcard hostnames in ssh
+   config files properly.
+   Bugzilla Report 64530
+
+Other changes:
+--------------
+
+ * Ant will no longer log a warning if it doesn't find tools.jar
+   Bugzilla Report 63577
+
+ * the <jar> task accepts now a nested <indexjarsmapper> element
+   that can be used to perform custom filename transformations
+   for the <indexjars> archives.
+   Github Pull Request #134
+
+ * added a new PropertyEnumerator interface that extensions can
+   provide if they are managing properties unknown to the Ant project.
+
+ * added some special code to support GraalVM JavaScript as
+   javax.script scripting engine for JavaScript. In particular we
+   relax some security settings of GraalVM so that scripts can access
+   Ant objects.
+
+   Also Ant enables Nashorn compatibility mode by default, you can
+   disable that by setting the magic Ant property
+   ant.disable.graal.nashorn.compat to true.
+
+   See the script task manual for additional details.
+
+ * If the magic property ant.tmpdir hasn't been set and Ant can
+   control the permissions of directories it creates it will create an
+   owner-owned temporary directory unaccessible to others as default
+   tempdir as soon as a temporary file is created for the first time,
+
+Changes from Ant 1.10.7 TO Ant 1.10.8
+=====================================
+
+Fixed bugs:
+-----------
+
+ * "legacy-xml" formatter of junitlauncher task wasn't writing out
+   the stacktrace for failures. This is now fixed.
+   Bugzilla Report 63827
+
+ * sshexec failed to write output to a file if the file didn't exist
+
+ * Fixes a regression in javac task involving command line argument
+   files.
+   Bugzilla Report 63874
+
+ * sshexec, sshsession and scp now support a new sshConfig parameter.
+   It specified the SSH configuration file (typically ${user.home}/.ssh/config)
+   defining the username and keyfile to be used per host.
+
+ * "legacy-xml" formatter of junitlauncher task wasn't writing out
+   exceptions that happen in @BeforeAll method of a test. This is now fixed.
+   Bugzilla Report 63850
+
+ * Building Ant from source could result in the javadocs target failing if the
+   optional dependencies were missing. This has now been fixed.
+   Bugzilla Report 63438
+
+ * Fixes a potential ConcurrentModificationException in XMLLogger.
+   Bugzilla Report 63921
+
+ * Fixes a bug in junitlauncher task in forked mode, where if a listener element
+   was used as a sibling element for either the test or testclasses element,
+   then the forked mode launch would fail.
+   Bugzilla Report 63958
+
+ * Fixes an issue in AntStructure where an incorrect DTD was being generated.
+   Github Pull Request #116
+
+ * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl.
+   Github Pull Request #117
+
+Other changes:
+--------------
+
+ * org.apache.tools.mail.MailMessage will now send a fully qualified
+   domain name in its HELO message.
+   Github Pull Request #101
+
+ * The runant.py script should now work with Python 3.
+   Github Pull Request #96
+
+ * tstamp task now honors SOURCE_DATE_EPOCH environment variable for
+   reproducible builds (https://reproducible-builds.org/specs/source-date-epoch/#idm55)
+   Bugzilla Report 62617
+
+ * rmic has been removed from Java 15. The task will now throw an
+   exception if you try to use it while running Java 15 or newer.
+
+ * a new property ant.tmpdir provides improved control over the
+   location Ant uses to create temporary files
+
+Changes from Ant 1.10.6 TO Ant 1.10.7
+=====================================
+
+Fixed bugs:
+-----------
+
+ * FTP still tries checking or entering directories after a timeout
+   Bugzilla Report 63454
+
+ * junitlauncher - does not detect failure in @BeforeAll
+   Bugzilla Report 63479
+
+ * Error using ant-1.10.6 with jdk8
+   Bugzilla Report 63457
+
+ * FTP task no longer duplicates a check for a file being a symlink.
+   Bugzilla Report 63259
+
+ * junitlauncher task, when used in fork mode with "<testclasses>",
+   used to create the wrong number of listeners per test class. This
+   has now been fixed.
+   Bugzilla Report 63446
+
+ * The "legacy-xml" junitlauncher task's listener would not include
+   @ParameterizedTest testcases in its XML report file. This has now
+   been fixed.
+   Bugzilla Report 63680
+
+Other changes:
+--------------
+
+ * FTP task timeout improvements.
+   Bugzilla Reports 63252 and 47414
+
+ * junitlauncher task now supports selecting test classes for execution,
+   based on the JUnit 5 tags, through the new "includeTags" and
+   "excludeTags" attributes.
+
+ * prefer https over http when building ant itself, and in the ant 
+   documentation and sources
+
+ * changed the references and Maven coordinates of JavaMail dependency
+   to Jakarta Mail and thus javax.mail to jakarta.mail - and upgraded
+   the dependency to 1.6.3.
+
+Changes from Ant 1.10.5 TO Ant 1.10.6
+=====================================
+
+Changes that could break older environments:
+-------------------------------------------
+
+ * image task no longer works on Java 9+ because internal classes
+   supporting Java Advanced Imaging are removed; imageio task (based on
+   ImageIO and AWT) is provided as a replacement.
+
+ * junitlauncher task has changed the class names and package names of
+   the task as well as some of the supporting classes of that task. If
+   any code depended on these class or package names, they will have to
+   be updated to reference these newly named classes. This however,
+   doesn't impact build scripts if their reference to junitlauncher task
+   was merely through the use of the <junitlauncher> element.
+
+ * ClearCase#runS has been augmented by a two arg-version and the
+   one-arg version will no longer be called. This may affect
+   subclasses that have overridden runS.
+
+Fixed bugs:
+-----------
+
+ * fetch.xml must retrieve runtime rather than compile dependencies for
+   mail task.
+   Bugzilla Report 62621
+
+ * Fixes an issue in junitreport task, which used to throw a
+   java.net.MalformedURLException when saxon was used on Windows OS.
+   Bugzilla Report 62594
+
+ * augment task now throws a BuildException (as noted in its manual)
+   instead of a IllegalStateException in the absence of the "id" attribute.
+   Bugzilla Report 62655
+
+ * org.apache.tools.zip.ZipOutputStream would sometimes potentially use
+   an incorrect compression level for a zip entry. This is now fixed.
+   Bugzilla Report 62686
+
+ * sync task, in some cases on case insensitive file systems, would consider
+   a file in a destination directory to be orphaned and would delete it.
+   This task has now been fixed to infer the case sensitivity of the filesystem
+   of the destination directory.
+   Bugzilla Report 62890
+
+ * Fixes a potential java.util.ConcurrentModificationException in
+   org.apache.tools.ant.Project#getCopyOfReferences.
+   Github Pull Request #81
+
+ * cccheckout would ignore an error of the "ls checkout" command even
+   if failOnError was set to false.
+   Bugzilla Report 63071
+
+ * The isreachable condition could in some cases return true even if the
+   actual address could potentially be unreachable. This is now fixed
+   and the resolved address is actually checked for reachability.
+
+ * Fixes an issue where scp transfer completion tracking wasn't being
+   triggered for 100% completion.
+   Github Pull Request #91
+
+
+Other changes:
+--------------
+ * generatekey task now supports SubjectAlternativeName during key
+   generation.
+
+ * the <modified> selector has a new built-in algorithm 'lastmodified'
+   which computes a value based upon the lastmodified time of the file.
+
+ * junitlauncher task now supports running tests in a forked JVM. More
+   details available in the junitlauncher task manual.
+
+ * signjar and verifyjar now support the -providerName, -providerClass
+   and -providerArg command line options of keytool via new attributes.
+   Bugzilla Report 65234
+
+ * signjar and verifyjar now supported nested <arg> elements for
+   command line arguments that are not supported explicitly by the
+   tasks via attributes.
+
+ * added several attributes to <javadoc> that support modules.
+   Bugzilla Report 62424
+
+ * properties used or set by BuildFileTask/BuildFileRule are documented
+   in MagicTestNames. A new magic property, ant.test.basedir.ignore, is
+   introduced for cases where Ant projects set up for test purposes
+   must ignore basedir set externally by test harness.
+
+ * a new CharSet type is provided for encoding or charset attributes in
+   tasks that must deal with different character encodings in files,
+   file names and other string resources.
+
+ * org.apache.tools.ant.AntClassLoader is now multi-release jar aware.
+   Starting Java 9, jar files can be packaged as multi-release jars,
+   AntClassLoader now recognizes such multi-release jar files while
+   loading resources at runtime in Java 9+ runtime environments.
+   Bugzilla Report 62952
+
+ * Added jmod and link tasks, to support jmod and jlink tools of JDK 9+.
+   Github Pull Request #80
+
+ * Jsch library dependency has now been upgraded to 0.1.55. Jsch is
+   the library behind the sshexec and scp Ant tasks.
+   Github Pull Request #84
+
+ * The "http" condition, now has a "readTimeout" attribute which can be
+   used to control the amount of time to wait for the read to complete.
+   Bugzilla Report 63193
+
+ * ftp task manual has been updated to mention that the remote listing of
+   files honours the followsymlinks attribute.
+   Bugzilla Report 63226
+
+
 Changes from Ant 1.10.4 TO Ant 1.10.5
 =====================================
 
@@ -53,7 +471,7 @@ Fixed bugs:
  * <cab> died with a NullPointerException since Ant 1.10.2.
    Bugzilla Report 62335
 
- * The <depend> task would fail with 
+ * The <depend> task would fail with
    "java.lang.ClassFormatError: Invalid Constant Pool entry Type 19" while
    parsing a module-info.class. The task is compatible with
    Java bytecode version 53 now.
@@ -154,7 +572,7 @@ Other changes:
    Github Pull Request #57
 
  * when running on Java 11+ rmic will fail early if iiop or idl are
-   requested. Java11 removes support for CORBA and the switches have
+   requested. Java 11 removes support for CORBA and the switches have
    been removed from the rmic tool.
 
  * A new junitlauncher task which support JUnit 5 test framework.

lib/ant/contributors.xml

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -38,6 +38,10 @@
     <first>Adam</first>
     <last>Bryzak</last>
   </name>
+  <name>
+    <first>Adam</first>
+    <last>Murdoch</last>
+  </name>
   <name>
     <first>Adam</first>
     <last>Retter</last>
@@ -50,14 +54,26 @@
     <first>Adrian</first>
     <last>Nistor</last>
   </name>
+  <name>
+    <first>Adrien</first>
+    <last>Grand</last>
+  </name>
   <name>
     <first>Aleksandr</first>
     <last>Ishutin</last>
   </name>
+  <name>
+    <first>Alex</first>
+    <last></last>
+  </name>
   <name>
     <first>Alex</first>
     <last>Rosen</last>
   </name>
+  <name>
+    <first>Alexander</first>
+    <last>Grund</last>
+  </name>
   <name>
     <first>Alexei</first>
     <last>Yudichev</last>
@@ -82,6 +98,10 @@
     <first>Andreas</first>
     <last>Ames</last>
   </name>
+  <name>
+    <first>Andreas</first>
+    <last>Mross</last>
+  </name>
   <name>
     <first>Andrew</first>
     <last>Eisenberg</last>
@@ -135,6 +155,10 @@
     <first>Anton</first>
     <last>Mazkovoi</last>
   </name>
+  <name>
+    <first>Arcadius</first>
+    <last>Ahouansou</last>
+  </name>
   <name>
     <first>Arjan</first>
     <last>Veenstra</last>
@@ -148,9 +172,17 @@
     <middle>J.</middle>
     <last>Kuiper</last>
   </name>
+  <name>
+    <first>Arturo</first>
+    <last>Bernal</last>
+  </name>
+  <name>
+    <first>Arun</first>
+    <last>Jamwal</last>
+  </name>
   <name>
     <first>Aslak</first>
-    <last>Helles&#244;y</last>
+    <last>Hellesôy</last>
   </name>
   <name>
     <first>Atsuhiko</first>
@@ -164,10 +196,17 @@
     <first>Balazs</first>
     <last>Fejes 2</last>
   </name>
+  <name>
+    <last>barney2k7</last>
+  </name>
   <name>
     <first>Bart</first>
     <last>Vanhaute</last>
   </name>
+  <name>
+    <first>Basil</first>
+    <last>Crow</last>
+  </name>
   <name>
     <first>Benjamin</first>
     <last>Burgess</last>
@@ -221,6 +260,14 @@
     <first>Bruce</first>
     <last>Atherton</last>
   </name>
+  <name>
+    <first>Cedomir</first>
+    <last>Igaly</last>
+  </name>
+  <name>
+    <first>Charles</first>
+    <last>Duffy</last>
+  </name>
   <name>
     <first>Charles</first>
     <last>Hudak</last>
@@ -286,6 +333,10 @@
     <first>Conor</first>
     <last>MacNeill</last>
   </name>
+  <name>
+    <first>Costin</first>
+    <last>Manolache</last>
+  </name>
   <name>
     <first>Craeg</first>
     <last>Strong</last>
@@ -294,6 +345,10 @@
     <first>Craig</first>
     <last>Cottingham</last>
   </name>
+  <name>
+    <first>Craig</first>
+    <last>Pell</last>
+  </name>
   <name>
     <first>Craig</first>
     <middle>R.</middle>
@@ -301,11 +356,11 @@
   </name>
   <name>
     <first>Craig</first>
-    <last>Ryan</last>
+    <last>Richardson</last>
   </name>
   <name>
     <first>Craig</first>
-    <last>Richardson</last>
+    <last>Ryan</last>
   </name>
   <name>
     <first>Craig</first>
@@ -371,6 +426,10 @@
     <first>Dante</first>
     <last>Briones</last>
   </name>
+  <name>
+    <first>Darrell</first>
+    <last>DeBoer</last>
+  </name>
   <name>
     <first>Davanum</first>
     <last>Srinivas</last>
@@ -385,7 +444,8 @@
   </name>
   <name>
     <first>David</first>
-    <last>A.</last>
+    <middle>A.</middle>
+    <last>Herman</last>
   </name>
   <name>
     <first>David</first>
@@ -393,7 +453,7 @@
   </name>
   <name>
     <first>David</first>
-    <last>G&#228;rtner</last>
+    <last>Gärtner</last>
   </name>
   <name>
     <first>David</first>
@@ -455,13 +515,9 @@
     <first>Dominique</first>
     <last>Devienne</last>
   </name>
-  <name>
-    <first>Donal</first>
-    <last>Quinlan</last>
-  </name>
   <name>
     <first>Don</first>
-    <last>Bnamen</last>
+    <last>Brown</last>
   </name>
   <name>
     <first>Don</first>
@@ -471,6 +527,14 @@
     <first>Don</first>
     <last>Jeffery</last>
   </name>
+  <name>
+    <first>Donal</first>
+    <last>Quinlan</last>
+  </name>
+  <name>
+    <first>Donald</first>
+    <last>Leslie</last>
+  </name>
   <name>
     <first>Drew</first>
     <last>Sudell</last>
@@ -499,6 +563,14 @@
     <first>Emmanuel</first>
     <last>Bourg</last>
   </name>
+  <name>
+    <first>Eugène</first>
+    <last>Adell</last>
+  </name>
+  <name>
+    <first>Eric</first>
+    <last>Delaunay</last>
+  </name>
   <name>
     <first>Eric</first>
     <last>Olsen</last>
@@ -555,6 +627,10 @@
     <first>Frederic</first>
     <last>Lavigne</last>
   </name>
+  <name>
+    <first>Gal</first>
+    <last>Shachor</last>
+  </name>
   <name>
     <first>Gary</first>
     <middle>S.</middle>
@@ -604,6 +680,10 @@
     <first>Glenn</first>
     <last>Twiggs</last>
   </name>
+  <name>
+    <first>Gösen</first>
+    <last></last>
+  </name>
   <name>
     <first>Greg</first>
     <last>Nelson</last>
@@ -632,6 +712,10 @@
     <first>Haroon</first>
     <last>Rafique</last>
   </name>
+  <name>
+    <first>Helder</first>
+    <last>Pereira</last>
+  </name>
   <name>
     <first>Hiroaki</first>
     <last>Nakamura</last>
@@ -676,11 +760,20 @@
     <first>J</first>
     <last>Bleijenbergh</last>
   </name>
+  <name>
+    <first>JC</first>
+    <last>Mann</last>
+  </name>
   <name>
     <first>Jack</first>
     <middle>J.</middle>
     <last>Woehr</last>
   </name>
+  <name>
+    <first>Jacobus</first>
+    <middle>Martinus</middle>
+    <last>Kruithof</last>
+  </name>
   <name>
     <first>Jaikiran</first>
     <last>Pai</last>
@@ -690,13 +783,17 @@
     <middle>Duncan</middle>
     <last>Davidson</last>
   </name>
+  <name>
+    <first>James</first>
+    <last>Todd</last>
+  </name>
   <name>
     <first>Jan</first>
     <last>Cumps</last>
   </name>
   <name>
     <first>Jan</first>
-    <last>Mat&#232;rne</last>
+    <last>Matèrne</last>
   </name>
   <name>
     <first>Jan</first>
@@ -735,18 +832,14 @@
     <first>Jay</first>
     <last>van der Meer</last>
   </name>
-  <name>
-    <first>JC</first>
-    <last>Mann</last>
-  </name>
-  <name>
-    <first>J</first>
-    <last>D</last>
-  </name>
   <name>
     <first>Jean-Francois</first>
     <last>Brousseau</last>
   </name>
+  <name>
+    <first>Jean-Louis</first>
+    <last>Boudart</last>
+  </name>
   <name>
     <first>Jeff</first>
     <last>Gettle</last>
@@ -792,13 +885,17 @@
     <last>Allers</last>
   </name>
   <name>
-    <first>Joerg</first>
-    <last>Wassmer</last>
+    <first>Jimmy</first>
+    <last>Casey</last>
   </name>
   <name>
     <first>Joel</first>
     <last>Tucci</last>
   </name>
+  <name>
+    <first>Joerg</first>
+    <last>Wassmer</last>
+  </name>
   <name>
     <first>Joey</first>
     <last>Richey</last>
@@ -828,19 +925,24 @@
     <middle>S.</middle>
     <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>
   </name>
-  <name>
-    <first>Josh</first>
-    <last>Lucas</last>
-  </name>
   <name>
     <first>Joseph</first>
     <last>Walton</last>
   </name>
+  <name>
+    <first>Josh</first>
+    <last>Lucas</last>
+  </name>
   <name>
     <first>Juerg</first>
     <last>Wanner</last>
@@ -849,10 +951,22 @@
     <first>Julian</first>
     <last>Simpson</last>
   </name>
+  <name>
+    <first>Julien</first>
+    <last>Lepiller</last>
+  </name>
   <name>
     <first>Justin</first>
     <last>Vallon</last>
   </name>
+  <name>
+    <first>Justyna</first>
+    <last>Horwat</last>
+  </name>
+  <name>
+    <first>Karl</first>
+    <last>Jansen</last>
+  </name>
   <name>
     <first>Keiron</first>
     <last>Liddle</last>
@@ -880,7 +994,7 @@
   </name>
   <name>
     <first>Kevin</first>
-    <middle>Z</middle>
+    <middle>Z.</middle>
     <last>Grey</last>
   </name>
   <name>
@@ -934,6 +1048,10 @@
     <first>Ludovic</first>
     <last>Claude</last>
   </name>
+  <name>
+    <first>Maarten</first>
+    <last>Coene</last>
+  </name>
   <name>
     <first>Magesh</first>
     <last>Umasankar</last>
@@ -942,6 +1060,14 @@
     <first>Maneesh</first>
     <last>Sahu</last>
   </name>
+  <name>
+    <first>Marc</first>
+    <last>Guillemot</last>
+  </name>
+  <name>
+    <first>Marc</first>
+    <last>Strapetz</last>
+  </name>
   <name>
     <first>Marcel</first>
     <last>Schutte</last>
@@ -958,17 +1084,26 @@
     <first>Mariusz</first>
     <last>Nowostawski</last>
   </name>
+  <name>
+    <first>Mark</first>
+    <middle>A.</middle>
+    <last>Ziesemer</last>
+  </name>
   <name>
     <first>Mark</first>
     <last>DeLaFranier</last>
   </name>
+  <name>
+    <first>Mark</first>
+    <last>Harmer</last>
+  </name>
   <name>
     <first>Mark</first>
     <last>Hecker</last>
   </name>
   <name>
     <first>Mark</first>
-    <last>Salter</last>
+    <last>Niggemann</last>
   </name>
   <name>
     <first>Mark</first>
@@ -977,12 +1112,7 @@
   </name>
   <name>
     <first>Mark</first>
-    <last>Niggemann</last>
-  </name>
-  <name>
-    <first>Mark</first>
-    <middle>A.</middle>
-    <last>Ziesemer</last>
+    <last>Salter</last>
   </name>
   <name>
     <first>Markus</first>
@@ -1008,6 +1138,14 @@
     <first>Martin</first>
     <last>von Gagern</last>
   </name>
+  <name>
+    <first>Mathieu</first>
+    <last>Champlon</last>
+  </name>
+  <name>
+    <first>Mathieu</first>
+    <last>Peltier</last>
+  </name>
   <name>
     <first>Matt</first>
     <last>Albrecht</last>
@@ -1040,18 +1178,6 @@
     <first>Matt</first>
     <last>Wildig</last>
   </name>
-  <name>
-    <first>Mathieu</first>
-    <last>Champlon</last>
-  </name>
-  <name>
-    <first>Mathieu</first>
-    <last>Peltier</last>
-  </name>
-  <name>
-    <first>Matthias</first>
-    <last>Bhend</last>
-  </name>
   <name>
     <first>Matthew</first>
     <last>Hawthorne</last>
@@ -1065,6 +1191,10 @@
     <middle>Kuperus</middle>
     <last>Heun</last>
   </name>
+  <name>
+    <first>Matthew</first>
+    <last>Warman</last>
+  </name>
   <name>
     <first>Matthew</first>
     <last>Watson</last>
@@ -1073,6 +1203,19 @@
     <first>Matthew</first>
     <last>Yanos</last>
   </name>
+  <name>
+    <first>Matthias</first>
+    <last>Bhend</last>
+  </name>
+  <name>
+    <first>Matthias</first>
+    <last>Gutheil</last>
+  </name>
+  <name>
+    <first>Matthias</first>
+    <middle>Johann</middle>
+    <last>Vill</last>
+  </name>
   <name>
     <first>Michael</first>
     <last>Bayne</last>
@@ -1094,6 +1237,10 @@
     <first>Michael</first>
     <last>McCallum</last>
   </name>
+  <name>
+    <first>Michael</first>
+    <last>Montuori</last>
+  </name>
   <name>
     <first>Michael</first>
     <last>Newcomb</last>
@@ -1106,6 +1253,14 @@
     <first>Michael</first>
     <last>Saunders</last>
   </name>
+  <name>
+    <first>Michael</first>
+    <last>Seele</last>
+  </name>
+  <name>
+    <first>Mickaël</first>
+    <last>Guessant</last>
+  </name>
   <name>
     <last>Miha</last>
   </name>
@@ -1125,9 +1280,6 @@
     <first>Miroslav</first>
     <last>Zaťko</last>
   </name>
-  <name>
-    <last>mnowostawski</last>
-  </name>
   <name>
     <first>Mounir</first>
     <last>El Hajj</last>
@@ -1144,22 +1296,35 @@
     <first>Nick</first>
     <last>Crossley</last>
   </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>
-    <first>Nicola</first>
-    <last>Ken</last>
-  </name>
   <name>
     <first>Nico</first>
     <last>Seessle</last>
   </name>
+  <name>
+    <first>Nicola</first>
+    <middle>Ken</middle>
+    <last>Barozzi</last>
+  </name>
+  <name>
+    <first>Nicolas</first>
+    <last>Lalevée</last>
+  </name>
   <name>
     <first>Nigel</first>
     <last>Magnay</last>
@@ -1184,17 +1349,14 @@
     <first>Ondra</first>
     <last>Medek</last>
   </name>
-  <name>
-    <first>&#216;ystein</first>
-    <last>Gisn&#229;s</last>
-  </name>
   <name>
     <first>Patrick</first>
     <last>Altaie</last>
   </name>
   <name>
     <first>Patrick</first>
-    <last>C.</last>
+    <middle>C.</middle>
+    <last>Beard</last>
   </name>
   <name>
     <first>Patrick</first>
@@ -1202,7 +1364,12 @@
   </name>
   <name>
     <first>Patrick</first>
-    <last>Gus</last>
+    <middle>Gus</middle>
+    <last>Heck</last>
+  </name>
+  <name>
+    <first>Patrick</first>
+    <last>Martin</last>
   </name>
   <name>
     <first>Paul</first>
@@ -1286,8 +1453,8 @@
     <last>Dittgen</last>
   </name>
   <name>
-    <first>R</first>
-    <last>Handerson</last>
+    <first>Preston</first>
+    <last>Bannister</last>
   </name>
   <name>
     <first>Ralf</first>
@@ -1309,6 +1476,10 @@
     <first>Ray</first>
     <last>Waldin</last>
   </name>
+  <name>
+    <first>Razzi</first>
+    <last>Abuissa</last>
+  </name>
   <name>
     <first>Reinhard</first>
     <last>Pointner</last>
@@ -1337,12 +1508,25 @@
     <first>Rick</first>
     <last>Beton</last>
   </name>
+  <name>
+    <first>Rob</first>
+    <last>Riasol</last>
+  </name>
+  <name>
+    <first>Rob</first>
+    <last>Oxspring</last>
+  </name>
+  <name>
+    <first>Rob</first>
+    <last>van Oostrum</last>
+  </name>
   <name>
     <first>Robbie</first>
     <last>Gibson</last>
   </name>
   <name>
     <first>Robert</first>
+    <middle>H.</middle>
     <last>Anderson</last>
   </name>
   <name>
@@ -1381,14 +1565,6 @@
     <first>Robin</first>
     <last>Verduijn</last>
   </name>
-  <name>
-    <first>Rob</first>
-    <last>Oxspring</last>
-  </name>
-  <name>
-    <first>Rob</first>
-    <last>van Oostrum</last>
-  </name>
   <name>
     <first>Rodrigo</first>
     <last>Schmidt</last>
@@ -1451,6 +1627,10 @@
     <middle>P.</middle>
     <last>Kane</last>
   </name>
+  <name>
+    <first>Sebastian</first>
+    <last>Kantha</last>
+  </name>
   <name>
     <first>Sebastien</first>
     <last>Arod</last>
@@ -1460,12 +1640,16 @@
     <last>Kanga</last>
   </name>
   <name>
-    <first>Sebastian</first>
-    <last>Kantha</last>
+    <first>Simeon</first>
+    <last>Fitch</last>
   </name>
   <name>
-      <first>Simon</first>
-      <last>Law</last>
+    <first>Simon</first>
+    <last>Law</last>
+  </name>
+  <name>
+    <first>Simon</first>
+    <last>Legner</last>
   </name>
   <name>
     <first>Simone</first>
@@ -1483,6 +1667,13 @@
     <first>Stefano</first>
     <last>Mazzocchi</last>
   </name>
+  <name>
+    <last>stephan</last>
+  </name>
+  <name>
+    <first>Stephan</first>
+    <last>Michels</last>
+  </name>
   <name>
     <first>Stephan</first>
     <last>Strittmatter</last>
@@ -1492,15 +1683,12 @@
     <last>Bailliez</last>
   </name>
   <name>
-    <last>stephan</last>
-  </name>
-  <name>
-    <first>Stephan</first>
-    <last>Michels</last>
+    <first>Stephen</first>
+    <last>Chin</last>
   </name>
   <name>
     <first>Stephen</first>
-    <last>Chin</last>
+    <last>Goetze</last>
   </name>
   <name>
     <first>Steve</first>
@@ -1583,6 +1771,10 @@
     <first>Tim</first>
     <last>Fennell</last>
   </name>
+  <name>
+    <first>Tim</first>
+    <last>Stephenson</last>
+  </name>
   <name>
     <first>Tim</first>
     <last>Whittington</last>
@@ -1597,13 +1789,17 @@
     <last>Endres</last>
   </name>
   <name>
-    <first>Tim</first>
-    <last>Stephenson</last>
+    <first>TJ</first>
+    <last>Rothwell</last>
   </name>
   <name>
     <first>Tom</first>
     <last>Ball</last>
   </name>
+  <name>
+    <first>Tom</first>
+    <last>Brus</last>
+  </name>
   <name>
     <first>Tom</first>
     <last>Cunningham</last>
@@ -1628,9 +1824,13 @@
     <first>Tomáš</first>
     <last>Zezula</last>
   </name>
+  <name>
+    <first>Tony</first>
+    <last>Gravagno</last>
+  </name>
   <name>
     <first>Trejkaz</first>
-    <last>Xaoz</last>
+    <last>Xaoza</last>
   </name>
   <name>
     <first>Ulrich</first>
@@ -1648,6 +1848,14 @@
     <first>Victor</first>
     <last>Toni</last>
   </name>
+  <name>
+    <first>Ville</first>
+    <last>Skyttä</last>
+  </name>
+  <name>
+    <first>Vimil</first>
+    <last>Saju</last>
+  </name>
   <name>
     <first>Vincent</first>
     <last>Legoll</last>
@@ -1656,22 +1864,30 @@
     <first>Vincent</first>
     <last>Privat</last>
   </name>
-  <name>
-    <first>Vimil</first>
-    <last>Saju</last>
-  </name>
   <name>
     <first>Vitold</first>
     <last>Sedyshev</last>
   </name>
+  <name>
+    <first>Vladislav</first>
+    <last>Bauer</last>
+  </name>
   <name>
     <first>Volker</first>
     <last>Leidl</last>
   </name>
+  <name>
+    <first>Waldek</first>
+    <last>Herka</last>
+  </name>
   <name>
     <first>Wang</first>
     <last>Weijun</last>
   </name>
+  <name>
+    <first>Wenjing</first>
+    <last>Wang</last>
+  </name>
   <name>
     <first>Will</first>
     <last>Wang</last>
@@ -1716,6 +1932,10 @@
     <first>Xavier</first>
     <last>Witdouck</last>
   </name>
+  <name>
+    <first>Xia</first>
+    <last>Li</last>
+  </name>
   <name>
     <first>Yohann</first>
     <last>Roussel</last>
@@ -1737,7 +1957,7 @@
     <last>Wagner</last>
   </name>
   <name>
-    <first/>
-    <last>riasol</last>
+    <first>Øystein</first>
+    <last>Gisnås</last>
   </name>
 </contributors>

lib/ant/lib/ant-antlr.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,22 +18,22 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>
@@ -62,11 +62,52 @@
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/ANTLR*</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-apache-bcel.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,34 +18,34 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + BCEL</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.bcel</groupId>
       <artifactId>bcel</artifactId>
-      <version>6.2</version>
+      <version>6.5.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -59,11 +59,52 @@
             <include>org/apache/tools/ant/filters/util/JavaClassHelper*</include>
             <include>org/apache/tools/ant/util/depend/bcel/*</include>
           </includes>
+          <testIncludes>
+            <exclude>org/apache/tools/ant/types/optional/depend/ClassFileSet*</exclude>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
         </configuration>
       </plugin>
     </plugins>
+      <resources>
+          <resource>
+              <directory>../../../..</directory>
+              <targetPath>META-INF</targetPath>
+              <includes>
+                  <include>LICENSE</include>
+                  <include>NOTICE</include>
+              </includes>
+          </resource>
+      </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-apache-bsf.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,28 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + BSF</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -56,15 +56,36 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/taskdefs/optional/Script*</include>
-            <include>org/apache/tools/ant/taskdefs/optional/script/**</include>
-            <include>org/apache/tools/ant/types/optional/*Script*</include>
-            <include>org/apache/tools/ant/util/Script*</include>
-            <include>org/apache/tools/ant/util/optional/Script*</include>
+            <include>org/apache/tools/ant/util/ScriptRunner.java</include>
+            <include>org/apache/tools/ant/util/optional/ScriptRunner.java</include>
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-apache-log4j.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,27 +18,27 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + Log4J</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -59,7 +59,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-apache-oro.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,28 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + Apache Oro</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -48,12 +48,6 @@
       <version>2.0.8</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -70,7 +64,31 @@
           </testIncludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-apache-regexp.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,27 +18,27 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + Apache Regexp</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,11 +57,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           <includes>
             <include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/util/regexp/JakartaRegexp*</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-apache-resolver.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,27 +18,27 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + Apache Resolver</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -59,7 +59,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-apache-xalan2.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,28 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -51,29 +51,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-timestamp-file</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <mkdir dir="${project.build.outputDirectory}"/>
-                <copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
-                  <fileset dir="${project.build.sourceDirectory}/../etc">
-                    <include name="junit-frames.xsl"/>
-                    <include name="junit-noframes.xsl"/>
-                  </fileset>
-                </copy>              
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -81,11 +58,70 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <encoding>ISO-8859-1</encoding>
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>../../../../src/etc/testcases</directory>
+        <includes>
+          <include>taskdefs/optional/xalan*</include>
+          <include>taskdefs/optional/xsltliaison*</include>
+        </includes>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-commons-logging.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,28 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -60,7 +60,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-commons-net.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,34 +18,34 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.6</version>
+      <version>3.8.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -65,9 +65,43 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </testIncludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <!-- tests assume an FTP server listening on localhost -->
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-imageio.pom

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  This POM has been created manually by the Ant Development Team.
+  Please contact us if you are not satisfied with the data contained in this POM.
+  URL : https://ant.apache.org
+-->
+<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 https://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.ant</groupId>
+    <artifactId>ant-parent</artifactId>
+    <relativePath>../pom.xml</relativePath>
+    <version>1.10.12</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <url>https://ant.apache.org/</url>
+  <groupId>org.apache.ant</groupId>
+  <artifactId>ant-imageio</artifactId>
+  <version>1.10.12</version>
+  <name>Apache Ant + ImageIO</name>
+  <description>imageio task and corresponding types.</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.10.12</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java</include>
+            <include>org/apache/tools/ant/types/optional/imageio/*</include>
+          </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+       </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
+    <sourceDirectory>../../../../src/main</sourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
+    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+    <directory>../../../../target/${project.artifactId}</directory>
+  </build>
+</project>

lib/ant/lib/ant-jai.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,22 +18,22 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -57,11 +57,11 @@
   </dependencies>
   <!-- Central has javax.media:jai-core:1.1.3 but only com.sun.media:jai-codec:1.1.2_01 -->
   <repositories>
-      <repository>
-          <id>jboss</id>
-          <name>JBoss</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      </repository>
+    <repository>
+      <id>jboss</id>
+      <name>JBoss</name>
+      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+    </repository>
   </repositories>
   <build>
     <plugins>
@@ -70,14 +70,55 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/taskdefs/optional/image/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/image/Image.java</include>
             <include>org/apache/tools/ant/types/optional/image/*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/image/ImageTest.java</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-javamail.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,21 +18,21 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
-<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">
+<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 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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,13 +41,15 @@ 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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>javax.mail-api</artifactId>
-      <version>1.6.1</version>
+      <!-- This brings in the necessary dependencies.
+      See https://eclipse-ee4j.github.io/mail/ -->
+      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail</artifactId>
+      <version>1.6.4</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -62,7 +64,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-jdepend.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,22 +18,22 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -58,13 +58,59 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include>
+            <include>org/apache/tools/ant/taskdefs/optional/jdepend/</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/jdepend/</include>
+            <include>org/apache/tools/ant/util/facade/</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>build.tests.value</name>
+              <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value>
+            </property>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-jmf.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,29 +18,29 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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>
+    download the dependency from https://java.sun.com/products/java-media/jmf/</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -55,7 +55,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-jsch.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,21 +18,21 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + JSch</name>
   <description>contains the sshexec and scp tasks
   </description>
@@ -40,13 +40,13 @@ 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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jsch</artifactId>
-      <version>0.1.54</version>
+      <version>0.1.55</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -64,9 +64,47 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </testIncludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>scp.tmp</name>
+              <value>${java.io.tmpdir}</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-junit.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,36 +18,48 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -55,23 +67,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create-timestamp-file</id>
-            <phase>generate-resources</phase>
+            <id>copy-junit-xsl</id>
+            <phase>process-classes</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
-                <mkdir dir="${project.build.outputDirectory}"/>
+              <target>
                 <copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
-                  <fileset dir="${project.build.sourceDirectory}/../etc">
+                  <fileset dir="${project.build.scriptSourceDirectory}">
                     <include name="junit-frames.xsl"/>
                     <include name="junit-noframes.xsl"/>
                     <include name="junit-frames-saxon.xsl"/>
                     <include name="junit-noframes-saxon.xsl"/>
                   </fileset>
                 </copy>              
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>
@@ -83,18 +94,95 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
           </includes>
-          <excludes>
-              <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
-              <exclude>org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache*</exclude>
-          </excludes>
           <testIncludes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/</include>
+            <include>org/example/junit/</include>
+            <include>org/example/tasks/*.java</include>
+            <include>org/example/types/</include>
           </testIncludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <!-- Cannot exclude JUnit 4-specific classes from compilation because tests depend on them -->
+          <excludes>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache*</exclude>
+          </excludes>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
+          <systemProperties>
+            <property>
+              <name>build.tests.value</name>
+              <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value>
+            </property>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
+          </systemProperties>
+          <excludes>
+            <exclude>org/example/junit/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*$*</exclude>
+            <!-- test fails as classloaders are different when run via Maven -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnitClassLoaderTest*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>../../../../src/etc/testcases</directory>
+        <includes>
+         <include>taskdefs/optional/junit/**</include>
+          <include>taskdefs/optional/junit.xml</include>
+          <include>taskdefs/optional/junitreport.xml</include>
+         <include>buildfiletest-base.xml</include>
+        </includes>
+      </testResource>
+      <testResource>
+        <directory>../../../../src</directory>
+        <includes>
+          <include>tests/junit/org/apache/tools/ant/taskdefs/optional/junit/*Test.java</include>
+        </includes>
+      </testResource>
+      <testResource>
+        <directory>../../../../src/tests/junit</directory>
+        <includes>
+          <include>org/example/tasks/*.xml</include>
+        </includes>
+      </testResource>
+    </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
+    <scriptSourceDirectory>../../../../src/etc</scriptSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-junit4.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,34 +18,34 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.10.5</version>
+        <version>1.10.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <url>http://ant.apache.org/</url>
+    <url>https://ant.apache.org/</url>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-junit4</artifactId>
-    <version>1.10.5</version>
+    <version>1.10.12</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.10.5</version>
+            <version>1.10.12</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,34 @@
                     </includes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*Ignored*</exclude>
+                    </excludes>
+                    <archive>
+                        <index>true</index>
+                        <manifest>
+                            <addExtensions>true</addExtensions>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>../../../..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+        </resources>
         <sourceDirectory>../../../../src/main</sourceDirectory>
         <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
         <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-junitlauncher.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,28 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.10.5</version>
+        <version>1.10.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <url>http://ant.apache.org/</url>
+    <url>https://ant.apache.org/</url>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-junitlauncher</artifactId>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
     <name>Apache Ant + JUnit 5</name>
     <description>contains JUnit 5.x support</description>
     <dependencies>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.10.5</version>
+            <version>1.10.12</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -68,14 +68,71 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <includes>
-                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</include>
+                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/</include>
                     </includes>
                     <testIncludes>
-                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</include>
+                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/</include>
+                        <include>org/example/junitlauncher/</include>
                     </testIncludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifest>
+                            <addExtensions>true</addExtensions>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <basedir>../../../..</basedir>
+                    <workingDirectory>../../../..</workingDirectory>
+                    <systemProperties>
+                        <property>
+                            <name>build.tests.value</name>
+                            <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value>
+                        </property>
+                        <property>
+                            <name>ant.test.basedir.ignore</name>
+                            <value>true</value>
+                        </property>
+                    </systemProperties>
+                    <excludes>
+                        <exclude>org/example/junitlauncher/**</exclude>
+                        <!-- test fails as classloaders are different when run via Maven -->
+                        <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>../../../..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>../../../../src/etc/testcases</directory>
+                <includes>
+                    <include>taskdefs/optional/junitlauncher.xml</include>
+                    <include>buildfiletest-base.xml</include>
+                </includes>
+            </testResource>
+        </testResources>
         <sourceDirectory>../../../../src/main</sourceDirectory>
         <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
         <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-launcher.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,22 +18,22 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant Launcher</name>
   <build>
     <plugins>
@@ -44,13 +44,39 @@
           <includes>
             <include>org/apache/tools/ant/launch/*.java</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/launch/*.java</include>
+          </testIncludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <mainClass>org.apache.tools.ant.launch.Launcher</mainClass>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
+    <!-- tests depend on Ant (Os) -->
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
-    <outputDirectory>../../../../target/ant-launcher/classes</outputDirectory>
-    <testOutputDirectory>../../../../target/ant-launcher/testcases</testOutputDirectory>
-    <directory>../../../../target/ant-launcher</directory>
+    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+    <directory>../../../../target/${project.artifactId}</directory>
   </build>
 </project>

lib/ant/lib/ant-netrexx.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,29 +18,29 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + NetRexx</name>
   <description>NetRexxC task
-    dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
+    dependency can be downloaded from https://www.ibm.com/software/awdtools/netrexx/download.html</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <!-- Processed too early, before maven-antrun-plugin gets a chance to work:
@@ -68,19 +68,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </compilerArguments>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.4</version>
         <executions>
           <execution>
             <phase>validate</phase>
             <configuration>
-              <tasks>
+              <target>
                 <ant dir="${basedir}/../../../.." antfile="fetch.xml" target="netrexx">
                   <property name="dest" value="optional"/>
                 </ant>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -89,6 +102,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
         </executions>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-parent.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,47 +18,47 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-parent</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <packaging>pom</packaging>
   <description>master POM</description>
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
   <name>Apache Ant</name>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <inceptionYear>2000</inceptionYear>
   <organization>
     <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
+    <url>https://www.apache.org/</url>
   </organization>
   <distributionManagement>
     <!-- Null out inherited apache distribution repo by default -->
     <repository>
       <id>dummy</id>
       <name>Dummy to avoid accidental deploys</name>
-      <url>http://nowhere.net/</url>
+      <url>https://nowhere.net/</url>
     </repository>
   </distributionManagement>
   <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/ant.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/ant.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf/ant.git</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/ant.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/ant.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf/ant.git</url>
   </scm>
   <ciManagement>
-    <system>hudson</system>
-    <url>https://builds.apache.org/job/Ant_BuildFromPOMs/</url>
+    <system>jenkins</system>
+    <url>https://builds.apache.org/job/Ant-Build-from-POMs/</url>
   </ciManagement>
   <mailingLists>
     <mailingList>
@@ -66,19 +66,19 @@
       <subscribe>dev-subscribe@ant.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
       <post>dev@ant.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
+      <archive>https://mail-archives.apache.org/mod_mbox/ant-dev</archive>
     </mailingList>
     <mailingList>
       <name>Ant Users List</name>
       <subscribe>user-subscribe@ant.apache.org</subscribe>
       <unsubscribe>user-unsubscribe@ant.apache.org</unsubscribe>
       <post>user@ant.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/ant-user</archive>
+      <archive>https://mail-archives.apache.org/mod_mbox/ant-user</archive>
     </mailingList>
   </mailingLists>
   <issueManagement>
     <system>bugzilla</system>
-    <url>http://issues.apache.org/bugzilla/</url>
+    <url>https://issues.apache.org/bugzilla/</url>
   </issueManagement>
   <modules>
     <module>ant</module>
@@ -92,6 +92,7 @@
     <module>ant-apache-xalan2</module>
     <module>ant-commons-logging</module>
     <module>ant-commons-net</module>
+    <module>ant-imageio</module>
     <module>ant-jai</module>
     <module>ant-javamail</module>
     <module>ant-jdepend</module>
@@ -110,7 +111,13 @@
      <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -124,7 +131,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
+          <version>3.8.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -138,12 +145,17 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.21.0</version>
+          <version>2.22.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.21.0</version>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.8</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -151,4 +163,21 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+  <profiles>
+    <profile>
+      <id>javac-8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.sun</groupId>
+          <artifactId>tools</artifactId>
+          <version>1.8.0</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

lib/ant/lib/ant-swing.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,29 +18,29 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</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.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -55,7 +55,31 @@
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant-testutil.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,35 +18,35 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>  
+  <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-testutil</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant Test Utilities</name>
   <description>test utility classes</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
      <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -57,7 +57,10 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/BuildFileTest*</include>
+            <include>org/apache/tools/ant/AntAssert*</include>
+            <include>org/apache/tools/ant/BuildFile*</include>
+            <include>org/apache/tools/ant/FileUtilities*</include>
+            <include>org/apache/tools/ant/MagicTestNames*</include>
             <include>org/apache/tools/ant/util/regexp/RegexpMatcherTest*</include>
             <include>org/apache/tools/ant/util/regexp/RegexpTest*</include>
             <include>org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest*</include>
@@ -65,7 +68,31 @@
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/tests/junit</sourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>

lib/ant/lib/ant-xz.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,28 +18,28 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-xz</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant + XZ for Java</name>
   <description>contains the xz compression support</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -61,7 +61,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
     <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>

lib/ant/lib/ant.pom

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,46 +18,37 @@
 <!--
   This POM has been created manually by the Ant Development Team.
   Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
+  URL : https://ant.apache.org
 -->
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.5</version>
+    <version>1.10.12</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <url>http://ant.apache.org/</url>
+  <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant</artifactId>
-  <version>1.10.5</version>
+  <version>1.10.12</version>
   <name>Apache Ant Core</name>
+  <properties>
+    <modules.exclude>org/apache/tools/ant/taskdefs/modules/</modules.exclude>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
-      <version>1.10.5</version>
+      <version>1.10.12</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-antunit</artifactId>
-      <version>1.3</version>
+      <version>1.4.1</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -70,17 +61,30 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>javax.mail</artifactId>
+      <version>1.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.beanshell</groupId>
+      <artifactId>bsh</artifactId>
+      <version>2.0b5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <filters>
       <filter>../../../../target/ant/.build.timestamp.properties</filter>
     </filters>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration> </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -91,13 +95,46 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <tstamp/>
                 <mkdir dir="${project.build.directory}"/>
                 <touch file="${project.build.directory}/.build.timestamp.properties"/>
                 <echo file="${project.build.directory}/.build.timestamp.properties" append="false"
                   message="TODAY=${TODAY}"/>
-              </tasks>
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>create-antlib-test-jar</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar jarfile="${project.build.testOutputDirectory}/org/apache/tools/ant/taskdefs/test2-antlib.jar">
+                  <manifest>
+                    <attribute name="Extension-name"
+                               value="org.apache.tools.ant"/>
+                    <attribute name="Specification-Title"
+                               value="Apache Ant"/>
+                    <attribute name="Specification-Version"
+                               value="${project.version}"/>
+                    <attribute name="Specification-Vendor"
+                               value="Apache Software Foundation"/>
+                    <attribute name="Implementation-Title"
+                               value="org.apache.tools.ant"/>
+                    <attribute name="Implementation-Version"
+                               value="${project.version}"/>
+                    <attribute name="Implementation-Vendor"
+                               value="Apache Software Foundation"/>
+                  </manifest>
+                  <zipfileset dir="${project.build.scriptSourceDirectory}/testcases" fullpath="taskdefs/test.antlib.xml">
+                    <include name="taskdefs/test2.antlib.xml"/>
+                  </zipfileset>
+                </jar>
+                <echoproperties prefix="maven."/>
+              </target>
             </configuration>
           </execution>
           <execution>
@@ -107,9 +144,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <delete file="${project.build.directory}/.build.timestamp.properties"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>
@@ -120,75 +157,143 @@
         <configuration>
           <excludes>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/launch/</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
+            <exclude>${modules.exclude}</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/image/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/xz/*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
-            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/sound/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/splash/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/xz/</exclude>
+            <exclude>org/apache/tools/ant/types/optional/image/</exclude>
+            <exclude>org/apache/tools/ant/types/optional/imageio/</exclude>
+            <exclude>org/apache/tools/ant/types/optional/xz/</exclude>
+            <exclude>org/apache/tools/ant/types/resolver/</exclude>
+            <exclude>org/apache/tools/ant/util/depend/bcel/</exclude>
             <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
-            <exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
             <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
           </excludes>
           <testExcludes>
-            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/launch/**</exclude>
+            <!-- launcher -->
+            <exclude>org/apache/tools/ant/launch/</exclude>
+            <!-- commons-logging -->
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
+            <!-- log4j -->
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
+            <!-- obsolete -->
+            <exclude>org/apache/tools/ant/taskdefs/AbstractCvs*</exclude>
+            <!-- ERROR: "default value" when javac cannot cross-compile to Java 5 -->
+            <exclude>org/apache/tools/ant/taskdefs/Javac*</exclude>
+            <!-- see XsltTest -->
             <exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
+            <!-- ERROR: Unexpected recipients -->
+            <exclude>org/apache/tools/ant/taskdefs/email/EmailTask*</exclude>
+            <!-- Java9+ -->
+            <exclude>${modules.exclude}</exclude>
+            <!-- antlr -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
+            <!-- obsolete -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/Jspc*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Pvcs*</exclude>
+            <!-- xalan: workaround for different resource encoding -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
+            <!-- ERROR: UnknownHostException: chemical (XML parser-dependent) -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/XmlValidateCatalog*</exclude>
+            <!-- image/imageio -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/image/</exclude>
+            <!-- jdepend -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/</exclude>
+            <!-- junit -->
             <exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
+            <!-- junitlauncher -->
             <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
+            <!-- net -->
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
-            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/util/Script*</exclude>
+            <!-- swing -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/splash/</exclude>
+            <!-- jsch -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/</exclude>
+            <!-- dependent on junit -->
+            <exclude>org/apache/tools/ant/types/Assertions*</exclude>
+            <!-- bcel -->
+            <exclude>org/apache/tools/ant/types/optional/depend/ClassFileSet*</exclude>
+            <!-- ERROR: defaults.properties are in both compile and test file tree -->
+            <exclude>org/apache/tools/ant/util/ClasspathUtils*</exclude>
+            <exclude>org/apache/tools/ant/util/LoaderUtils*</exclude>
+            <!-- oro -->
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+            <!-- regexp -->
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
+            <!-- dependent on IncludeTest.class: checks presence -->
+            <exclude>org/apache/tools/ant/AntClassLoaderDelegation*</exclude>
+            <!-- ERROR:  More pseudo attributes are expected (encoding="UTF-8");
+             failure mode is XML parser-dependent (see to do for failures in IDE) -->
+            <exclude>org/apache/tools/ant/Include*</exclude>
+            <!-- dependent on JUnit 5 -->
+            <exclude>org/example/junitlauncher/</exclude>
+            <!-- requires Graal.js and forking tests per class -->
+            <exclude>org/apache/tools/ant/taskdefs/optional/script/graal/</exclude>
+            <!-- requires structure of a binary distribution of Ant in ANT_HOME -->
+            <exclude>org/apache/tools/ant/types/CommandlineJavaTest*</exclude>
+            <exclude>org/apache/tools/ant/types/selectors/ModifiedSelectorTest*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/AvailableTest*</exclude>
           </testExcludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <manifest>
+              <mainClass>org.apache.tools.ant.Main</mainClass>
+              <addExtensions>true</addExtensions>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <basedir>../../../..</basedir>
+          <workingDirectory>../../../..</workingDirectory>
           <systemProperties>
             <property>
               <name>ant.home</name>
               <value>${env.ANT_HOME}</value>
             </property>
             <property>
-              <name>build.tests</name>
-              <value>../../../../target/ant/testcases</value>
+              <name>build.classes.value</name>
+              <value>${project.basedir}/../../../../target/${project.artifactId}/classes</value>
             </property>
             <property>
               <name>build.tests.value</name>
-              <value>../../../../target/ant/testcases</value>
+              <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value>
             </property>
             <property>
               <name>offline</name>
               <value>true</value>
             </property>
+            <property>
+              <name>ant.test.basedir.ignore</name>
+              <value>true</value>
+            </property>
           </systemProperties>
         </configuration>
       </plugin>
@@ -198,13 +303,22 @@
       </plugin>
     </plugins>
     <resources>
+      <resource>
+        <directory>../../../..</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
       <resource>
         <directory>../../../../src/main</directory>
         <filtering>true</filtering>
         <includes>
-          <include>org/apache/tools/ant/taskdefs/default.properties</include>
-          <include>org/apache/tools/ant/types/default.properties</include>
-          <include>org/apache/tools/ant/taskdefs/default.properties</include>
+          <include>org/apache/tools/ant/listener/defaults.properties</include>
+          <include>org/apache/tools/ant/taskdefs/defaults.properties</include>
+          <include>org/apache/tools/ant/types/defaults.properties</include>
+          <include>org/apache/tools/ant/antlib.xml</include>
           <include>org/apache/tools/ant/types/conditions/antlib.xml</include>
           <include>org/apache/tools/ant/defaultManifest.mf</include>
           <include>org/apache/tools/ant/version.txt</include>
@@ -215,10 +329,11 @@
         <filtering>true</filtering>
         <includes>
           <include>**/antlib.xml</include>
+          <include>**/javadoc-frame-injections-fix.txt</include>
         </includes>
       </resource>
       <resource>
-        <directory>../../../../docs</directory>
+        <directory>../../../../manual</directory>
         <filtering>false</filtering>
         <includes>
           <include>images/ant_logo_large.gif</include>
@@ -240,8 +355,21 @@
     </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
-    <outputDirectory>../../../../target/ant/classes</outputDirectory>
-    <testOutputDirectory>../../../../target/ant/testcases</testOutputDirectory>
-    <directory>../../../../target/ant</directory>
+    <scriptSourceDirectory>../../../../src/etc</scriptSourceDirectory>
+    <!-- directory name is hardcoded in AntTest -->
+    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+    <directory>../../../../target/${project.artifactId}</directory>
   </build>
+  <profiles>
+    <profile>
+      <id>java9+</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <modules.exclude>not/here</modules.exclude>
+      </properties>
+    </profile>
+  </profiles>
 </project>

lib/ant/lib/libraries.properties

@@ -5,7 +5,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -28,38 +28,48 @@ m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc
 # Repository to use by default for fetching dependencies.
 m2.repo=https://repo1.maven.org/maven2/
 
+# hashes of libraries loaded over insecure connections
+netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4
+
 # Versions of different libraries. Please keep in alphabetical order, except
 # when a specific dependency forces them to be out-of-order
-ivy.version=2.4.0
-ant-antunit.version=1.4
+ivy.version=2.5.0
+ant-antunit.version=1.4.1
 antlr.version=2.7.7
-bcel.version=6.2
+bcel.version=6.5.0
 bsf.version=2.4.0
-bsh.version=2.0b4
-bsh-core.version=${bsh.version}
-commons-net.version=3.6
+bsh.version=2.0b5
+commons-net.version=3.8.0
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
+js.version=20.1.0
+js-scriptengine.version=${js.version}
+# Note - When updating the hamcrest versions here, make sure to also update the
+# "src-dist" target in build.xml to copy the correct hamcrest jars
+# into the source distribution
 hamcrest-core.version=1.3
 hamcrest-library.version=${hamcrest-core.version}
 jai-core.version=1.1.3
 jai-codec.version=1.1.3
+jakarta.mail.version=1.6.4
 jakarta-regexp.version=1.4
 # Later versions of Tomcat provide a jspc task
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
-javax.mail-api.version=1.6.1
 jdepend.version=2.9.1
 jruby.version=1.6.8
-junit.version=4.12
-rhino.version=1.7.10
+# Note - When updating the junit.version here, make sure to also update the
+# "src-dist" target in build.xml to copy the correct junit 4.x jar
+# into the source distribution
+junit.version=4.13.1
+rhino.version=1.7.11
 junit-platform-launcher.version=1.2.0
 # Only used for internal tests in Ant project
 junit-vintage-engine.version=5.2.0
 # Only used for internal tests in Ant project
 junit-jupiter-engine.version=5.2.0
-jsch.version=0.1.54
-jython.version=2.7.0
+jsch.version=0.1.55
+jython.version=2.7.2
 # log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
 log4j.version=1.2.14
 oro.version=2.0.8