diff --git a/WHATSNEW b/WHATSNEW index 2c9b3e8e1..c3a962560 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -45,7 +45,7 @@ Other changes: preserveLastModified attribute is set to true for that task Bugzilla Report 58589 - * zip and the related tasks can now set the modfication time of all + * zip and the related tasks can now set the modification time of all entries to a fixed timestamp. Github Pull Request #36 @@ -60,6 +60,13 @@ Other changes: * javah has been removed from Java 10. The task will now throw an exception if you try to use it while running Java 10 or newer. + * Updated Maven Ant Tasks, Jakarta Regexp and JUnit 4 to the latest + stable version (2.1.3, 1.4, and 4.12 respectively); updated + Java Mail API, JRuby and Jython to the latest Java 5 compatible + version (1.5.6, 1.6.8 and 2.5.3, respectively); added resolve targets + for Ivy and AntUnit to facilitate releases and updates, respectively. + Github Pull Request #50 + Changes from Ant 1.9.8 TO Ant 1.9.9 =================================== diff --git a/fetch.xml b/fetch.xml index 8442d2a14..dc8af7280 100644 --- a/fetch.xml +++ b/fetch.xml @@ -23,48 +23,48 @@ --> - - This build file downloads JAR files that optional Ant tasks use, - and installs them in a location that is accessible the next time Ant runs. + +This build file downloads JAR files that optional Ant tasks use, +and installs them in a location that is accessible the next time Ant runs. - You can choose three locations, by going -Ddest=LOCATION on the command line - -Ddest=user user lib dir ${user.home}/.ant/lib - -Ddest=system ant lib dir ${ant.home}/lib - -Ddest=optional optional dir $${basedir}/lib/optional (for Ant developers) +You can choose three locations, by going -Ddest=LOCATION on the command line +-Ddest=user user lib dir ${user.home}/.ant/lib +-Ddest=system ant lib dir ${ant.home}/lib +-Ddest=optional optional dir $${basedir}/lib/optional (for Ant developers) - You may also need to set proxy settings. On Java1.5, Ant tries to get - this from the OS, unless you use the -noproxy option. +You may also need to set proxy settings. On Java 1.5, Ant tries to get +this from the OS, unless you use the -noproxy option. - Proxies can be configured manually setting the JVM proxy values in the - ANT_OPTS environment variable. +Proxies can be configured manually setting the JVM proxy values in the +ANT_OPTS environment variable. - For example, to set the proxy up in the tcsh shell, the command would be - something like: +For example, to set the proxy up in the tcsh shell, the command would +be something like: - For csh/tcsh: - setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" - For bash: - export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" - For Windows, set the environment variable in the appropriate dialog box - and open a new console. or, by hand - set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 - +For csh/tcsh: + setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" +For bash: + export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080" +For Windows, set the environment variable in the appropriate dialog box +and open a new console. or, by hand + set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 + - - - + + + - + - - + + - + @@ -80,49 +80,57 @@ Set -Ddest=LOCATION on the command line - + value="${lib.dir}"> + - + value="${optional.dir}"> + - + value="${userlib.dir}"> + Unknown destination : ${dest} Downloading to ${dest.dir} - + - + xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + + Cannot execute multiple targets due to the bug in Maven Ant tasks + + + + - + - Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties. + Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties. - + - - - + + + + + + + - + - + @@ -131,43 +139,41 @@ Set -Ddest=LOCATION on the command line - + - - - + + + + remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true" + skipFailedTransfers="true"> - + - - - + - + - + - + - - - + + + @@ -175,161 +181,185 @@ Set -Ddest=LOCATION on the command line - + - + - + description="Set up temporary cache for downloaded files"> + - + description="Get rid of the temporary cache directory"> + - + + + + + + + + + - - + description="load logging libraries (Commons and Log4j)" + depends="init"> + + - + description="load JUnit libraries" + depends="init"> + + - - + description="load full XML libraries (Xalan and xml-resolver)" + depends="init"> + + - + description="load networking libraries (commons-net and JSch)" + depends="init"> + - - + description="load regexp libraries" + depends="init"> + + - + description="load ANother Tool for Language Recognition (ANTLR)" + depends="init"> + - + description="load Byte Code Engineering Library (BCEL)" + depends="init"> + - + description="load JDepend libraries" + depends="init"> + - + description="load Bean Scripting Framework" + depends="init"> + - + - + - + - - + + - + - - - + + + - + - - + + + + + filename="NetRexx.zip" localdir="${temp.dir}"/> + - + + depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx"/> diff --git a/lib/libraries.properties b/lib/libraries.properties index faad04ef4..bc8cebd21 100644 --- a/lib/libraries.properties +++ b/lib/libraries.properties @@ -13,24 +13,25 @@ # See the License for the specific language governing permissions and # limitations under the License. -#this file declares the libraries for use in -#a given release of the components +# This file declares the libraries for use in a given release of the components -#if you change this, change the checksum to match -m2.version=2.0.4 -m2.url=http\://repo1.maven.org/maven2 -m2.artifact-name=maven-artifact-ant -m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar +# If you change this, change the checksum to match +m2.version=2.1.3 +m2.url=https://archive.apache.org/dist/maven/ant-tasks +m2.artifact-name=maven-ant-tasks +m2.jar.name=${m2.artifact-name}-${m2.version}.jar #this is the URL of the antlib library, that is pulled down for everything else. -m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name} +m2.antlib.url=${m2.url}/${m2.version}/binaries/${m2.jar.name} #this is the sha1 checksum of the artifact -m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50 +m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc # Repository to use by default for fetching dependencies. m2.repo=http://repo1.maven.org/maven2/ -#versions of different libraries. Please keep in alphabetical order, except -#when a specific dependency forces them to be out-of-order +# 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.3 antlr.version=2.7.7 bcel.version=5.1 bsf.version=2.4.0 @@ -39,27 +40,31 @@ bsh-core.version=${bsh.version} commons-net.version=1.4.1 commons-logging.version=1.1 commons-logging-api.version=${commons-logging.version} +hamcrest-core.version=1.3 +hamcrest-library.version=${hamcrest-core.version} jai-core.version=1.1.3 jai-codec.version=1.1.3 +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} +# Later versions are built with Java 7 +javax.mail-api.version=1.5.6 jdepend.version=2.9.1 -jruby.version=0.9.8 -junit.version=4.11 +# Later versions are built with Java 7 +jruby.version=1.6.8 +junit.version=4.12 +# Later versions are built with Java 6 +rhino.version=1.7R5 jsch.version=0.1.54 -jython.version=2.1 -#log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo +jython.version=2.5.3 +# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo log4j.version=1.2.14 -#js is the javascript implementation of the rhino project -#17R1 is compiled with Java5 so we can't use the jar when building with JDK 1.4 -js.version=1.6R7 oro.version=2.0.8 -regexp.version=1.3 servlet-api.version=2.3 which.version=1.0 xalan.version=2.7.2 xml-resolver.version=1.2 -mail.version=1.4 -#paired +# paired jacl.version=1.2.6 tcljava.version=${jacl.version} diff --git a/lib/optional/LICENSE.junit4.html b/lib/optional/LICENSE.junit4.html new file mode 100644 index 000000000..181153ef3 --- /dev/null +++ b/lib/optional/LICENSE.junit4.html @@ -0,0 +1,261 @@ + + + + + + +Eclipse Public License - Version 1.0 + + + + + + +

Eclipse Public License - v 1.0

+ +

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT.

+ +

1. DEFINITIONS

+ +

"Contribution" means:

+ +

a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and

+

b) in the case of each subsequent Contributor:

+

i) changes to the Program, and

+

ii) additions to the Program;

+

where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program.

+ +

"Contributor" means any person or entity that distributes +the Program.

+ +

"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.

+ +

"Program" means the Contributions distributed in accordance +with this Agreement.

+ +

"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.

+ +

2. GRANT OF RIGHTS

+ +

a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form.

+ +

b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.

+ +

c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program.

+ +

d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement.

+ +

3. REQUIREMENTS

+ +

A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:

+ +

a) it complies with the terms and conditions of this +Agreement; and

+ +

b) its license agreement:

+ +

i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;

+ +

ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits;

+ +

iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and

+ +

iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange.

+ +

When the Program is made available in source code form:

+ +

a) it must be made available under this Agreement; and

+ +

b) a copy of this Agreement must be included with each +copy of the Program.

+ +

Contributors may not remove or alter any copyright notices contained +within the Program.

+ +

Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.

+ +

4. COMMERCIAL DISTRIBUTION

+ +

Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.

+ +

For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages.

+ +

5. NO WARRANTY

+ +

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations.

+ +

6. DISCLAIMER OF LIABILITY

+ +

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

+ +

7. GENERAL

+ +

If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable.

+ +

If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed.

+ +

All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.

+ +

Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved.

+ +

This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No party +to this Agreement will bring a legal action under this Agreement more +than one year after the cause of action arose. Each party waives its +rights to a jury trial in any resulting litigation.

+ + + + \ No newline at end of file diff --git a/lib/optional/README b/lib/optional/README index a7f22222a..b3eec1422 100644 --- a/lib/optional/README +++ b/lib/optional/README @@ -1,4 +1,5 @@ -The file junit-3.8.2.jar is version 3.8.2 of JUnit, whereas junit-4.8.1.jar is -version 4.8.1 with the junit.** classes removed (except for the 3.x -> 4.x -adapter); see the file LICENSE.junit.html for the terms of distribution. For +This directory contains the latest distributions of both JUnit 3 and 4 for testing of junit task; +for proper execution, JUnit 3 must come on classpath before JUnit 4. + +See the files LICENSE.junit.html respectively LICENSE.junit4.html for the terms of distribution. For more information about JUnit or the latest release, see . diff --git a/lib/optional/hamcrest-library-1.3.jar b/lib/optional/hamcrest-library-1.3.jar new file mode 100644 index 000000000..9eac80d7b Binary files /dev/null and b/lib/optional/hamcrest-library-1.3.jar differ diff --git a/lib/optional/junit-4.11.jar b/lib/optional/junit-4.11.jar deleted file mode 100644 index aaf744484..000000000 Binary files a/lib/optional/junit-4.11.jar and /dev/null differ diff --git a/lib/optional/junit-4.12.jar b/lib/optional/junit-4.12.jar new file mode 100644 index 000000000..3a7fc266c Binary files /dev/null and b/lib/optional/junit-4.12.jar differ diff --git a/release/ivy.xml b/release/ivy.xml index fe9cfd8c8..2efe77014 100644 --- a/release/ivy.xml +++ b/release/ivy.xml @@ -15,149 +15,148 @@ See the License for the specific language governing permissions and limitations under the License. --> - + xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"> - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index a0397dc0f..27f9eb71e 100644 --- a/src/etc/poms/ant-apache-log4j/pom.xml +++ b/src/etc/poms/ant-apache-log4j/pom.xml @@ -44,7 +44,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma log4j log4j - 1.2.13 + 1.2.14 compile diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index 666534638..00c80c013 100644 --- a/src/etc/poms/ant-apache-oro/pom.xml +++ b/src/etc/poms/ant-apache-oro/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.11 + 4.12 test diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index 117d588e3..e1d29dc52 100644 --- a/src/etc/poms/ant-apache-regexp/pom.xml +++ b/src/etc/poms/ant-apache-regexp/pom.xml @@ -42,9 +42,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma compile - regexp - regexp - 1.3 + jakarta-regexp + jakarta-regexp + 1.4 compile diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 5a3188f70..0e86d849e 100644 --- a/src/etc/poms/ant-apache-resolver/pom.xml +++ b/src/etc/poms/ant-apache-resolver/pom.xml @@ -44,7 +44,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma xml-resolver xml-resolver - 1.1 + 1.2 compile diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index daf124e16..3c0b1a3e0 100644 --- a/src/etc/poms/ant-apache-xalan2/pom.xml +++ b/src/etc/poms/ant-apache-xalan2/pom.xml @@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma xalan xalan - 2.7.1 + 2.7.2 compile diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index 5d042a5ac..1a94d3d51 100644 --- a/src/etc/poms/ant-commons-logging/pom.xml +++ b/src/etc/poms/ant-commons-logging/pom.xml @@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma commons-logging commons-logging-api - 1.0.4 + 1.1 compile diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index d03b6ec29..45f6641ca 100644 --- a/src/etc/poms/ant-commons-net/pom.xml +++ b/src/etc/poms/ant-commons-net/pom.xml @@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma commons-net commons-net - 1.4.0 + 1.4.1 compile diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index a0802778a..94c8cecd4 100644 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@ -46,8 +46,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma javax.mail - mail - 1.4 + javax.mail-api + 1.5.6 compile diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index f0b5f8022..d201d70aa 100644 --- a/src/etc/poms/ant-junit/pom.xml +++ b/src/etc/poms/ant-junit/pom.xml @@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma junit junit - 4.11 + 4.12 compile diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index 5966cc5a7..0f1dbfec2 100644 --- a/src/etc/poms/ant-junit4/pom.xml +++ b/src/etc/poms/ant-junit4/pom.xml @@ -45,7 +45,7 @@ junit junit - 4.11 + 4.12 compile diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml index 3ae9d98ba..b089d0352 100644 --- a/src/etc/poms/ant-testutil/pom.xml +++ b/src/etc/poms/ant-testutil/pom.xml @@ -46,7 +46,7 @@ junit junit - 4.11 + 4.12 compile diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml index 8a7b8ecb1..1819e1c7a 100644 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@ -45,10 +45,16 @@ junit junit - 4.11 + 4.12 test + + org.apache.ant + ant-antunit + 1.3 + test + ../../../../target/ant/.build.timestamp.properties