Issue #179463: upgrade Ant to 1.8.0. 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.7.1. All +

The IDE's project system is built directly on top of Ant version 1.8.0. 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.7.1 and uses this installation to +

The IDE comes bundled with Ant version 1.8.0 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 @@ -BB3C83B2B3297EA0704D5249FAC60766272E8DE6 Ant-1.7.1-binary-patch-72080.jar +595D500B377B36CD212867E92A3B8F1F14AA81B2 Ant-1.8.0-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.7.1-binary-patch-72080.jar=ant/patches/72080.jar +release.external/Ant-1.8.0-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/junit/release/ant/patches/72080-README.txt b/junit/release/ant/patches/72080-README.txt new file mode 100644 --- /dev/null +++ b/junit/release/ant/patches/72080-README.txt @@ -0,0 +1,1 @@ +https://svn.apache.org/repos/asf/ant/core/branches/run-single-test-method 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.7.1 Manual"; + String title = linktext != null ? linktext : "Ant 1.8.0 Manual"; String log = ""; for (int i = 0; i < depth; i++) { log += "\t"; diff --git a/o.apache.tools.ant.module.docs/external/ant-1.7.1-license.txt b/o.apache.tools.ant.module.docs/external/ant-1.8.0-license.txt rename from o.apache.tools.ant.module.docs/external/ant-1.7.1-license.txt rename to o.apache.tools.ant.module.docs/external/ant-1.8.0-license.txt --- a/o.apache.tools.ant.module.docs/external/ant-1.7.1-license.txt +++ b/o.apache.tools.ant.module.docs/external/ant-1.8.0-license.txt @@ -1,9 +1,9 @@ Name: Apache Ant -Version: 1.7.1 -Files: ant-docs-1.7.1.zip +Version: 1.8.0 +Files: ant-docs-1.8.0.zip Description: Ant build tool. License: Apache-2.0 -Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.7.1-bin.tar.bz2 +Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-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 @@ -72568FA6EAB43FA7CFDE5013EB6ED486D29DF6AC ant-docs-1.7.1.zip +3EB5B5AC3ED2625F6FF4C32A6C5B06EAB31BB5CA ant-docs-1.8.0.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.23 +OpenIDE-Module-Specification-Version: 2.24 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.7.1-license.txt +extra.license.files=external/ant-1.8.0-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.7.1 Documentation +OpenIDE-Module-Name=Ant 1.8.0 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.7.1 recommended (and currently bundled); some features may be limited to newer versions. + 1.5.3+ is required, 1.8.0 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 @@ - + @@ -204,11 +204,11 @@ - arch.xml - external/build.xml and rename external/ant-*-license.txt (and update the version numbers mentioned in it) - and hg rm the old .zip files and hg add the new ones + and fix external/binaries-list (last two steps also in ${ant-docs}/external) 6. Run: ant -f ${ant-docs}/build.xml preview-javahelp You can ignore links to api/org/apache/... which will be broken, as well as a few other things. - But for real problems in the HTML, commit fixes to ${ant-docs}/manual/ in the ant.apache.org SVN trunk. + But for real problems in the HTML, commit fixes to docs/manual/ in the ant.apache.org SVN trunk. Sanity-check the helpset and adjust ${ant-docs}/antsrc/MakeManual.java as needed. 7. Increase spec versions in nbproject/project.properties and ${ant-docs}/manifest.mf. 8. Test everything, including at least: diff --git a/o.apache.tools.ant.module/external/ant-1.7.1-license.txt b/o.apache.tools.ant.module/external/ant-1.8.0-license.txt rename from o.apache.tools.ant.module/external/ant-1.7.1-license.txt rename to o.apache.tools.ant.module/external/ant-1.8.0-license.txt --- a/o.apache.tools.ant.module/external/ant-1.7.1-license.txt +++ b/o.apache.tools.ant.module/external/ant-1.8.0-license.txt @@ -1,9 +1,9 @@ Name: Apache Ant -Version: 1.7.1 -Files: ant-libs-1.7.1.zip ant-misc-1.7.1.zip +Version: 1.8.0 +Files: ant-libs-1.8.0.zip ant-misc-1.8.0.zip Description: Ant build tool. License: Apache-2.0 -Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.7.1-bin.tar.bz2 +Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-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 @@ -8BC60B2248F23D89BE3A4CC43E68A531DC32022B ant-libs-1.7.1.zip -42DD3883B22270B84BBF84CD1CAAB8A820EF53FF ant-misc-1.7.1.zip +B91FAB9535E06A6B853F04C8CBB7ECB8DC892423 ant-libs-1.8.0.zip +DF624446C6C6F4E72547AAA199B90C625A9F380E ant-misc-1.8.0.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.39.0 +spec.version.base=3.40.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.7.1-license.txt +extra.license.files=external/ant-1.8.0-license.txt nbm.executable.files=\ ant/bin/ant,\ ant/bin/antRun,\ diff --git a/o.apache.tools.ant.module/release/ant/patches/ant-42275.diff b/o.apache.tools.ant.module/release/ant/patches/ant-42275.diff deleted file mode 100644 --- a/o.apache.tools.ant.module/release/ant/patches/ant-42275.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: src/main/org/apache/tools/ant/launch/Locator.java -=================================================================== ---- src/main/org/apache/tools/ant/launch/Locator.java (revision 700534) -+++ src/main/org/apache/tools/ant/launch/Locator.java (working copy) -@@ -275,7 +275,8 @@ - path = decodeUri(uri); - String cwd = System.getProperty("user.dir"); - int posi = cwd.indexOf(":"); -- if ((posi > 0) && path.startsWith(File.separator)) { -+ if ((posi > 0) && path.startsWith(File.separator) -+ /* #42275: UNC */ && !path.startsWith("\\\\")) { - path = cwd.substring(0, posi + 1) + path; - } - } catch (UnsupportedEncodingException exc) { diff --git a/o.apache.tools.ant.module/release/ant/patches/ant-42275.jar b/o.apache.tools.ant.module/release/ant/patches/ant-42275.jar deleted file mode 100644 Binary file o.apache.tools.ant.module/release/ant/patches/ant-42275.jar has changed