diff --git a/lib/ant/CONTRIBUTORS b/lib/ant/CONTRIBUTORS index 72c790d67a5d..d0e684eefbeb 100644 --- a/lib/ant/CONTRIBUTORS +++ b/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 diff --git a/lib/ant/INSTALL b/lib/ant/INSTALL index 6b504839828c..289e5b83d598 100644 --- a/lib/ant/INSTALL +++ b/lib/ant/INSTALL @@ -1,2 +1,2 @@ For installation instructions see the manual by opening manual/index.html -or see it online at . +or see it online at . diff --git a/lib/ant/LICENSE b/lib/ant/LICENSE index cdf6ff8b222d..5cfe309ec958 100644 --- a/lib/ant/LICENSE +++ b/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 diff --git a/lib/ant/NOTICE b/lib/ant/NOTICE index 298f725047fc..d77bd06465e2 100644 --- a/lib/ant/NOTICE +++ b/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 task is based on code Copyright (c) 2002, Landmark Graphics Corp that has been kindly donated to the Apache Software diff --git a/lib/ant/README b/lib/ant/README index 6bda3b1c48bd..cff7e89d8e0a 100644 --- a/lib/ant/README +++ b/lib/ant/README @@ -46,7 +46,7 @@ ------------------ Details of the latest version can be found on the Apache Ant - Project web site . + Project web site . 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 for more + see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and @@ -91,10 +91,10 @@ For the SSH family of tasks ( and ) Ant requires the JSch library as well as the Java Cryptography extensions - . Ant does not + . Ant does not include these libraries itself, but is designed to use them. Thanks for using Ant. The Apache Ant Project - + diff --git a/lib/ant/WHATSNEW b/lib/ant/WHATSNEW index 14267642182c..7239a33c2ffc 100644 --- a/lib/ant/WHATSNEW +++ b/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 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 to return + the same resource multiple times when set to true. + Bugzilla Report 64854 + + * a new attribute filterbeforeconcat in 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 + + * will no longer remove the temporary file it just created + before writing to it. + + * and 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 task accepts now a nested element + that can be used to perform custom filename transformations + for the 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 "", + 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 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 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 elements for + command line arguments that are not supported explicitly by the + tasks via attributes. + + * added several attributes to 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: * died with a NullPointerException since Ant 1.10.2. Bugzilla Report 62335 - * The task would fail with + * The 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. diff --git a/lib/ant/contributors.xml b/lib/ant/contributors.xml index 3ab3be8fee02..74329cff6952 100644 --- a/lib/ant/contributors.xml +++ b/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 @@ Adam Bryzak + + Adam + Murdoch + Adam Retter @@ -50,14 +54,26 @@ Adrian Nistor + + Adrien + Grand + Aleksandr Ishutin + + Alex + + Alex Rosen + + Alexander + Grund + Alexei Yudichev @@ -82,6 +98,10 @@ Andreas Ames + + Andreas + Mross + Andrew Eisenberg @@ -135,6 +155,10 @@ Anton Mazkovoi + + Arcadius + Ahouansou + Arjan Veenstra @@ -148,9 +172,17 @@ J. Kuiper + + Arturo + Bernal + + + Arun + Jamwal + Aslak - Hellesôy + Hellesôy Atsuhiko @@ -164,10 +196,17 @@ Balazs Fejes 2 + + barney2k7 + Bart Vanhaute + + Basil + Crow + Benjamin Burgess @@ -221,6 +260,14 @@ Bruce Atherton + + Cedomir + Igaly + + + Charles + Duffy + Charles Hudak @@ -286,6 +333,10 @@ Conor MacNeill + + Costin + Manolache + Craeg Strong @@ -294,6 +345,10 @@ Craig Cottingham + + Craig + Pell + Craig R. @@ -301,11 +356,11 @@ Craig - Ryan + Richardson Craig - Richardson + Ryan Craig @@ -371,6 +426,10 @@ Dante Briones + + Darrell + DeBoer + Davanum Srinivas @@ -385,7 +444,8 @@ David - A. + A. + Herman David @@ -393,7 +453,7 @@ David - Gärtner + Gärtner David @@ -455,13 +515,9 @@ Dominique Devienne - - Donal - Quinlan - Don - Bnamen + Brown Don @@ -471,6 +527,14 @@ Don Jeffery + + Donal + Quinlan + + + Donald + Leslie + Drew Sudell @@ -499,6 +563,14 @@ Emmanuel Bourg + + Eugène + Adell + + + Eric + Delaunay + Eric Olsen @@ -555,6 +627,10 @@ Frederic Lavigne + + Gal + Shachor + Gary S. @@ -604,6 +680,10 @@ Glenn Twiggs + + Gösen + + Greg Nelson @@ -632,6 +712,10 @@ Haroon Rafique + + Helder + Pereira + Hiroaki Nakamura @@ -676,11 +760,20 @@ J Bleijenbergh + + JC + Mann + Jack J. Woehr + + Jacobus + Martinus + Kruithof + Jaikiran Pai @@ -690,13 +783,17 @@ Duncan Davidson + + James + Todd + Jan Cumps Jan - Matèrne + Matèrne Jan @@ -735,18 +832,14 @@ Jay van der Meer - - JC - Mann - - - J - D - Jean-Francois Brousseau + + Jean-Louis + Boudart + Jeff Gettle @@ -792,13 +885,17 @@ Allers - Joerg - Wassmer + Jimmy + Casey Joel Tucci + + Joerg + Wassmer + Joey Richey @@ -828,19 +925,24 @@ S. Stevens + + Jonathan + K. + Schneider + Jose Alberto Fernandez - - Josh - Lucas - Joseph Walton + + Josh + Lucas + Juerg Wanner @@ -849,10 +951,22 @@ Julian Simpson + + Julien + Lepiller + Justin Vallon + + Justyna + Horwat + + + Karl + Jansen + Keiron Liddle @@ -880,7 +994,7 @@ Kevin - Z + Z. Grey @@ -934,6 +1048,10 @@ Ludovic Claude + + Maarten + Coene + Magesh Umasankar @@ -942,6 +1060,14 @@ Maneesh Sahu + + Marc + Guillemot + + + Marc + Strapetz + Marcel Schutte @@ -958,17 +1084,26 @@ Mariusz Nowostawski + + Mark + A. + Ziesemer + Mark DeLaFranier + + Mark + Harmer + Mark Hecker Mark - Salter + Niggemann Mark @@ -977,12 +1112,7 @@ Mark - Niggemann - - - Mark - A. - Ziesemer + Salter Markus @@ -1008,6 +1138,14 @@ Martin von Gagern + + Mathieu + Champlon + + + Mathieu + Peltier + Matt Albrecht @@ -1040,18 +1178,6 @@ Matt Wildig - - Mathieu - Champlon - - - Mathieu - Peltier - - - Matthias - Bhend - Matthew Hawthorne @@ -1065,6 +1191,10 @@ Kuperus Heun + + Matthew + Warman + Matthew Watson @@ -1073,6 +1203,19 @@ Matthew Yanos + + Matthias + Bhend + + + Matthias + Gutheil + + + Matthias + Johann + Vill + Michael Bayne @@ -1094,6 +1237,10 @@ Michael McCallum + + Michael + Montuori + Michael Newcomb @@ -1106,6 +1253,14 @@ Michael Saunders + + Michael + Seele + + + Mickaël + Guessant + Miha @@ -1125,9 +1280,6 @@ Miroslav Zaťko - - mnowostawski - Mounir El Hajj @@ -1144,22 +1296,35 @@ Nick Crossley + + Nick + Davis + Nick Fortescue + + Nick + King + Nick Pellow - - Nicola - Ken - Nico Seessle + + Nicola + Ken + Barozzi + + + Nicolas + Lalevée + Nigel Magnay @@ -1184,17 +1349,14 @@ Ondra Medek - - Øystein - Gisnås - Patrick Altaie Patrick - C. + C. + Beard Patrick @@ -1202,7 +1364,12 @@ Patrick - Gus + Gus + Heck + + + Patrick + Martin Paul @@ -1286,8 +1453,8 @@ Dittgen - R - Handerson + Preston + Bannister Ralf @@ -1309,6 +1476,10 @@ Ray Waldin + + Razzi + Abuissa + Reinhard Pointner @@ -1337,12 +1508,25 @@ Rick Beton + + Rob + Riasol + + + Rob + Oxspring + + + Rob + van Oostrum + Robbie Gibson Robert + H. Anderson @@ -1381,14 +1565,6 @@ Robin Verduijn - - Rob - Oxspring - - - Rob - van Oostrum - Rodrigo Schmidt @@ -1451,6 +1627,10 @@ P. Kane + + Sebastian + Kantha + Sebastien Arod @@ -1460,12 +1640,16 @@ Kanga - Sebastian - Kantha + Simeon + Fitch - Simon - Law + Simon + Law + + + Simon + Legner Simone @@ -1483,6 +1667,13 @@ Stefano Mazzocchi + + stephan + + + Stephan + Michels + Stephan Strittmatter @@ -1492,15 +1683,12 @@ Bailliez - stephan - - - Stephan - Michels + Stephen + Chin Stephen - Chin + Goetze Steve @@ -1583,6 +1771,10 @@ Tim Fennell + + Tim + Stephenson + Tim Whittington @@ -1597,13 +1789,17 @@ Endres - Tim - Stephenson + TJ + Rothwell Tom Ball + + Tom + Brus + Tom Cunningham @@ -1628,9 +1824,13 @@ Tomáš Zezula + + Tony + Gravagno + Trejkaz - Xaoz + Xaoza Ulrich @@ -1648,6 +1848,14 @@ Victor Toni + + Ville + Skyttä + + + Vimil + Saju + Vincent Legoll @@ -1656,22 +1864,30 @@ Vincent Privat - - Vimil - Saju - Vitold Sedyshev + + Vladislav + Bauer + Volker Leidl + + Waldek + Herka + Wang Weijun + + Wenjing + Wang + Will Wang @@ -1716,6 +1932,10 @@ Xavier Witdouck + + Xia + Li + Yohann Roussel @@ -1737,7 +1957,7 @@ Wagner - - riasol + Øystein + Gisnås diff --git a/lib/ant/lib/ant-antlr.jar b/lib/ant/lib/ant-antlr.jar index 502f493a0106..909f37ebedc7 100644 Binary files a/lib/ant/lib/ant-antlr.jar and b/lib/ant/lib/ant-antlr.jar differ diff --git a/lib/ant/lib/ant-antlr.pom b/lib/ant/lib/ant-antlr.pom index 5b0c324dcd6e..9290a3cbc1e9 100644 --- a/lib/ant/lib/ant-antlr.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-antlr - 1.10.5 + 1.10.12 Apache Ant + ANTLR antlr specific task. The implementation forks a java process, therefore the antlr jar file is only needed at runtime @@ -41,7 +41,7 @@ org.apache.ant ant - 1.10.5 + 1.10.12 true compile @@ -62,11 +62,52 @@ org/apache/tools/ant/taskdefs/optional/ANTLR* + + org/apache/tools/ant/taskdefs/optional/ANTLR* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + ant.test.basedir.ignore + true + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-apache-bcel.jar b/lib/ant/lib/ant-apache-bcel.jar index fa32328df82d..bf5de61ffc70 100644 Binary files a/lib/ant/lib/ant-apache-bcel.jar and b/lib/ant/lib/ant-apache-bcel.jar differ diff --git a/lib/ant/lib/ant-apache-bcel.pom b/lib/ant/lib/ant-apache-bcel.pom index b547b56f990c..f5022c8e71c6 100644 --- a/lib/ant/lib/ant-apache-bcel.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.10.5 + 1.10.12 Apache Ant + BCEL org.apache.ant ant - 1.10.5 + 1.10.12 compile org.apache.bcel bcel - 6.2 + 6.5.0 compile @@ -59,11 +59,52 @@ org/apache/tools/ant/filters/util/JavaClassHelper* org/apache/tools/ant/util/depend/bcel/* + + org/apache/tools/ant/types/optional/depend/ClassFileSet* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + ant.test.basedir.ignore + true + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-apache-bsf.jar b/lib/ant/lib/ant-apache-bsf.jar index 6f970871faf5..6092966bfe52 100644 Binary files a/lib/ant/lib/ant-apache-bsf.jar and b/lib/ant/lib/ant-apache-bsf.jar differ diff --git a/lib/ant/lib/ant-apache-bsf.pom b/lib/ant/lib/ant-apache-bsf.pom index c3fafeae1b77..46c4941e8c75 100644 --- a/lib/ant/lib/ant-apache-bsf.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.10.5 + 1.10.12 Apache Ant + BSF org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -56,15 +56,36 @@ maven-compiler-plugin - org/apache/tools/ant/taskdefs/optional/Script* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/util/Script* - org/apache/tools/ant/util/optional/Script* + org/apache/tools/ant/util/ScriptRunner.java + org/apache/tools/ant/util/optional/ScriptRunner.java + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-apache-log4j.jar b/lib/ant/lib/ant-apache-log4j.jar index 630f18ccfa53..4132c0aedcdc 100644 Binary files a/lib/ant/lib/ant-apache-log4j.jar and b/lib/ant/lib/ant-apache-log4j.jar differ diff --git a/lib/ant/lib/ant-apache-log4j.pom b/lib/ant/lib/ant-apache-log4j.pom index ac2de3ef11ad..84b96d1ffb6e 100644 --- a/lib/ant/lib/ant-apache-log4j.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.10.5 + 1.10.12 Apache Ant + Log4J org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -59,7 +59,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-apache-oro.jar b/lib/ant/lib/ant-apache-oro.jar index 97b3f7eac20d..655dcce8dac5 100644 Binary files a/lib/ant/lib/ant-apache-oro.jar and b/lib/ant/lib/ant-apache-oro.jar differ diff --git a/lib/ant/lib/ant-apache-oro.pom b/lib/ant/lib/ant-apache-oro.pom index e6a046aadb1a..69764a841958 100644 --- a/lib/ant/lib/ant-apache-oro.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-oro - 1.10.5 + 1.10.12 Apache Ant + Apache Oro org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -48,12 +48,6 @@ 2.0.8 compile - - junit - junit - 4.12 - test - @@ -70,7 +64,31 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-apache-regexp.jar b/lib/ant/lib/ant-apache-regexp.jar index 37e3fbea9fca..e275e63d4443 100644 Binary files a/lib/ant/lib/ant-apache-regexp.jar and b/lib/ant/lib/ant-apache-regexp.jar differ diff --git a/lib/ant/lib/ant-apache-regexp.pom b/lib/ant/lib/ant-apache-regexp.pom index 4db00fbe4359..7b73defcf2e3 100644 --- a/lib/ant/lib/ant-apache-regexp.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.10.5 + 1.10.12 Apache Ant + Apache Regexp org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -57,11 +57,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org/apache/tools/ant/util/regexp/JakartaRegexp* + + org/apache/tools/ant/util/regexp/JakartaRegexp* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-apache-resolver.jar b/lib/ant/lib/ant-apache-resolver.jar index 447c927fada8..6524642cb3e8 100644 Binary files a/lib/ant/lib/ant-apache-resolver.jar and b/lib/ant/lib/ant-apache-resolver.jar differ diff --git a/lib/ant/lib/ant-apache-resolver.pom b/lib/ant/lib/ant-apache-resolver.pom index aef4a8fc9d9d..df97e375c15a 100644 --- a/lib/ant/lib/ant-apache-resolver.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.10.5 + 1.10.12 Apache Ant + Apache Resolver org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -59,7 +59,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-apache-xalan2.jar b/lib/ant/lib/ant-apache-xalan2.jar index 5920239d76c3..72887939f01a 100644 Binary files a/lib/ant/lib/ant-apache-xalan2.jar and b/lib/ant/lib/ant-apache-xalan2.jar differ diff --git a/lib/ant/lib/ant-apache-xalan2.pom b/lib/ant/lib/ant-apache-xalan2.pom index baa30aa0fc7e..cb8edff679fc 100644 --- a/lib/ant/lib/ant-apache-xalan2.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.10.5 + 1.10.12 Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -51,29 +51,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma - - maven-antrun-plugin - - - create-timestamp-file - generate-resources - - run - - - - - - - - - - - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -81,11 +58,70 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport* + + org/apache/tools/ant/taskdefs/optional/TraXLiaison* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + ant.test.basedir.ignore + true + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + ISO-8859-1 + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + + + + ../../../../src/etc/testcases + + taskdefs/optional/xalan* + taskdefs/optional/xsltliaison* + + true + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-commons-logging.jar b/lib/ant/lib/ant-commons-logging.jar index 79e6797ae2ac..f5fd2a7ca39c 100644 Binary files a/lib/ant/lib/ant-commons-logging.jar and b/lib/ant/lib/ant-commons-logging.jar differ diff --git a/lib/ant/lib/ant-commons-logging.pom b/lib/ant/lib/ant-commons-logging.pom index 9ae995274227..d7eb9c44ef5d 100644 --- a/lib/ant/lib/ant-commons-logging.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-commons-logging - 1.10.5 + 1.10.12 Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -60,7 +60,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-commons-net.jar b/lib/ant/lib/ant-commons-net.jar index 60afdc963874..7f991c81aa3d 100644 Binary files a/lib/ant/lib/ant-commons-net.jar and b/lib/ant/lib/ant-commons-net.jar differ diff --git a/lib/ant/lib/ant-commons-net.pom b/lib/ant/lib/ant-commons-net.pom index 94ec079f3377..5afc16c2ac1a 100644 --- a/lib/ant/lib/ant-commons-net.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-commons-net - 1.10.5 + 1.10.12 Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.10.5 + 1.10.12 compile commons-net commons-net - 3.6 + 3.8.0 compile @@ -65,9 +65,43 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + true + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-imageio.jar b/lib/ant/lib/ant-imageio.jar new file mode 100644 index 000000000000..96693cb4a7ae Binary files /dev/null and b/lib/ant/lib/ant-imageio.jar differ diff --git a/lib/ant/lib/ant-imageio.pom b/lib/ant/lib/ant-imageio.pom new file mode 100644 index 000000000000..090396dc8480 --- /dev/null +++ b/lib/ant/lib/ant-imageio.pom @@ -0,0 +1,107 @@ + + + + + + org.apache.ant + ant-parent + ../pom.xml + 1.10.12 + + 4.0.0 + https://ant.apache.org/ + org.apache.ant + ant-imageio + 1.10.12 + Apache Ant + ImageIO + imageio task and corresponding types. + + + org.apache.ant + ant + 1.10.12 + compile + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java + org/apache/tools/ant/types/optional/imageio/* + + + org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + ant.test.basedir.ignore + true + + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + + ../../../../src/main + ../../../../src/tests/junit + ../../../../target/${project.artifactId}/classes + ../../../../target/${project.artifactId}/testcases + ../../../../target/${project.artifactId} + + diff --git a/lib/ant/lib/ant-jai.jar b/lib/ant/lib/ant-jai.jar index 4af8f9282f69..79ad29ef3905 100644 Binary files a/lib/ant/lib/ant-jai.jar and b/lib/ant/lib/ant-jai.jar differ diff --git a/lib/ant/lib/ant-jai.pom b/lib/ant/lib/ant-jai.pom index dabca4a1acd7..81007c1a5ee3 100644 --- a/lib/ant/lib/ant-jai.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-jai - 1.10.5 + 1.10.12 Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -57,11 +57,11 @@ - - jboss - JBoss - https://repository.jboss.org/nexus/content/groups/public/ - + + jboss + JBoss + https://repository.jboss.org/nexus/content/groups/public/ + @@ -70,14 +70,55 @@ maven-compiler-plugin - org/apache/tools/ant/taskdefs/optional/image/* + org/apache/tools/ant/taskdefs/optional/image/Image.java org/apache/tools/ant/types/optional/image/* + + org/apache/tools/ant/taskdefs/optional/image/ImageTest.java + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + ant.test.basedir.ignore + true + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-javamail.jar b/lib/ant/lib/ant-javamail.jar index d40bd07e8c61..a148b7551ff1 100644 Binary files a/lib/ant/lib/ant-javamail.jar and b/lib/ant/lib/ant-javamail.jar differ diff --git a/lib/ant/lib/ant-javamail.pom b/lib/ant/lib/ant-javamail.pom index 1816226c6448..873539053588 100644 --- a/lib/ant/lib/ant-javamail.pom +++ b/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 @@ - + org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-javamail - 1.10.5 + 1.10.12 Apache Ant + JavaMail 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 org.apache.ant ant - 1.10.5 + 1.10.12 compile - javax.mail - javax.mail-api - 1.6.1 + + com.sun.mail + jakarta.mail + 1.6.4 compile @@ -62,7 +64,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-jdepend.jar b/lib/ant/lib/ant-jdepend.jar index 4d45fa248b08..5a1654d0a2c3 100644 Binary files a/lib/ant/lib/ant-jdepend.jar and b/lib/ant/lib/ant-jdepend.jar differ diff --git a/lib/ant/lib/ant-jdepend.pom b/lib/ant/lib/ant-jdepend.pom index c37760df8908..29167c981a07 100644 --- a/lib/ant/lib/ant-jdepend.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-jdepend - 1.10.5 + 1.10.12 Apache Ant + JDepend task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the jdepend parser available on the maven repository @@ -41,7 +41,7 @@ org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -58,13 +58,59 @@ maven-compiler-plugin - org/apache/tools/ant/taskdefs/optional/jdepend/* + org/apache/tools/ant/taskdefs/optional/jdepend/ + + org/apache/tools/ant/taskdefs/optional/jdepend/ + org/apache/tools/ant/util/facade/ + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + build.tests.value + ${project.basedir}/../../../../target/${project.artifactId}/testcases + + + ant.test.basedir.ignore + true + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-jmf.jar b/lib/ant/lib/ant-jmf.jar index 6af65968f866..1c358a6d1cf0 100644 Binary files a/lib/ant/lib/ant-jmf.jar and b/lib/ant/lib/ant-jmf.jar differ diff --git a/lib/ant/lib/ant-jmf.pom b/lib/ant/lib/ant-jmf.pom index badcc1efd9e8..4ea8363ef7b9 100644 --- a/lib/ant/lib/ant-jmf.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-jmf - 1.10.5 + 1.10.12 Apache Ant + JMF contains the sound task and a soundplayer listener - download the dependency from http://java.sun.com/products/java-media/jmf/ + download the dependency from https://java.sun.com/products/java-media/jmf/ org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -55,7 +55,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-jsch.jar b/lib/ant/lib/ant-jsch.jar index 47fa2594b98c..b52c0fb16d50 100644 Binary files a/lib/ant/lib/ant-jsch.jar and b/lib/ant/lib/ant-jsch.jar differ diff --git a/lib/ant/lib/ant-jsch.pom b/lib/ant/lib/ant-jsch.pom index 5eb45dc2489d..1872894611e7 100644 --- a/lib/ant/lib/ant-jsch.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-jsch - 1.10.5 + 1.10.12 Apache Ant + JSch contains the sshexec and scp tasks @@ -40,13 +40,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org.apache.ant ant - 1.10.5 + 1.10.12 compile com.jcraft jsch - 0.1.54 + 0.1.55 compile @@ -64,9 +64,47 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + scp.tmp + ${java.io.tmpdir} + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-junit.jar b/lib/ant/lib/ant-junit.jar index 32297131ea39..d6cae3e70bea 100644 Binary files a/lib/ant/lib/ant-junit.jar and b/lib/ant/lib/ant-junit.jar differ diff --git a/lib/ant/lib/ant-junit.pom b/lib/ant/lib/ant-junit.pom index 0a2b30293d8f..7220f391ba23 100644 --- a/lib/ant/lib/ant-junit.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-junit - 1.10.5 + 1.10.12 Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.10.5 + 1.10.12 compile junit junit - 4.12 + 4.13.1 compile + + xerces + xercesImpl + 2.12.0 + test + + + xalan + xalan + 2.7.2 + test + @@ -55,23 +67,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma maven-antrun-plugin - create-timestamp-file - generate-resources + copy-junit-xsl + process-classes run - - + - + - + @@ -83,18 +94,95 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org/apache/tools/ant/taskdefs/optional/junit/* - - org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter* - org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache* - org/apache/tools/ant/taskdefs/optional/junit/ + org/example/junit/ + org/example/tasks/*.java + org/example/types/ + + org.apache.maven.plugins + maven-jar-plugin + + + + org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter* + org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache* + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + build.tests.value + ${project.basedir}/../../../../target/${project.artifactId}/testcases + + + ant.test.basedir.ignore + true + + + + org/example/junit/* + org/apache/tools/ant/taskdefs/optional/junit/*$* + + org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest* + org/apache/tools/ant/taskdefs/optional/junit/JUnitClassLoaderTest* + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + + + + ../../../../src/etc/testcases + + taskdefs/optional/junit/** + taskdefs/optional/junit.xml + taskdefs/optional/junitreport.xml + buildfiletest-base.xml + + + + ../../../../src + + tests/junit/org/apache/tools/ant/taskdefs/optional/junit/*Test.java + + + + ../../../../src/tests/junit + + org/example/tasks/*.xml + + + ../../../../src/main - ../../../../src/testcases + ../../../../src/tests/junit + ../../../../src/etc ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId}/testcases ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-junit4.jar b/lib/ant/lib/ant-junit4.jar index d31ae648a8b0..d917483898cc 100644 Binary files a/lib/ant/lib/ant-junit4.jar and b/lib/ant/lib/ant-junit4.jar differ diff --git a/lib/ant/lib/ant-junit4.pom b/lib/ant/lib/ant-junit4.pom index ee9cf04f9836..ac6ed0c27cd3 100644 --- a/lib/ant/lib/ant-junit4.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-junit4 - 1.10.5 + 1.10.12 Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.10.5 + 1.10.12 compile junit junit - 4.12 + 4.13.1 compile @@ -61,7 +61,34 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + **/*Ignored* + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-junitlauncher.jar b/lib/ant/lib/ant-junitlauncher.jar index 1da32cff99ae..6ebe28f853da 100644 Binary files a/lib/ant/lib/ant-junitlauncher.jar and b/lib/ant/lib/ant-junitlauncher.jar differ diff --git a/lib/ant/lib/ant-junitlauncher.pom b/lib/ant/lib/ant-junitlauncher.pom index 0925d526aebf..cce088685eed 100644 --- a/lib/ant/lib/ant-junitlauncher.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-junitlauncher - 1.10.5 + 1.10.12 Apache Ant + JUnit 5 contains JUnit 5.x support org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -68,14 +68,71 @@ maven-compiler-plugin - org/apache/tools/ant/taskdefs/optional/junitlauncher/* + org/apache/tools/ant/taskdefs/optional/junitlauncher/ - org/apache/tools/ant/taskdefs/optional/junitlauncher/* + org/apache/tools/ant/taskdefs/optional/junitlauncher/ + org/example/junitlauncher/ + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ../../../.. + ../../../.. + + + build.tests.value + ${project.basedir}/../../../../target/${project.artifactId}/testcases + + + ant.test.basedir.ignore + true + + + + org/example/junitlauncher/** + + org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest* + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + + + + ../../../../src/etc/testcases + + taskdefs/optional/junitlauncher.xml + buildfiletest-base.xml + + + ../../../../src/main ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-launcher.jar b/lib/ant/lib/ant-launcher.jar index f7497175ebc9..f7dd54b7e66e 100644 Binary files a/lib/ant/lib/ant-launcher.jar and b/lib/ant/lib/ant-launcher.jar differ diff --git a/lib/ant/lib/ant-launcher.pom b/lib/ant/lib/ant-launcher.pom index c88ad4db2f32..9284ce466399 100644 --- a/lib/ant/lib/ant-launcher.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-launcher - 1.10.5 + 1.10.12 Apache Ant Launcher @@ -44,13 +44,39 @@ org/apache/tools/ant/launch/*.java + + org/apache/tools/ant/launch/*.java + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + org.apache.tools.ant.launch.Launcher + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main + ../../../../src/testcases - ../../../../target/ant-launcher/classes - ../../../../target/ant-launcher/testcases - ../../../../target/ant-launcher + ../../../../target/${project.artifactId}/classes + ../../../../target/${project.artifactId}/testcases + ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-netrexx.jar b/lib/ant/lib/ant-netrexx.jar index 97bb41a75c3e..af0eb0a2a272 100644 Binary files a/lib/ant/lib/ant-netrexx.jar and b/lib/ant/lib/ant-netrexx.jar differ diff --git a/lib/ant/lib/ant-netrexx.pom b/lib/ant/lib/ant-netrexx.pom index 4832c444c378..22982e41773d 100644 --- a/lib/ant/lib/ant-netrexx.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-netrexx - 1.10.5 + 1.10.12 Apache Ant + NetRexx NetRexxC task - dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html + dependency can be downloaded from https://www.ibm.com/software/awdtools/netrexx/download.html org.apache.ant ant - 1.10.5 + 1.10.12 compile + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.ant ant-parent - 1.10.5 + 1.10.12 pom master POM The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo Apache Ant - http://ant.apache.org/ + https://ant.apache.org/ 2000 The Apache Software Foundation - http://www.apache.org/ + https://www.apache.org/ dummy Dummy to avoid accidental deploys - http://nowhere.net/ + https://nowhere.net/ - scm:git:https://git-wip-us.apache.org/repos/asf/ant.git - scm:git:https://git-wip-us.apache.org/repos/asf/ant.git - https://git-wip-us.apache.org/repos/asf/ant.git + scm:git:https://gitbox.apache.org/repos/asf/ant.git + scm:git:https://gitbox.apache.org/repos/asf/ant.git + https://gitbox.apache.org/repos/asf/ant.git - hudson - https://builds.apache.org/job/Ant_BuildFromPOMs/ + jenkins + https://builds.apache.org/job/Ant-Build-from-POMs/ @@ -66,19 +66,19 @@ dev-subscribe@ant.apache.org dev-unsubscribe@ant.apache.org dev@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-dev + https://mail-archives.apache.org/mod_mbox/ant-dev Ant Users List user-subscribe@ant.apache.org user-unsubscribe@ant.apache.org user@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-user + https://mail-archives.apache.org/mod_mbox/ant-user bugzilla - http://issues.apache.org/bugzilla/ + https://issues.apache.org/bugzilla/ ant @@ -92,6 +92,7 @@ ant-apache-xalan2 ant-commons-logging ant-commons-net + ant-imageio ant-jai ant-javamail ant-jdepend @@ -110,7 +111,13 @@ junit junit - 4.12 + 4.13.1 + test + + + org.hamcrest + hamcrest-library + 1.3 test @@ -124,7 +131,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.0 1.8 1.8 @@ -138,12 +145,17 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + 2.22.1 org.apache.maven.plugins maven-surefire-report-plugin - 2.21.0 + 2.22.1 + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 @@ -151,4 +163,21 @@ UTF-8 + + + javac-8 + + 1.8 + + + + com.sun + tools + 1.8.0 + system + ${java.home}/../lib/tools.jar + + + + diff --git a/lib/ant/lib/ant-swing.jar b/lib/ant/lib/ant-swing.jar index 6e4aaa0cf5a4..490a3a2bd15b 100644 Binary files a/lib/ant/lib/ant-swing.jar and b/lib/ant/lib/ant-swing.jar differ diff --git a/lib/ant/lib/ant-swing.pom b/lib/ant/lib/ant-swing.pom index 3dae6b7dc709..1190ff8b365e 100644 --- a/lib/ant/lib/ant-swing.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-swing - 1.10.5 + 1.10.12 Apache Ant + Swing a listener and a splash task based on Swing org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -55,7 +55,31 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant-testutil.jar b/lib/ant/lib/ant-testutil.jar index 46f03c94aa9c..7342765a5233 100644 Binary files a/lib/ant/lib/ant-testutil.jar and b/lib/ant/lib/ant-testutil.jar differ diff --git a/lib/ant/lib/ant-testutil.pom b/lib/ant/lib/ant-testutil.pom index f89baeace6ef..ce633b315ed9 100644 --- a/lib/ant/lib/ant-testutil.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-testutil - 1.10.5 + 1.10.12 Apache Ant Test Utilities test utility classes org.apache.ant ant - 1.10.5 + 1.10.12 compile junit junit - 4.12 + 4.13.1 compile @@ -57,7 +57,10 @@ maven-compiler-plugin - org/apache/tools/ant/BuildFileTest* + org/apache/tools/ant/AntAssert* + org/apache/tools/ant/BuildFile* + org/apache/tools/ant/FileUtilities* + org/apache/tools/ant/MagicTestNames* org/apache/tools/ant/util/regexp/RegexpMatcherTest* org/apache/tools/ant/util/regexp/RegexpTest* org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest* @@ -65,7 +68,31 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/tests/junit ../../../../target/${project.artifactId}/classes ../../../../target/${project.artifactId} diff --git a/lib/ant/lib/ant-xz.jar b/lib/ant/lib/ant-xz.jar index a951a48b254c..6412f60b3104 100644 Binary files a/lib/ant/lib/ant-xz.jar and b/lib/ant/lib/ant-xz.jar differ diff --git a/lib/ant/lib/ant-xz.pom b/lib/ant/lib/ant-xz.pom index 789615858cc3..b20b65c94aba 100644 --- a/lib/ant/lib/ant-xz.pom +++ b/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 @@ +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant-xz - 1.10.5 + 1.10.12 Apache Ant + XZ for Java contains the xz compression support org.apache.ant ant - 1.10.5 + 1.10.12 compile @@ -61,7 +61,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + ../../../../src/main ../../../../src/testcases ../../../../target/${project.artifactId}/classes diff --git a/lib/ant/lib/ant.jar b/lib/ant/lib/ant.jar index 9cc4f5f69ab0..1a1d3ea89200 100644 Binary files a/lib/ant/lib/ant.jar and b/lib/ant/lib/ant.jar differ diff --git a/lib/ant/lib/ant.pom b/lib/ant/lib/ant.pom index f1ffb0395b27..30fa01f0afb8 100644 --- a/lib/ant/lib/ant.pom +++ b/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 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> org.apache.ant ant-parent ../pom.xml - 1.10.5 + 1.10.12 4.0.0 - http://ant.apache.org/ + https://ant.apache.org/ org.apache.ant ant - 1.10.5 + 1.10.12 Apache Ant Core + + org/apache/tools/ant/taskdefs/modules/ + org.apache.ant ant-launcher - 1.10.5 + 1.10.12 compile - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-library - 1.3 - test - org.apache.ant ant-antunit - 1.3 + 1.4.1 test @@ -70,17 +61,30 @@ + + xerces + xercesImpl + 2.12.0 + test + + + com.sun.mail + javax.mail + 1.6.2 + test + + + org.beanshell + bsh + 2.0b5 + test + ../../../../target/ant/.build.timestamp.properties - - org.apache.maven.plugins - maven-jar-plugin - - maven-antrun-plugin @@ -91,13 +95,46 @@ run - + - + + + + + create-antlib-test-jar + process-test-classes + + run + + + + + + + + + + + + + + + + + + + @@ -107,9 +144,9 @@ run - + - + @@ -120,75 +157,143 @@ org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/launch/** + org/apache/tools/ant/launch/ org/apache/tools/ant/listener/CommonsLoggingListener* org/apache/tools/ant/listener/Log4jListener* org/apache/tools/ant/taskdefs/email/MimeMailer* + ${modules.exclude} org/apache/tools/ant/taskdefs/optional/NetRexxC* - org/apache/tools/ant/taskdefs/optional/Script* org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport* - org/apache/tools/ant/taskdefs/optional/image/* - org/apache/tools/ant/taskdefs/optional/jdepend/* - org/apache/tools/ant/taskdefs/optional/junit/* - org/apache/tools/ant/taskdefs/optional/junitlauncher/* + org/apache/tools/ant/taskdefs/optional/image/ + org/apache/tools/ant/taskdefs/optional/jdepend/ + org/apache/tools/ant/taskdefs/optional/junit/ + org/apache/tools/ant/taskdefs/optional/junitlauncher/ org/apache/tools/ant/taskdefs/optional/net/FTP* org/apache/tools/ant/taskdefs/optional/net/RExec* org/apache/tools/ant/taskdefs/optional/net/TelnetTask* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/taskdefs/optional/ssh/* - org/apache/tools/ant/taskdefs/optional/xz/* - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/types/optional/image/* - org/apache/tools/ant/types/optional/xz/* - org/apache/tools/ant/types/resolver/** + org/apache/tools/ant/taskdefs/optional/sound/ + org/apache/tools/ant/taskdefs/optional/splash/ + org/apache/tools/ant/taskdefs/optional/ssh/ + org/apache/tools/ant/taskdefs/optional/xz/ + org/apache/tools/ant/types/optional/image/ + org/apache/tools/ant/types/optional/imageio/ + org/apache/tools/ant/types/optional/xz/ + org/apache/tools/ant/types/resolver/ + org/apache/tools/ant/util/depend/bcel/ org/apache/tools/ant/util/ScriptRunner.java - org/apache/tools/ant/util/depend/bcel/* org/apache/tools/ant/util/optional/ScriptRunner.java org/apache/tools/ant/util/regexp/JakartaOro* org/apache/tools/ant/util/regexp/JakartaRegexp* - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/launch/** + + org/apache/tools/ant/launch/ + org/apache/tools/ant/listener/CommonsLoggingListener* + org/apache/tools/ant/listener/Log4jListener* + + org/apache/tools/ant/taskdefs/AbstractCvs* + + org/apache/tools/ant/taskdefs/Javac* + org/apache/tools/ant/taskdefs/StyleTest* - org/apache/tools/ant/taskdefs/email/MimeMailer* + + org/apache/tools/ant/taskdefs/email/EmailTask* + + ${modules.exclude} + + org/apache/tools/ant/taskdefs/optional/ANTLR* + + org/apache/tools/ant/taskdefs/optional/Jspc* + org/apache/tools/ant/taskdefs/optional/Pvcs* + + org/apache/tools/ant/taskdefs/optional/TraXLiaison* + + org/apache/tools/ant/taskdefs/optional/XmlValidateCatalog* + + org/apache/tools/ant/taskdefs/optional/image/ + + org/apache/tools/ant/taskdefs/optional/jdepend/ + org/apache/tools/ant/taskdefs/optional/junit/ + org/apache/tools/ant/taskdefs/optional/junitlauncher/ + org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/ssh/* - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/util/Script* + + org/apache/tools/ant/taskdefs/optional/splash/ + + org/apache/tools/ant/taskdefs/optional/ssh/ + + org/apache/tools/ant/types/Assertions* + + org/apache/tools/ant/types/optional/depend/ClassFileSet* + + org/apache/tools/ant/util/ClasspathUtils* + org/apache/tools/ant/util/LoaderUtils* + org/apache/tools/ant/util/regexp/JakartaOro* + org/apache/tools/ant/util/regexp/JakartaRegexp* - org/apache/tools/ant/util/regexp/Jdk14Regexp* + + org/apache/tools/ant/AntClassLoaderDelegation* + + org/apache/tools/ant/Include* + + org/example/junitlauncher/ + + org/apache/tools/ant/taskdefs/optional/script/graal/ + + org/apache/tools/ant/types/CommandlineJavaTest* + org/apache/tools/ant/types/selectors/ModifiedSelectorTest* + org/apache/tools/ant/taskdefs/AvailableTest* + + org.apache.maven.plugins + maven-jar-plugin + + + true + + org.apache.tools.ant.Main + true + true + true + + + + org.apache.maven.plugins maven-surefire-plugin ../../../.. + ../../../.. ant.home ${env.ANT_HOME} - build.tests - ../../../../target/ant/testcases + build.classes.value + ${project.basedir}/../../../../target/${project.artifactId}/classes build.tests.value - ../../../../target/ant/testcases + ${project.basedir}/../../../../target/${project.artifactId}/testcases offline true + + ant.test.basedir.ignore + true + @@ -198,13 +303,22 @@ + + ../../../.. + META-INF + + LICENSE + NOTICE + + ../../../../src/main true - org/apache/tools/ant/taskdefs/default.properties - org/apache/tools/ant/types/default.properties - org/apache/tools/ant/taskdefs/default.properties + org/apache/tools/ant/listener/defaults.properties + org/apache/tools/ant/taskdefs/defaults.properties + org/apache/tools/ant/types/defaults.properties + org/apache/tools/ant/antlib.xml org/apache/tools/ant/types/conditions/antlib.xml org/apache/tools/ant/defaultManifest.mf org/apache/tools/ant/version.txt @@ -215,10 +329,11 @@ true **/antlib.xml + **/javadoc-frame-injections-fix.txt - ../../../../docs + ../../../../manual false images/ant_logo_large.gif @@ -240,8 +355,21 @@ ../../../../src/main ../../../../src/tests/junit - ../../../../target/ant/classes - ../../../../target/ant/testcases - ../../../../target/ant + ../../../../src/etc + + ../../../../target/${project.artifactId}/classes + ../../../../target/${project.artifactId}/testcases + ../../../../target/${project.artifactId} + + + java9+ + + [9,) + + + not/here + + + diff --git a/lib/ant/lib/classpath.index b/lib/ant/lib/classpath.index deleted file mode 100644 index 9230135cd241..000000000000 Binary files a/lib/ant/lib/classpath.index and /dev/null differ diff --git a/lib/ant/lib/libraries.properties b/lib/ant/lib/libraries.properties index 105dacaf1cfc..ec536522e83c 100644 --- a/lib/ant/lib/libraries.properties +++ b/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 diff --git a/lib/ant/src.zip b/lib/ant/src.zip index 338d96413bfe..1a4beb4d8c75 100644 Binary files a/lib/ant/src.zip and b/lib/ant/src.zip differ