# HG changeset patch # Parent 5cab630684e49deef7f1a30469bda4ac500df847 Issue #185375: upgrade Ant to 1.8.1. diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html @@ -29,7 +29,7 @@

Using Ant with the IDE

-

The IDE's project system is built directly on top of Ant version 1.8.0. All +

The IDE's project system is built directly on top of Ant version 1.8.1. All of the project commands, like Build Project or Run File in Debugger, call targets in the project's Ant script. You can therefore build and run your project outside the IDE exactly as it is built and run inside the IDE. diff --git a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html --- a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html +++ b/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html @@ -10,7 +10,7 @@

Switching Ant Versions

See Also -

The IDE comes bundled with Ant version 1.8.0 and uses this installation to +

The IDE comes bundled with Ant version 1.8.1 and uses this installation to run Ant scripts. You can change the version of Ant that the IDE uses by switching the Ant installation directory in Ant Settings. You can only switch between versions 1.5.3 and higher of Ant.

diff --git a/junit/external/binaries-list b/junit/external/binaries-list --- a/junit/external/binaries-list +++ b/junit/external/binaries-list @@ -1,4 +1,4 @@ -F9560E8F1187FD4471716E16B09B555506C9B361 Ant-1.8.0-binary-patch-72080.jar +39758F3E43AAA9C0D1A95EACAE44DEFF678F462A Ant-1.8.1-binary-patch-72080.jar 0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069 junit-3.8.2-api.zip 07E4CDE26B53A9A0E3FE5B00D1DBBC7CC1D46060 junit-3.8.2.jar 8ED9640AE7E6C72E57D23DCF204637FA563C18B3 junit-4.5-api.zip diff --git a/junit/nbproject/project.properties b/junit/nbproject/project.properties --- a/junit/nbproject/project.properties +++ b/junit/nbproject/project.properties @@ -46,7 +46,7 @@ release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar -release.external/Ant-1.8.0-binary-patch-72080.jar=ant/patches/72080.jar +release.external/Ant-1.8.1-binary-patch-72080.jar=ant/patches/72080.jar # XXX AntBridge.createMainClassPath probably would not find this anyway: jnlp.verify.excludes=ant/patches/72080.jar diff --git a/o.apache.tools.ant.module.docs/antsrc/MakeManual.java b/o.apache.tools.ant.module.docs/antsrc/MakeManual.java --- a/o.apache.tools.ant.module.docs/antsrc/MakeManual.java +++ b/o.apache.tools.ant.module.docs/antsrc/MakeManual.java @@ -153,7 +153,7 @@ id += "." + anchor; } } - String title = linktext != null ? linktext : "Ant 1.8.0 Manual"; + String title = linktext != null ? linktext : "Ant 1.8.1 Manual"; String log = ""; for (int i = 0; i < depth; i++) { log += "\t"; diff --git a/o.apache.tools.ant.module.docs/external/ant-1.8.0-license.txt b/o.apache.tools.ant.module.docs/external/ant-1.8.1-license.txt rename from o.apache.tools.ant.module.docs/external/ant-1.8.0-license.txt rename to o.apache.tools.ant.module.docs/external/ant-1.8.1-license.txt --- a/o.apache.tools.ant.module.docs/external/ant-1.8.0-license.txt +++ b/o.apache.tools.ant.module.docs/external/ant-1.8.1-license.txt @@ -1,9 +1,9 @@ Name: Apache Ant -Version: 1.8.0 -Files: ant-docs-1.8.0.zip +Version: 1.8.1 +Files: ant-docs-1.8.1.zip Description: Ant build tool. License: Apache-2.0 -Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2 +Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2 Apache License Version 2.0, January 2004 diff --git a/o.apache.tools.ant.module.docs/external/binaries-list b/o.apache.tools.ant.module.docs/external/binaries-list --- a/o.apache.tools.ant.module.docs/external/binaries-list +++ b/o.apache.tools.ant.module.docs/external/binaries-list @@ -1,1 +1,1 @@ -3EB5B5AC3ED2625F6FF4C32A6C5B06EAB31BB5CA ant-docs-1.8.0.zip +A81D38819CADDDA773EDF5D6FAA120AB964B38B6 ant-docs-1.8.1.zip diff --git a/o.apache.tools.ant.module.docs/manifest.mf b/o.apache.tools.ant.module.docs/manifest.mf --- a/o.apache.tools.ant.module.docs/manifest.mf +++ b/o.apache.tools.ant.module.docs/manifest.mf @@ -1,7 +1,7 @@ Manifest-Version: 1.0 OpenIDE-Module: org.apache.tools.ant.module.docs OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/docs/Bundle.properties -OpenIDE-Module-Specification-Version: 2.24 +OpenIDE-Module-Specification-Version: 2.25 OpenIDE-Module-Layer: org/apache/tools/ant/module/docs/layer.xml OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help diff --git a/o.apache.tools.ant.module.docs/nbproject/project.properties b/o.apache.tools.ant.module.docs/nbproject/project.properties --- a/o.apache.tools.ant.module.docs/nbproject/project.properties +++ b/o.apache.tools.ant.module.docs/nbproject/project.properties @@ -41,4 +41,4 @@ javahelp.base=org/apache/tools/ant/module/docs javahelp.hs=HelpSet.hs ant.cp=${ant.core.lib}:../javahelp/external/jh-2.0_05.jar -extra.license.files=external/ant-1.8.0-license.txt +extra.license.files=external/ant-1.8.1-license.txt diff --git a/o.apache.tools.ant.module.docs/src/org/apache/tools/ant/module/docs/Bundle.properties b/o.apache.tools.ant.module.docs/src/org/apache/tools/ant/module/docs/Bundle.properties --- a/o.apache.tools.ant.module.docs/src/org/apache/tools/ant/module/docs/Bundle.properties +++ b/o.apache.tools.ant.module.docs/src/org/apache/tools/ant/module/docs/Bundle.properties @@ -37,7 +37,7 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. -OpenIDE-Module-Name=Ant 1.8.0 Documentation +OpenIDE-Module-Name=Ant 1.8.1 Documentation OpenIDE-Module-Display-Category=Java OpenIDE-Module-Short-Description=Documentation for the Ant build tool. OpenIDE-Module-Long-Description=\ diff --git a/o.apache.tools.ant.module/arch.xml b/o.apache.tools.ant.module/arch.xml --- a/o.apache.tools.ant.module/arch.xml +++ b/o.apache.tools.ant.module/arch.xml @@ -335,7 +335,7 @@
  • Ant itself, of course. - 1.5.3+ is required, 1.8.0 recommended (and currently bundled); some features may be limited to newer versions. + 1.5.3+ is required, 1.8.1 recommended (and currently bundled); some features may be limited to newer versions.
    • diff --git a/o.apache.tools.ant.module/build.xml b/o.apache.tools.ant.module/build.xml --- a/o.apache.tools.ant.module/build.xml +++ b/o.apache.tools.ant.module/build.xml @@ -107,7 +107,7 @@ - + @@ -218,7 +218,7 @@ ant -f ${here}/../java.project/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit ant -f ${here}/../java.j2seproject/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit ant -f ${here}/../build.xml commit-validation -9. Submit a patch for https://svn.apache.org/repos/asf/ant/core/trunk/xdocs/external.xml +9. Submit a patch for https://svn.apache.org/repos/asf/ant/core/branches/ANT_SITE/xdocs/external.xml mentioning that the bundled version in NB is now ${release.version}. 10. Edit these instructions in build.xml according to anything you had to do differently. diff --git a/o.apache.tools.ant.module/external/ant-1.8.0-license.txt b/o.apache.tools.ant.module/external/ant-1.8.1-license.txt rename from o.apache.tools.ant.module/external/ant-1.8.0-license.txt rename to o.apache.tools.ant.module/external/ant-1.8.1-license.txt --- a/o.apache.tools.ant.module/external/ant-1.8.0-license.txt +++ b/o.apache.tools.ant.module/external/ant-1.8.1-license.txt @@ -1,9 +1,9 @@ Name: Apache Ant -Version: 1.8.0 -Files: ant-libs-1.8.0.zip ant-misc-1.8.0.zip +Version: 1.8.1 +Files: ant-libs-1.8.1.zip ant-misc-1.8.1.zip Description: Ant build tool. License: Apache-2.0 -Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2 +Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2 OSR: 7102 Apache License diff --git a/o.apache.tools.ant.module/external/binaries-list b/o.apache.tools.ant.module/external/binaries-list --- a/o.apache.tools.ant.module/external/binaries-list +++ b/o.apache.tools.ant.module/external/binaries-list @@ -1,2 +1,2 @@ -B91FAB9535E06A6B853F04C8CBB7ECB8DC892423 ant-libs-1.8.0.zip -DF624446C6C6F4E72547AAA199B90C625A9F380E ant-misc-1.8.0.zip +1AEA391CB8BC9A7D8AD9C34E9CF709E129FAAE14 ant-libs-1.8.1.zip +6C282A7DF2CDD43229B6BCFB516298E350E61FC0 ant-misc-1.8.1.zip diff --git a/o.apache.tools.ant.module/external/build.xml b/o.apache.tools.ant.module/external/build.xml --- a/o.apache.tools.ant.module/external/build.xml +++ b/o.apache.tools.ant.module/external/build.xml @@ -42,7 +42,7 @@ --> - + diff --git a/o.apache.tools.ant.module/nbproject/project.properties b/o.apache.tools.ant.module/nbproject/project.properties --- a/o.apache.tools.ant.module/nbproject/project.properties +++ b/o.apache.tools.ant.module/nbproject/project.properties @@ -39,7 +39,7 @@ javac.compilerargs=-Xlint:unchecked javac.source=1.6 -spec.version.base=3.41.0 +spec.version.base=3.42.0 compile.ant.jar=${ant.core.lib} src-bridge.cp.extra=build/classes:${compile.ant.jar} extra.module.files=\ @@ -47,7 +47,7 @@ ant/lib/,\ ant/bin/,\ ant/etc/ -extra.license.files=external/ant-1.8.0-license.txt +extra.license.files=external/ant-1.8.1-license.txt nbm.executable.files=\ ant/bin/ant,\ ant/bin/antRun,\