diff --git a/.gitignore b/.gitignore index 61a7f55..1df01f2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.bak *.o *.code-workspace +.vscode/* jre/* jre32/* diff --git a/CITATION.cff b/CITATION.cff index 2a2b3a5..61d8a04 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,13 +1,13 @@ cff-version: 1.2.0 -message: "To cite MOVES4, use the metadata from this file." +message: "The MOVES5 Release Candidate is made available for testing purposes. Emission results of MOVES5.0.0 may differ from the results of this release candidate. Results from this release candidate may not be used in work for state implementation plans, conformity determinations, or for any other regulatory purpose." authors: - name: "USEPA" -title: "Motor Vehicle Emission Simulator: MOVES4" +title: "Motor Vehicle Emission Simulator: MOVES5-ReleaseCandidate2" type: software identifiers: - type: other value: "Office of Transportation and Air Quality. US Environmental Protection Agency. Ann Arbor, MI." description: "Publisher" url: "https://www.epa.gov/moves" -version: 4.0.1 -date-released: 2024-01-18 +version: "5.0.0-RC2" +date-released: 2024-10-24 diff --git a/License.txt b/License.txt index 0a9f3e1..b017b0a 100644 --- a/License.txt +++ b/License.txt @@ -1,3 +1,11 @@ +The MOVES5 Release Candidate is made available for testing purposes +and for modelers to become familiar with functional changes between +MOVES4 and MOVES5 before MOVES5.0.0 is released. Emission results +of MOVES5.0.0 may differ from the results of this release candidate. +Results from this version may not be used in work for state +implementation plans, conformity determinations, or for any other +regulatory purpose. + Copyright U.S. Environmental Protection Agency Licensed for use pursuant to the GNU General Public License (GPL) For information about the GPL see http://www.gnu.org/licenses/gpl.html diff --git a/MOVESConfiguration.txt b/MOVESConfiguration.txt index d9d072c..ce02126 100644 --- a/MOVESConfiguration.txt +++ b/MOVESConfiguration.txt @@ -1,5 +1,5 @@ defaultServerName = localhost -defaultDatabaseName = movesdb20240104 +defaultDatabaseName = movesdb20241016 executionServerName = localhost executionDatabaseName = MOVESExecution outputServerName = 127.0.0.1 diff --git a/MOVESTemporary/.gitignore b/MOVESTemporary/.gitignore new file mode 100644 index 0000000..86d0cb2 --- /dev/null +++ b/MOVESTemporary/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md index 10285bb..a313f23 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,6 +6,7 @@ The following versions of MOVES are currently supported and will receive securit | Version | Supported | | ------- | ------------------ | +| 5.0.x | :white_check_mark: | | 4.0.x | :white_check_mark: | | 3.1.x | :white_check_mark: | | 3.0.x | :x: | diff --git a/amazon/movesamazon.jar b/amazon/movesamazon.jar index dbace1c..2eaf98d 100644 Binary files a/amazon/movesamazon.jar and b/amazon/movesamazon.jar differ diff --git a/ant/CONTRIBUTORS b/ant/CONTRIBUTORS index d0e684e..660b9be 100644 --- a/ant/CONTRIBUTORS +++ b/ant/CONTRIBUTORS @@ -8,6 +8,7 @@ Adam Sotona Adrian Nistor Adrien Grand Aleksandr Ishutin +Aleksei Zotov Alex Alex Rosen Alexander Grund @@ -66,6 +67,7 @@ Chris Hegarty Chris Povirk Christian Knorr Christian Schmidt +Christoph Dreis Christoph Gysin Christoph Wilhelms Christophe Labouisse @@ -214,6 +216,7 @@ Jesse Stockall Jim Allers Jimmy Casey Joel Tucci +Joerg Michelberger Joerg Wassmer Joey Richey Johann Herunter @@ -234,6 +237,7 @@ Justyna Horwat Karl Jansen Keiron Liddle Keith Visco +Keith W. Campbell Kevin Connor Arpe Kevin Greiner Kevin Jackson @@ -274,6 +278,7 @@ Martin Landers Martin Poeschl Martin van den Bemt Martin von Gagern +Mateusz Kazimierczuk Mathieu Champlon Mathieu Peltier Matt Albrecht @@ -308,6 +313,7 @@ Miha Mike Davis Mike Roberts Mike Williams +Mikolaj Izdebski Miroslav Zaťko Mounir El Hajj Nathan Beyer @@ -351,6 +357,7 @@ Philip Hourihane Phillip Wells Pierre Delisle Pierre Dittgen +Piotr P. Karwasz Preston Bannister Ralf Hergert Rami Ojares @@ -388,6 +395,7 @@ Russell Gold Ryan Bennitt Sam Ruby Sandra Metz +Santosh R. Dhariwal Scott Carlson Scott Ellsworth Scott Johnson @@ -395,6 +403,7 @@ Scott M. Stirling Sean Egan Sean P. Kane Sebastian Kantha +Sebastian Ratz Sebastien Arod Shiraz Kanga Simeon Fitch @@ -421,12 +430,14 @@ Takashi Okamoto TAMURA Kent Taoufik Romdhane Tariq Master +Taylor Smock Thomas Aglassinger Thomas Butz Thomas Christen Thomas Christensen Thomas Haas Thomas Quas +Thomas Starlinger Tim Boemker Tim Drury Tim Fennell @@ -442,6 +453,7 @@ Tom Dimock Tom Eugelink Tom May Tomasz Bech +Tomasz Kowalczewski Tomáš Zezula Tony Gravagno Trejkaz Xaoza diff --git a/ant/KEYS b/ant/KEYS index a8f3b89..878d75e 100644 --- a/ant/KEYS +++ b/ant/KEYS @@ -1554,3 +1554,62 @@ S3vUQ3zGioMMYLvbNe8rAP3VC5fJ7H80spv/z05JfO7c4hutU8D0ykQ0ZNuWdL79 3rZzxBZRMmQz3CJrMw== =vLW3 -----END PGP PUBLIC KEY BLOCK----- +pub rsa4096 2022-12-11 [SC] + 0A123C1ED3F13A6A0140E166C71FB765CD9DE313 +uid [ultimate] Jaikiran Pai (CODE SIGNING KEY) +sig 3 C71FB765CD9DE313 2022-12-11 Jaikiran Pai (CODE SIGNING KEY) +sub rsa4096 2022-12-11 [E] +sig C71FB765CD9DE313 2022-12-11 Jaikiran Pai (CODE SIGNING KEY) + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +LeEX5gFFptuqic/l8R9a4+g= +=AEKY +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ant/NOTICE b/ant/NOTICE index d77bd06..e9d221a 100644 --- a/ant/NOTICE +++ b/ant/NOTICE @@ -1,5 +1,5 @@ Apache Ant -Copyright 1999-2021 The Apache Software Foundation +Copyright 1999-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/ant/WHATSNEW b/ant/WHATSNEW index 7239a33..91ed182 100644 --- a/ant/WHATSNEW +++ b/ant/WHATSNEW @@ -1,3 +1,227 @@ +Changes from Ant 1.10.14 TO Ant 1.10.15 +======================================= + +Other changes: +-------------- + + * exec task now logs the process' non-zero exit code at INFO + level instead of the previous ERROR level. The following + message from exec task is the one who's level has been changed: + + Result: 1 + + Bugzilla Report 26453 + + * Removes direct references to com.sun.net.ssl.internal.ssl.Provider class + from the mail task, since that internal JDK class is no longer available + in recent versions of Java. + Bugzilla Report 68460 + + * has a new failOnError attribute which, when + enabled, makes the task throw a BuildException for certain error + cases that will only be logged otherwise. + Github Pull Request #206 + + * task now has a new "useSecureDataChannel" attribute which + can be set to true, when ftps is enabled, to enable secure data + channel. + Bugzilla Report 68773 + +Fixed bugs: +----------- + + * Fixes an regression, introduced in Ant 1.10.13, where pathconvert + would unintentionally trim the string output. + Bugzilla Report 67082 + + * Fixes a bug in task which would throw a ClassFormatError + if it encountered constant pool entry type 17. + Bugzilla Report 66552 + + * Launching ant.bat from within a Java program using java.lang.Runtime.exec() + could result in an unexpected failure. This has now been fixed. + Bugzilla Report 67417 + + * Fixes an issue in bootstrap.bat when trying to detect if the "javac" + command in the JDK supports the "--release" option. + Github Pull Request #205 + + * Fixes a bug in org.apache.tools.ant.taskdefs.email.EmailAddress which + would throw a java.lang.StringIndexOutOfBoundsException if the email + address passed to its constructor was an empty String. + Bugzilla Report 68462 + + * legacy-xml reporter of junitlauncher task was using a non-buffered + outputstream when generating the report. This introduces severe + performance penalties since the writes translate to native write + system calls. This has been fixed to use a BufferedOutputStream. + Github Pull Request #207 + + +Changes from Ant 1.10.13 TO Ant 1.10.14 +======================================= + +Changes that could break older environments: +------------------------------------------- + + * Resource#compareTo now invokes getName rather than toString as the + later may be costly (for example in the case of a StringResource). + Bugzilla Report 66496 + + * When using Java 18 or higher, Ant will no longer use Java SecurityManager + because it has been deprecated for removal and by default is disallowed + to be set at runtime https://openjdk.org/jeps/411. + This will mean that the "" type is no longer functional when + using Java 18 or higher. + Furthermore, when using Java 18 or higher, if the build executes + tasks that call "java.lang.System.exit()" and if those tasks aren't + running in a forked VM of their own, then such tasks will now kill + the entire Ant build process. It is recommended that such tasks be + updated to launch in a forked JVM so that the System.exit() call + will not impact the JVM in which Ant process runs. + +Fixed bugs: +----------- + + * log only the stylesheet name in the xslt task. + Github Pull Request #199 + + * junitlauncher task's "test" and "listener" elements which take + a "outputDir" property were incorrectly resolving the outputDir + against the current working directory instead of the project's + basedir. This has now been fixed. + Bugzilla Report 66504 + + * regexmapper would, in some cases, incorrectly consume backslash characters + from the "to" attribute, resulting in missing backslashes in the output. + This is now fixed. + Bugzilla Report 66468 + + * , and now try to preserve the + file permissions of the files they modify. + Bugzilla Report 66522 + + * junitlauncher task would fail if a forked test timed out even + if haltOnFailure was set to false. This is now fixed. + Bugzilla Report 66411 + + * fixes a bug in org.apache.tools.zip.ZipOutputStream where, even + when "zip64Mode" is set to "always", ZipOutputStream may not create + a CEN extra field data for the entry. + Bugzilla Report 66873 + + * legacy-xml listener of junitlauncher task wouldn't report certain + failures involving junit jupiter dynamic tests. This has now been + fixed. + Github Pull Request #122 + + * allow.class which was introduced in Ant 1.10.13 release, has been + removed from this 1.10.14 release. This class was introduced in + context of the SecurityManager changes in Ant 1.10.13, which have + now been reverted in Ant 1.10.14, since they caused several + regressions. + Bugzilla Reports 66828, 66951 + +Other changes: +-------------- + + * element of the junitlauncher task now has a new optional "java" + attribute which can be used to point to a different Java installation + for runnning the forked tests. + Bugzilla Report 66464 + + * made sure sorts the echoed properties on JDK9+ as well. + Bugzilla Report 66588 + + * org.apache.tools.ant.taskdefs.Recorder class now introduces a + setLogLevel(LogLevel level) method. + Bugzilla Report 66238 + + * The element of junitlaunchertask now allows a "forkMode" + attribute. forkMode=perTestClass can now be used to launch + each test class in a separate forked JVM. + Bugzilla Report 65176 + +Changes from Ant 1.10.12 TO Ant 1.10.13 +======================================= + +Changes that could break older environments: +------------------------------------------- + + * has a new attribute authenticateOnRedirect that can be used to + prevent Ant from sending the configured credentials when following a + redirect. It is false by default, which means builds that rely on + credentials being used on the redirected URI may break. + Github Pull Request #173 + +Fixed bugs: +----------- + + * the PropertyEnumerator change introduced in 1.10.9 proved to be not + fully backwards compatible when combined with certain custom + PropertyHelper implementations - for example when using AntXtras. + Bugzilla Report 65799 + + * legacy-xml reporter of the junitlauncher task now escapes ]]> when writing CDATA. + Bugzilla Report 65833 + + * may leak connections when trying to preserve the last modified + timestamps of files transferred recursively from a server. + Bugzilla Report 66001 + + * tstamp task would in certain cases parse the SOURCE_DATE_EPOCH environment variable + value to an incorrect date. This has now been fixed. + Github Pull Request #186 + + * fetch.xml didn't set up non-default repositories properly and thus + failed to download JAI. + Github Pull Request #191 + + * When building and installing Ant distribution from source, the build script + would change permissions on unrelated files in the destination directory. + This is now fixed and such unrelated files in the destination directory + will be left untouched. + Bugzilla Report 66164 + + * parsing tar entries with multiple NUL bytes in their name would + include garbage bytes as the name included all bytes up to the last + NUL rather than the first. + Github Pull Request #194 + + * loadresource might log warnings even though quiet was set to true + Bugzilla Report 65647 + + * javac task would add paths constructs containing wildcards to the + internally created argument file where wildcards are not allowed + Bugzilla Report 65621 + +Other changes: +-------------- + + * added an implementation of the MIME Mail sender based on the + repackaged Jakarta Mail package rather than javax Mail. + Github Pull Request #161 + + * The "listener" element in the junitlauncher task now supports + an "extension" attribute to control the filename extension + of the generated output file from the listener. + Github Pull Request #168 + + * now supports FTPs. + Github Pull Request #170 + + * DirectoryScanner avoids listing directory contents when it known it + will never use the information retrieved. This may improve + performance in some special cases. + Bugzilla Report 66048 + + * will now create the parent directory of the manifestFile + attribute if it doesn't exist. + Bugzilla Report 66231 + + * org.apache.tools.ant.BuildLogger now has a new method getMessageOutputLevel() + which returns the currently set message output level. + Changes from Ant 1.10.11 TO Ant 1.10.12 ======================================= diff --git a/ant/contributors.xml b/ant/contributors.xml index 74329cf..eb44cf5 100644 --- a/ant/contributors.xml +++ b/ant/contributors.xml @@ -62,6 +62,10 @@ Aleksandr Ishutin + + Aleksei + Zotov + Alex @@ -292,6 +296,10 @@ Christian Schmidt + + Christoph + Dreis + Christoph Gysin @@ -892,6 +900,10 @@ Joel Tucci + + Joerg + Michelberger + Joerg Wassmer @@ -975,6 +987,11 @@ Keith Visco + + Keith + W. + Campbell + Kevin Connor @@ -1138,6 +1155,10 @@ Martin von Gagern + + Mateusz + Kazimierczuk + Mathieu Champlon @@ -1276,6 +1297,10 @@ Mike Williams + + Mikolaj + Izdebski + Miroslav Zaťko @@ -1452,6 +1477,10 @@ Pierre Dittgen + + Piotr + P. + Karwasz Preston Bannister @@ -1601,6 +1630,11 @@ Sandra Metz + + Santosh + R. + Dhariwal + Scott Carlson @@ -1631,6 +1665,10 @@ Sebastian Kantha + + Sebastian + Ratz + Sebastien Arod @@ -1735,6 +1773,10 @@ Tariq Master + + Taylor + Smock + Thomas Aglassinger @@ -1759,6 +1801,10 @@ Thomas Quas + + Thomas + Starlinger + Tim Boemker @@ -1820,6 +1866,10 @@ Tomasz Bech + + Tomasz + Kowalczewski + Tomáš Zezula diff --git a/ant/etc/ant-bootstrap.jar b/ant/etc/ant-bootstrap.jar index 3c9ab9f..54b92df 100644 Binary files a/ant/etc/ant-bootstrap.jar and b/ant/etc/ant-bootstrap.jar differ diff --git a/ant/fetch.xml b/ant/fetch.xml index 24e8e6d..599b8f2 100644 --- a/ant/fetch.xml +++ b/ant/fetch.xml @@ -98,7 +98,7 @@ Set -Ddest=LOCATION on the command line + xmlns:resolver="antlib:org.apache.maven.resolver.ant"> Cannot execute multiple targets due to the bug in Maven Ant tasks @@ -119,16 +119,21 @@ Set -Ddest=LOCATION on the command line - - - - - - - - + + + + + + + + + + + + @@ -242,6 +247,7 @@ Set -Ddest=LOCATION on the command line description="load junit jupiter engine libraries (necessary only for internal Ant project tests)" depends="init"> + + @@ -335,6 +342,12 @@ Set -Ddest=LOCATION on the command line + + + + @@ -364,34 +377,9 @@ Set -Ddest=LOCATION on the command line - - - - - - - - - - - - - - - - - - - - - - - - - + depends="init-no-m2"> + + javamail,jakartamail,jspc,jai,xz,junit-engine-vintage,junit-engine-jupiter,netrexx"/> diff --git a/ant/get-m2.xml b/ant/get-m2.xml index de30ef2..c0c540b 100644 --- a/ant/get-m2.xml +++ b/ant/get-m2.xml @@ -48,10 +48,10 @@ + value="org/apache/maven/resolver/ant/antlib.xml" /> + value="antlib:org.apache.maven.resolver.ant" /> @@ -100,7 +100,7 @@ + if="m2.sha1.checksum" unless="${checksum.equal}"> Failed to verify the downloaded file ${m2.antlib.url}" against the checksum @@ -116,6 +116,6 @@ + description="Download the Maven Artifact Resolver Ant tasks" /> diff --git a/ant/lib/ant-antlr.jar b/ant/lib/ant-antlr.jar index 909f37e..6d52ae3 100644 Binary files a/ant/lib/ant-antlr.jar and b/ant/lib/ant-antlr.jar differ diff --git a/ant/lib/ant-antlr.pom b/ant/lib/ant-antlr.pom index 9290a3c..277b4f1 100644 --- a/ant/lib/ant-antlr.pom +++ b/ant/lib/ant-antlr.pom @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-antlr - 1.10.12 + 1.10.15 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.12 + 1.10.15 true compile diff --git a/ant/lib/ant-apache-bcel.jar b/ant/lib/ant-apache-bcel.jar index bf5de61..20a007d 100644 Binary files a/ant/lib/ant-apache-bcel.jar and b/ant/lib/ant-apache-bcel.jar differ diff --git a/ant/lib/ant-apache-bcel.pom b/ant/lib/ant-apache-bcel.pom index f5022c8..4aa2b0e 100644 --- a/ant/lib/ant-apache-bcel.pom +++ b/ant/lib/ant-apache-bcel.pom @@ -27,25 +27,25 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.10.12 + 1.10.15 Apache Ant + BCEL org.apache.ant ant - 1.10.12 + 1.10.15 compile org.apache.bcel bcel - 6.5.0 + 6.9.0 compile diff --git a/ant/lib/ant-apache-bsf.jar b/ant/lib/ant-apache-bsf.jar index 6092966..1da41d7 100644 Binary files a/ant/lib/ant-apache-bsf.jar and b/ant/lib/ant-apache-bsf.jar differ diff --git a/ant/lib/ant-apache-bsf.pom b/ant/lib/ant-apache-bsf.pom index 46c4941..747f496 100644 --- a/ant/lib/ant-apache-bsf.pom +++ b/ant/lib/ant-apache-bsf.pom @@ -27,19 +27,19 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.10.12 + 1.10.15 Apache Ant + BSF org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-apache-log4j.jar b/ant/lib/ant-apache-log4j.jar index 4132c0a..cc6f527 100644 Binary files a/ant/lib/ant-apache-log4j.jar and b/ant/lib/ant-apache-log4j.jar differ diff --git a/ant/lib/ant-apache-log4j.pom b/ant/lib/ant-apache-log4j.pom index 84b96d1..81a0e7e 100644 --- a/ant/lib/ant-apache-log4j.pom +++ b/ant/lib/ant-apache-log4j.pom @@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.10.12 + 1.10.15 Apache Ant + Log4J org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-apache-oro.jar b/ant/lib/ant-apache-oro.jar index 655dcce..5b7c3b2 100644 Binary files a/ant/lib/ant-apache-oro.jar and b/ant/lib/ant-apache-oro.jar differ diff --git a/ant/lib/ant-apache-oro.pom b/ant/lib/ant-apache-oro.pom index 69764a8..f7d0440 100644 --- a/ant/lib/ant-apache-oro.pom +++ b/ant/lib/ant-apache-oro.pom @@ -27,19 +27,19 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-oro - 1.10.12 + 1.10.15 Apache Ant + Apache Oro org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-apache-regexp.jar b/ant/lib/ant-apache-regexp.jar index e275e63..04536b2 100644 Binary files a/ant/lib/ant-apache-regexp.jar and b/ant/lib/ant-apache-regexp.jar differ diff --git a/ant/lib/ant-apache-regexp.pom b/ant/lib/ant-apache-regexp.pom index 7b73def..ef7f89a 100644 --- a/ant/lib/ant-apache-regexp.pom +++ b/ant/lib/ant-apache-regexp.pom @@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.10.12 + 1.10.15 Apache Ant + Apache Regexp org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-apache-resolver.jar b/ant/lib/ant-apache-resolver.jar index 6524642..a73e0ea 100644 Binary files a/ant/lib/ant-apache-resolver.jar and b/ant/lib/ant-apache-resolver.jar differ diff --git a/ant/lib/ant-apache-resolver.pom b/ant/lib/ant-apache-resolver.pom index df97e37..2387163 100644 --- a/ant/lib/ant-apache-resolver.pom +++ b/ant/lib/ant-apache-resolver.pom @@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.10.12 + 1.10.15 Apache Ant + Apache Resolver org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-apache-xalan2.jar b/ant/lib/ant-apache-xalan2.jar index 7288793..f4d927e 100644 Binary files a/ant/lib/ant-apache-xalan2.jar and b/ant/lib/ant-apache-xalan2.jar differ diff --git a/ant/lib/ant-apache-xalan2.pom b/ant/lib/ant-apache-xalan2.pom index cb8edff..9d5749e 100644 --- a/ant/lib/ant-apache-xalan2.pom +++ b/ant/lib/ant-apache-xalan2.pom @@ -26,26 +26,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.10.12 + 1.10.15 Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.10.12 + 1.10.15 compile xalan xalan - 2.7.2 + 2.7.3 + compile + + + xalan + serializer + 2.7.3 compile diff --git a/ant/lib/ant-commons-logging.jar b/ant/lib/ant-commons-logging.jar index f5fd2a7..d8f7b5f 100644 Binary files a/ant/lib/ant-commons-logging.jar and b/ant/lib/ant-commons-logging.jar differ diff --git a/ant/lib/ant-commons-logging.pom b/ant/lib/ant-commons-logging.pom index d7eb9c4..273e084 100644 --- a/ant/lib/ant-commons-logging.pom +++ b/ant/lib/ant-commons-logging.pom @@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-commons-logging - 1.10.12 + 1.10.15 Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-commons-net.jar b/ant/lib/ant-commons-net.jar index 7f991c8..165c9dd 100644 Binary files a/ant/lib/ant-commons-net.jar and b/ant/lib/ant-commons-net.jar differ diff --git a/ant/lib/ant-commons-net.pom b/ant/lib/ant-commons-net.pom index 5afc16c..a1f0699 100644 --- a/ant/lib/ant-commons-net.pom +++ b/ant/lib/ant-commons-net.pom @@ -26,26 +26,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-commons-net - 1.10.12 + 1.10.15 Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.10.12 + 1.10.15 compile commons-net commons-net - 3.8.0 + 3.10.0 compile diff --git a/ant/lib/ant-imageio.jar b/ant/lib/ant-imageio.jar index 96693cb..131671a 100644 Binary files a/ant/lib/ant-imageio.jar and b/ant/lib/ant-imageio.jar differ diff --git a/ant/lib/ant-imageio.pom b/ant/lib/ant-imageio.pom index 090396d..5d5d524 100644 --- a/ant/lib/ant-imageio.pom +++ b/ant/lib/ant-imageio.pom @@ -27,20 +27,20 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-imageio - 1.10.12 + 1.10.15 Apache Ant + ImageIO imageio task and corresponding types. org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-jai.jar b/ant/lib/ant-jai.jar index 79ad29e..238a399 100644 Binary files a/ant/lib/ant-jai.jar and b/ant/lib/ant-jai.jar differ diff --git a/ant/lib/ant-jai.pom b/ant/lib/ant-jai.pom index 81007c1..26e3c29 100644 --- a/ant/lib/ant-jai.pom +++ b/ant/lib/ant-jai.pom @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-jai - 1.10.12 + 1.10.15 Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-jakartamail.jar b/ant/lib/ant-jakartamail.jar new file mode 100644 index 0000000..2e7109a Binary files /dev/null and b/ant/lib/ant-jakartamail.jar differ diff --git a/ant/lib/ant-jakartamail.pom b/ant/lib/ant-jakartamail.pom new file mode 100644 index 0000000..8dd2bc5 --- /dev/null +++ b/ant/lib/ant-jakartamail.pom @@ -0,0 +1,98 @@ + + + + + + org.apache.ant + ant-parent + ../pom.xml + 1.10.15 + + 4.0.0 + https://ant.apache.org/ + org.apache.ant + ant-jakartamail + 1.10.15 + Apache Ant + JakartaMail + implementation of the mail task based on Jakarta EE mail. + Required to send emails to SMTP servers using user/password combinations + or to send mail over SSL + + + org.apache.ant + ant + 1.10.15 + compile + + + + com.sun.mail + jakarta.mail + 2.0.1 + compile + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org/apache/tools/ant/taskdefs/email/JakartaMimeMailer* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + true + true + true + + + + + + + + ../../../.. + META-INF + + LICENSE + NOTICE + + + + ../../../../src/main + ../../../../src/testcases + ../../../../target/${project.artifactId}/classes + ../../../../target/${project.artifactId}/testcases + ../../../../target/${project.artifactId} + + diff --git a/ant/lib/ant-javamail.jar b/ant/lib/ant-javamail.jar index a148b75..90df892 100644 Binary files a/ant/lib/ant-javamail.jar and b/ant/lib/ant-javamail.jar differ diff --git a/ant/lib/ant-javamail.pom b/ant/lib/ant-javamail.pom index 8735390..79bbc4b 100644 --- a/ant/lib/ant-javamail.pom +++ b/ant/lib/ant-javamail.pom @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-javamail - 1.10.12 + 1.10.15 Apache Ant + JavaMail implementation of the mail task based on javamail. Required to send emails to SMTP servers using user/password combinations @@ -41,15 +41,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant - 1.10.12 + 1.10.15 compile com.sun.mail - jakarta.mail - 1.6.4 + javax.mail + 1.6.2 compile diff --git a/ant/lib/ant-jdepend.jar b/ant/lib/ant-jdepend.jar index 5a1654d..c75fd36 100644 Binary files a/ant/lib/ant-jdepend.jar and b/ant/lib/ant-jdepend.jar differ diff --git a/ant/lib/ant-jdepend.pom b/ant/lib/ant-jdepend.pom index 29167c9..6423eca 100644 --- a/ant/lib/ant-jdepend.pom +++ b/ant/lib/ant-jdepend.pom @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-jdepend - 1.10.12 + 1.10.15 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.12 + 1.10.15 compile diff --git a/ant/lib/ant-jmf.jar b/ant/lib/ant-jmf.jar index 1c358a6..bbf508d 100644 Binary files a/ant/lib/ant-jmf.jar and b/ant/lib/ant-jmf.jar differ diff --git a/ant/lib/ant-jmf.pom b/ant/lib/ant-jmf.pom index 4ea8363..85ff521 100644 --- a/ant/lib/ant-jmf.pom +++ b/ant/lib/ant-jmf.pom @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-jmf - 1.10.12 + 1.10.15 Apache Ant + JMF contains the sound task and a soundplayer listener download the dependency from https://java.sun.com/products/java-media/jmf/ @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-jsch.jar b/ant/lib/ant-jsch.jar index b52c0fb..f92731d 100644 Binary files a/ant/lib/ant-jsch.jar and b/ant/lib/ant-jsch.jar differ diff --git a/ant/lib/ant-jsch.pom b/ant/lib/ant-jsch.pom index 1872894..437aea7 100644 --- a/ant/lib/ant-jsch.pom +++ b/ant/lib/ant-jsch.pom @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-jsch - 1.10.12 + 1.10.15 Apache Ant + JSch contains the sshexec and scp tasks @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant - 1.10.12 + 1.10.15 compile diff --git a/ant/lib/ant-junit.jar b/ant/lib/ant-junit.jar index d6cae3e..f983a5a 100644 Binary files a/ant/lib/ant-junit.jar and b/ant/lib/ant-junit.jar differ diff --git a/ant/lib/ant-junit.pom b/ant/lib/ant-junit.pom index 7220f39..5f0f171 100644 --- a/ant/lib/ant-junit.pom +++ b/ant/lib/ant-junit.pom @@ -26,38 +26,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-junit - 1.10.12 + 1.10.15 Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.10.12 + 1.10.15 compile junit junit - 4.13.1 + 4.13.2 compile xerces xercesImpl - 2.12.0 + 2.12.2 test xalan xalan - 2.7.2 + 2.7.3 test diff --git a/ant/lib/ant-junit4.jar b/ant/lib/ant-junit4.jar index d917483..711e956 100644 Binary files a/ant/lib/ant-junit4.jar and b/ant/lib/ant-junit4.jar differ diff --git a/ant/lib/ant-junit4.pom b/ant/lib/ant-junit4.pom index ac6ed0c..16fda7f 100644 --- a/ant/lib/ant-junit4.pom +++ b/ant/lib/ant-junit4.pom @@ -26,26 +26,26 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-junit4 - 1.10.12 + 1.10.15 Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.10.12 + 1.10.15 compile junit junit - 4.13.1 + 4.13.2 compile diff --git a/ant/lib/ant-junitlauncher.jar b/ant/lib/ant-junitlauncher.jar index 6ebe28f..ed086b0 100644 Binary files a/ant/lib/ant-junitlauncher.jar and b/ant/lib/ant-junitlauncher.jar differ diff --git a/ant/lib/ant-junitlauncher.pom b/ant/lib/ant-junitlauncher.pom index cce0886..87d10ae 100644 --- a/ant/lib/ant-junitlauncher.pom +++ b/ant/lib/ant-junitlauncher.pom @@ -26,38 +26,44 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-junitlauncher - 1.10.12 + 1.10.15 Apache Ant + JUnit 5 contains JUnit 5.x support org.apache.ant ant - 1.10.12 + 1.10.15 compile org.junit.platform junit-platform-launcher - 1.2.0 + 1.10.2 compile org.junit.jupiter junit-jupiter-engine - 5.2.0 + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-params + 5.10.2 test org.junit.vintage junit-vintage-engine - 5.2.0 + 5.10.2 test diff --git a/ant/lib/ant-launcher.jar b/ant/lib/ant-launcher.jar index f7dd54b..62c3e47 100644 Binary files a/ant/lib/ant-launcher.jar and b/ant/lib/ant-launcher.jar differ diff --git a/ant/lib/ant-launcher.pom b/ant/lib/ant-launcher.pom index 9284ce4..cb3187b 100644 --- a/ant/lib/ant-launcher.pom +++ b/ant/lib/ant-launcher.pom @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-launcher - 1.10.12 + 1.10.15 Apache Ant Launcher diff --git a/ant/lib/ant-netrexx.jar b/ant/lib/ant-netrexx.jar index af0eb0a..08e3a5e 100644 Binary files a/ant/lib/ant-netrexx.jar and b/ant/lib/ant-netrexx.jar differ diff --git a/ant/lib/ant-netrexx.pom b/ant/lib/ant-netrexx.pom index 22982e4..30188d0 100644 --- a/ant/lib/ant-netrexx.pom +++ b/ant/lib/ant-netrexx.pom @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant-parent ../pom.xml - 1.10.12 + 1.10.15 4.0.0 https://ant.apache.org/ org.apache.ant ant-netrexx - 1.10.12 + 1.10.15 Apache Ant + NetRexx NetRexxC task dependency can be downloaded from https://www.ibm.com/software/awdtools/netrexx/download.html @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m org.apache.ant ant - 1.10.12 + 1.10.15 compile