This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Currently bundling Ant 1.6.0; 1.6.1 includes various fixes, noted here: http://www.apache.org/dist/ant/RELEASE-NOTES-1.6.1.html Also not noted but fixed in 1.6.1, a potentially serious I18N bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=26642
Want to try for 3.6.
Still intend to get this in if approval comes.
Created attachment 13805 [details] Trunk patch
David could I ask you for a review of the attached patch?
QA: no special considerations. Commit validation passes and so does Ant functional tests. The patch does not change integration code; only the bundled version of Ant (which the user can change for him/herself as well); I have personally been running Ant 1.6.1 from NB for a while and have not noticed any issues with it.
Fixed in the trunk: Checking in ant/build.xml; /cvs/ant/build.xml,v <-- build.xml new revision: 1.88; previous revision: 1.87 done Checking in ant/manifest.mf; /cvs/ant/manifest.mf,v <-- manifest.mf new revision: 1.65; previous revision: 1.64 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/docs/build.xml; /cvs/ant/docs/build.xml,v <-- build.xml new revision: 1.12; previous revision: 1.11 done Checking in ant/docs/manifest.mf; /cvs/ant/docs/manifest.mf,v <-- manifest.mf new revision: 1.8; previous revision: 1.7 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs; /cvs/ant/docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs,v <-- HelpSet.hs new revision: 1.4; previous revision: 1.3 done Checking in ant/docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm; /cvs/ant/docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm,v <-- Map.jhm new revision: 1.6; previous revision: 1.5 done Checking in ant/docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc; /cvs/ant/docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc,v <-- TOC.toc new revision: 1.5; previous revision: 1.4 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Removing ant/docs/release/system/ParserDB/ant-1.6.0.jcb; /cvs/ant/docs/release/system/ParserDB/ant-1.6.0.jcb,v <-- ant-1.6.0.jcb new revision: delete; previous revision: 1.2 done Removing ant/docs/release/system/ParserDB/ant-1.6.0.jcs; /cvs/ant/docs/release/system/ParserDB/ant-1.6.0.jcs,v <-- ant-1.6.0.jcs new revision: delete; previous revision: 1.2 done RCS file: /cvs/ant/docs/release/system/ParserDB/ant-1.6.1.jcb,v done Checking in ant/docs/release/system/ParserDB/ant-1.6.1.jcb; /cvs/ant/docs/release/system/ParserDB/ant-1.6.1.jcb,v <-- ant-1.6.1.jcb initial revision: 1.1 done RCS file: /cvs/ant/docs/release/system/ParserDB/ant-1.6.1.jcs,v done Checking in ant/docs/release/system/ParserDB/ant-1.6.1.jcs; /cvs/ant/docs/release/system/ParserDB/ant-1.6.1.jcs,v <-- ant-1.6.1.jcs initial revision: 1.1 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/docs/src/org/apache/tools/ant/module/docs/Bundle.properties; /cvs/ant/docs/src/org/apache/tools/ant/module/docs/Bundle.properties,v <-- Bundle.properties new revision: 1.7; previous revision: 1.6 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/external/.cvsignore; /cvs/ant/external/.cvsignore,v <-- .cvsignore new revision: 1.7; previous revision: 1.6 done Removing ant/external/ant-api-1.6.0.zip.scrambled; /cvs/ant/external/ant-api-1.6.0.zip.scrambled,v <-- ant-api-1.6.0.zip.scrambled new revision: delete; previous revision: 1.2 done RCS file: /cvs/ant/external/ant-api-1.6.1.zip.scrambled,v done Checking in ant/external/ant-api-1.6.1.zip.scrambled; /cvs/ant/external/ant-api-1.6.1.zip.scrambled,v <-- ant-api-1.6.1.zip.scrambled initial revision: 1.1 done Removing ant/external/ant-docs-1.6.0.zip.scrambled; /cvs/ant/external/ant-docs-1.6.0.zip.scrambled,v <-- ant-docs-1.6.0.zip.scrambled new revision: delete; previous revision: 1.2 done RCS file: /cvs/ant/external/ant-docs-1.6.1.zip.scrambled,v done Checking in ant/external/ant-docs-1.6.1.zip.scrambled; /cvs/ant/external/ant-docs-1.6.1.zip.scrambled,v <-- ant-docs-1.6.1.zip.scrambled initial revision: 1.1 done Removing ant/external/ant-libs-1.6.0.zip.scrambled; /cvs/ant/external/ant-libs-1.6.0.zip.scrambled,v <-- ant-libs-1.6.0.zip.scrambled new revision: delete; previous revision: 1.2 done RCS file: /cvs/ant/external/ant-libs-1.6.1.zip.scrambled,v done Checking in ant/external/ant-libs-1.6.1.zip.scrambled; /cvs/ant/external/ant-libs-1.6.1.zip.scrambled,v <-- ant-libs-1.6.1.zip.scrambled initial revision: 1.1 done Checking in ant/external/build.xml; /cvs/ant/external/build.xml,v <-- build.xml new revision: 1.6; previous revision: 1.5 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) RCS file: /cvs/nbbuild/external/apache-license-2.0.txt,v done Checking in nbbuild/external/apache-license-2.0.txt; /cvs/nbbuild/external/apache-license-2.0.txt,v <-- apache-license-2.0.txt initial revision: 1.1 done Processing log script arguments... Mailing the commit message to cvs@nbbuild.netbeans.org (from jglick@netbeans.org) Checking in usersguide/javahelp/org/netbeans/modules/usersguide/ant/createtask.html; /cvs/usersguide/javahelp/org/netbeans/modules/usersguide/ant/createtask.html,v <-- createtask.html new revision: 1.16; previous revision: 1.15 done Checking in usersguide/javahelp/org/netbeans/modules/usersguide/ant/input_handler.html; /cvs/usersguide/javahelp/org/netbeans/modules/usersguide/ant/input_handler.html,v <-- input_handler.html new revision: 1.10; previous revision: 1.9 done Checking in usersguide/javahelp/org/netbeans/modules/usersguide/ant/version.html; /cvs/usersguide/javahelp/org/netbeans/modules/usersguide/ant/version.html,v <-- version.html new revision: 1.6; previous revision: 1.5 done Processing log script arguments... Mailing the commit message to cvs@usersguide.netbeans.org (from jglick@netbeans.org)
Patch reviewed and looks OK and save. Apart from new Ant binaries the patch mostly changes "1.6.0" string to "1.6.1", extends help to cover new tasks and that's basically all. There is new licence but there is also new LFI for binaries so I guess it was approved.
We still need approved NetBeans IDE license change (as it's part of standard distribution). I expect to get it by today. Then we will need to update the licenses exposed at web download page and in the installer. We shouldn't include it in any daily build before this will happen.
don't understand, Jesse got approval already and the new jars have been integrated into the CVS trunk. Dan, do you want to ask RE to stop publishing the dev build?
Dan - note that I specifically waited to commit this to the trunk until after yesterday's dev build had been checked out so it would not go into yesterday's build. You said the download licenses etc. would be prepared today, so please update them - you have about 4.5 hours as of now. BTW, on a tangent - quite some time ago I suggested that all non-SPL components of a NB *binary* build be scrambled the same way that they already are in sources. This would mean that there would be no need for special license support in either the installer or in the web download page, and the master merged license would always be automatically in synch with the contents of the build. That system would avoid this sort of problem.
I hope we can update the license today before the build starts (19:00 GMT). Regarding the scrambled binaries proposal, this sounds good, but I'm not sure if this solves all legal aspects. I'll ask lawyer.
QA, any objections?
QA don't see any troubles. I remember, I set Ant Home property to Ant 1.6.1 directory (not integrated to NetBeans) in previous dev builds and everything worked smoothly.
OK, so I will put this into release36 today, possibly in time for the daily build - Dan take note.
Done. Checking in ant/build.xml; /cvs/ant/build.xml,v <-- build.xml new revision: 1.87.4.1; previous revision: 1.87 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/docs/build.xml; /cvs/ant/docs/build.xml,v <-- build.xml new revision: 1.11.10.1; previous revision: 1.11 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs; /cvs/ant/docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs,v <-- HelpSet.hs new revision: 1.3.10.1; previous revision: 1.3 done Checking in ant/docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm; /cvs/ant/docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm,v <-- Map.jhm new revision: 1.5.10.1; previous revision: 1.5 done Checking in ant/docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc; /cvs/ant/docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc,v <-- TOC.toc new revision: 1.4.10.1; previous revision: 1.4 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Removing ant/docs/release/system/ParserDB/ant-1.6.0.jcb; /cvs/ant/docs/release/system/ParserDB/Attic/ant-1.6.0.jcb,v <-- ant-1.6.0.jcb new revision: delete; previous revision: 1.2.12 done Removing ant/docs/release/system/ParserDB/ant-1.6.0.jcs; /cvs/ant/docs/release/system/ParserDB/Attic/ant-1.6.0.jcs,v <-- ant-1.6.0.jcs new revision: delete; previous revision: 1.2.12 done Checking in ant/docs/release/system/ParserDB/ant-1.6.1.jcb; /cvs/ant/docs/release/system/ParserDB/ant-1.6.1.jcb,v <-- ant-1.6.1.jcb new revision: 1.1.2.1; previous revision: 1.1 done Checking in ant/docs/release/system/ParserDB/ant-1.6.1.jcs; /cvs/ant/docs/release/system/ParserDB/ant-1.6.1.jcs,v <-- ant-1.6.1.jcs new revision: 1.1.2.1; previous revision: 1.1 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/docs/src/org/apache/tools/ant/module/docs/Bundle.properties; /cvs/ant/docs/src/org/apache/tools/ant/module/docs/Bundle.properties,v <-- Bundle.properties new revision: 1.6.4.1; previous revision: 1.6 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in ant/external/.cvsignore; /cvs/ant/external/.cvsignore,v <-- .cvsignore new revision: 1.6.10.1; previous revision: 1.6 done Removing ant/external/ant-api-1.6.0.zip.scrambled; /cvs/ant/external/Attic/ant-api-1.6.0.zip.scrambled,v <-- ant-api-1.6.0.zip.scrambled new revision: delete; previous revision: 1.2.12 done Checking in ant/external/ant-api-1.6.1.zip.scrambled; /cvs/ant/external/ant-api-1.6.1.zip.scrambled,v <-- ant-api-1.6.1.zip.scrambled new revision: 1.1.2.1; previous revision: 1.1 done Removing ant/external/ant-docs-1.6.0.zip.scrambled; /cvs/ant/external/Attic/ant-docs-1.6.0.zip.scrambled,v <-- ant-docs-1.6.0.zip.scrambled new revision: delete; previous revision: 1.2.12 done Checking in ant/external/ant-docs-1.6.1.zip.scrambled; /cvs/ant/external/ant-docs-1.6.1.zip.scrambled,v <-- ant-docs-1.6.1.zip.scrambled new revision: 1.1.2.1; previous revision: 1.1 done Removing ant/external/ant-libs-1.6.0.zip.scrambled; /cvs/ant/external/Attic/ant-libs-1.6.0.zip.scrambled,v <-- ant-libs-1.6.0.zip.scrambled new revision: delete; previous revision: 1.2.12 done Checking in ant/external/ant-libs-1.6.1.zip.scrambled; /cvs/ant/external/ant-libs-1.6.1.zip.scrambled,v <-- ant-libs-1.6.1.zip.scrambled new revision: 1.1.2.1; previous revision: 1.1 done Checking in ant/external/build.xml; /cvs/ant/external/build.xml,v <-- build.xml new revision: 1.5.10.1; previous revision: 1.5 done Processing log script arguments... Mailing the commit message to cvs@ant.netbeans.org (from jglick@netbeans.org) Checking in nbbuild/external/apache-license-2.0.txt; /cvs/nbbuild/external/apache-license-2.0.txt,v <-- apache-license-2.0.txt new revision: 1.1.2.1; previous revision: 1.1 done Processing log script arguments... Mailing the commit message to cvs@nbbuild.netbeans.org (from jglick@netbeans.org) Checking in usersguide/javahelp/org/netbeans/modules/usersguide/ant/createtask.html; /cvs/usersguide/javahelp/org/netbeans/modules/usersguide/ant/createtask.html,v <-- createtask.html new revision: 1.15.2.1; previous revision: 1.15 done Checking in usersguide/javahelp/org/netbeans/modules/usersguide/ant/input_handler.html; /cvs/usersguide/javahelp/org/netbeans/modules/usersguide/ant/input_handler.html,v <-- input_handler.html new revision: 1.9.2.1; previous revision: 1.9 done Checking in usersguide/javahelp/org/netbeans/modules/usersguide/ant/version.html; /cvs/usersguide/javahelp/org/netbeans/modules/usersguide/ant/version.html,v <-- version.html new revision: 1.5.2.1; previous revision: 1.5 done Processing log script arguments... Mailing the commit message to cvs@usersguide.netbeans.org (from jglick@netbeans.org)
I was trying to catch Ruda to update the 36 release license last Friday, but without success. I talked with him however today, so today's build will be Ok. Next time we should probably add Ruda to CC on issues requiring NetBeans license update.