Attachment #93926 for bug #179463

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.

View | Details | Raw Unified | Return to bug 179463
Collapse All | Expand All

Lines 29-35 Link Here

(-)a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_intro.html (-1 / +1 lines)
29	<param name="textColor" value="blue">	29	<param name="textColor" value="blue">
30	</object>	30	</object>
31	<h3>Using Ant with the IDE</h3>	31	<h3>Using Ant with the IDE</h3>
32	<p>The IDE's project system is built directly on top of Ant version 1.7.1. All	32	<p>The IDE's project system is built directly on top of Ant version 1.8.0. All
33	of the project commands, like Build Project or Run File in Debugger, call	33	of the project commands, like Build Project or Run File in Debugger, call
34	targets in the project's Ant script. You can therefore build and run your	34	targets in the project's Ant script. You can therefore build and run your
35	project outside the IDE exactly as it is built and run inside the IDE.	35	project outside the IDE exactly as it is built and run inside the IDE.

Lines 10-16 Link Here

(-)a/java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/ant_version.html (-1 / +1 lines)
10	<body>	10	<body>
11	<h2>Switching Ant Versions</h2>	11	<h2>Switching Ant Versions</h2>
12	<p> <small><a href="#seealso">See Also</a></small>	12	<p> <small><a href="#seealso">See Also</a></small>
13	<p>The IDE comes bundled with Ant version 1.7.1 and uses this installation to	13	<p>The IDE comes bundled with Ant version 1.8.0 and uses this installation to
14	run Ant scripts. You can change the version of Ant that the IDE uses by switching	14	run Ant scripts. You can change the version of Ant that the IDE uses by switching
15	the Ant installation directory in Ant Settings. You can only switch between	15	the Ant installation directory in Ant Settings. You can only switch between
16	versions 1.5.3 and higher of Ant.</p>	16	versions 1.5.3 and higher of Ant.</p>

Lines 43-49 Link Here

(-)a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-debug-snippet.xml (-1 / +1 lines)
43	<project name="{0} (debug-test)" default="debug-test" basedir=".">	43	<project name="{0} (debug-test)" default="debug-test" basedir=".">
44	<target name="-check-run-test-single-method-supported" if="methodname">	44	<target name="-check-run-test-single-method-supported" if="methodname">
45	<available property="run.test.single.method.supported"	45	<available property="run.test.single.method.supported"
46	classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultParser"/>	46	resource="org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.class"/>
47	<fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>	47	<fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>
48	</target>	48	</target>
49	<target name="-init-debug-args">	49	<target name="-init-debug-args">

Lines 43-49 Link Here

(-)a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-snippet.xml (-1 / +1 lines)
43	<project name="{0} (test)" default="test" basedir=".">	43	<project name="{0} (test)" default="test" basedir=".">
44	<target name="-check-run-test-single-method-supported" if="methodname">	44	<target name="-check-run-test-single-method-supported" if="methodname">
45	<available property="run.test.single.method.supported"	45	<available property="run.test.single.method.supported"
46	classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultParser"/>	46	resource="org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.class"/>
47	<fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>	47	<fail unless="run.test.single.method.supported">Execution of a single test method is not supported by this version of Ant.</fail>
48	</target>	48	</target>
49	<target name="-prepare-execution">	49	<target name="-prepare-execution">

Lines 1-4 Link Here

(-)a/junit/external/binaries-list (-1 / +1 lines)
1	BB3C83B2B3297EA0704D5249FAC60766272E8DE6 Ant-1.7.1-binary-patch-72080.jar	1	F9560E8F1187FD4471716E16B09B555506C9B361 Ant-1.8.0-binary-patch-72080.jar
2	0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069 junit-3.8.2-api.zip	2	0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069 junit-3.8.2-api.zip
3	07E4CDE26B53A9A0E3FE5B00D1DBBC7CC1D46060 junit-3.8.2.jar	3	07E4CDE26B53A9A0E3FE5B00D1DBBC7CC1D46060 junit-3.8.2.jar
4	8ED9640AE7E6C72E57D23DCF204637FA563C18B3 junit-4.5-api.zip	4	8ED9640AE7E6C72E57D23DCF204637FA563C18B3 junit-4.5-api.zip

Lines 46-52 Link Here

(-)a/junit/nbproject/project.properties (-1 / +1 lines)
46	release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip	46	release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
47	release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip	47	release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip
48	release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar	48	release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar
49	release.external/Ant-1.7.1-binary-patch-72080.jar=ant/patches/72080.jar	49	release.external/Ant-1.8.0-binary-patch-72080.jar=ant/patches/72080.jar
50		50
51	# XXX AntBridge.createMainClassPath probably would not find this anyway:	51	# XXX AntBridge.createMainClassPath probably would not find this anyway:
52	jnlp.verify.excludes=ant/patches/72080.jar	52	jnlp.verify.excludes=ant/patches/72080.jar

Lines 153-159 Link Here

(-)a/o.apache.tools.ant.module.docs/antsrc/MakeManual.java (-1 / +1 lines)
153	id += "." + anchor;	153	id += "." + anchor;
154	}	154	}
155	}	155	}
156	String title = linktext != null ? linktext : "Ant 1.7.1 Manual";	156	String title = linktext != null ? linktext : "Ant 1.8.0 Manual";
157	String log = "";	157	String log = "";
158	for (int i = 0; i < depth; i++) {	158	for (int i = 0; i < depth; i++) {
159	log += "\t";	159	log += "\t";

Lines 1-9 Link Here

(-)a/o.apache.tools.ant.module.docs/external/ant-1.7.1-license.txt (-3 / +3 lines)
1	Name: Apache Ant	1	Name: Apache Ant
2	Version: 1.7.1	2	Version: 1.8.0
3	Files: ant-docs-1.7.1.zip	3	Files: ant-docs-1.8.0.zip
4	Description: Ant build tool.	4	Description: Ant build tool.
5	License: Apache-2.0	5	License: Apache-2.0
6	Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.7.1-bin.tar.bz2	6	Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2
7		7
8	Apache License	8	Apache License
9	Version 2.0, January 2004	9	Version 2.0, January 2004

Line 1 Link Here

(-)a/o.apache.tools.ant.module.docs/external/binaries-list (-1 / +1 lines)
1	72568FA6EAB43FA7CFDE5013EB6ED486D29DF6AC ant-docs-1.7.1.zip	1	3EB5B5AC3ED2625F6FF4C32A6C5B06EAB31BB5CA ant-docs-1.8.0.zip

Lines 1-7 Link Here

(-)a/o.apache.tools.ant.module.docs/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.apache.tools.ant.module.docs	2	OpenIDE-Module: org.apache.tools.ant.module.docs
3	OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/docs/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/docs/Bundle.properties
4	OpenIDE-Module-Specification-Version: 2.23	4	OpenIDE-Module-Specification-Version: 2.24
5	OpenIDE-Module-Layer: org/apache/tools/ant/module/docs/layer.xml	5	OpenIDE-Module-Layer: org/apache/tools/ant/module/docs/layer.xml
6	OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help	6	OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
7		7

Lines 41-44 Link Here

(-)a/o.apache.tools.ant.module.docs/nbproject/project.properties (-1 / +1 lines)
41	javahelp.base=org/apache/tools/ant/module/docs	41	javahelp.base=org/apache/tools/ant/module/docs
42	javahelp.hs=HelpSet.hs	42	javahelp.hs=HelpSet.hs
43	ant.cp=${ant.core.lib}:../javahelp/external/jh-2.0_05.jar	43	ant.cp=${ant.core.lib}:../javahelp/external/jh-2.0_05.jar
44	extra.license.files=external/ant-1.7.1-license.txt	44	extra.license.files=external/ant-1.8.0-license.txt

Lines 37-43 Link Here

(-)a/o.apache.tools.ant.module.docs/src/org/apache/tools/ant/module/docs/Bundle.properties (-1 / +1 lines)
37	# Version 2 license, then the option applies only if the new code is	37	# Version 2 license, then the option applies only if the new code is
38	# made subject to such option by the copyright holder.	38	# made subject to such option by the copyright holder.
39		39
40	OpenIDE-Module-Name=Ant 1.7.1 Documentation	40	OpenIDE-Module-Name=Ant 1.8.0 Documentation
41	OpenIDE-Module-Display-Category=Java	41	OpenIDE-Module-Display-Category=Java
42	OpenIDE-Module-Short-Description=Documentation for the Ant build tool.	42	OpenIDE-Module-Short-Description=Documentation for the Ant build tool.
43	OpenIDE-Module-Long-Description=\	43	OpenIDE-Module-Long-Description=\

Lines 335-341 Link Here

(-)a/o.apache.tools.ant.module/arch.xml (-1 / +1 lines)
335	<li>	335	<li>
336	<api group="java" name="Ant" type="import" category="third" url="http://ant.apache.org/">	336	<api group="java" name="Ant" type="import" category="third" url="http://ant.apache.org/">
337	Ant itself, of course.	337	Ant itself, of course.
338	1.5.3+ is required, 1.7.1 recommended (and currently bundled); some features may be limited to newer versions.	338	1.5.3+ is required, 1.8.0 recommended (and currently bundled); some features may be limited to newer versions.
339	</api>	339	</api>
340	</li>	340	</li>
341	</ol>	341	</ol>




            <fileset dir="${cluster}">
                <include name="ant/lib/*.jar"/>
            </fileset>
            <mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.8.0.jar"/>
        </copy>
        <copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>
        <!-- XXX ought to only do this in case jnlp.sign.jars=true -->

    - arch.xml
    - external/build.xml
    and rename external/ant-*-license.txt (and update the version numbers mentioned in it)
    and fix external/binaries-list
    (last two steps also in ${ant-docs}/external)
5a. Rebuild junit/external/Ant-*-binary-patch-72080.jar if not yet applied upstream.
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 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:
    ant -f ${here}/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean netbeans test-unit
    ant -f ${ant-docs}/build.xml clean netbeans
    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
    mentioning that the bundled version in NB is now ${release.version}.

Lines 1-9 Link Here

(-)a/o.apache.tools.ant.module/external/ant-1.7.1-license.txt (-3 / +3 lines)
1	Name: Apache Ant	1	Name: Apache Ant
2	Version: 1.7.1	2	Version: 1.8.0
3	Files: ant-libs-1.7.1.zip ant-misc-1.7.1.zip	3	Files: ant-libs-1.8.0.zip ant-misc-1.8.0.zip
4	Description: Ant build tool.	4	Description: Ant build tool.
5	License: Apache-2.0	5	License: Apache-2.0
6	Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.7.1-bin.tar.bz2	6	Origin: http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2
7	OSR: 7102	7	OSR: 7102
8		8
9	Apache License	9	Apache License

Lines 1-2 Link Here

(-)a/o.apache.tools.ant.module/external/binaries-list (-2 / +2 lines)
1	8BC60B2248F23D89BE3A4CC43E68A531DC32022B ant-libs-1.7.1.zip	1	B91FAB9535E06A6B853F04C8CBB7ECB8DC892423 ant-libs-1.8.0.zip
2	42DD3883B22270B84BBF84CD1CAAB8A820EF53FF ant-misc-1.7.1.zip	2	DF624446C6C6F4E72547AAA199B90C625A9F380E ant-misc-1.8.0.zip

Lines 42-48 Link Here

(-)a/o.apache.tools.ant.module/external/build.xml (-1 / +1 lines)
42	-->	42	-->
43	<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">	43	<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
44	<target name="unzip">	44	<target name="unzip">
45	<unzip src="ant-libs-1.7.1.zip" dest="lib"/>	45	<unzip src="ant-libs-1.8.0.zip" dest="lib"/>
46	</target>	46	</target>
47	<target name="clean">	47	<target name="clean">
48	<delete dir="lib"/>	48	<delete dir="lib"/>

Lines 39-45 Link Here

(-)a/o.apache.tools.ant.module/nbproject/project.properties (-2 / +2 lines)
39		39
40	javac.compilerargs=-Xlint:unchecked	40	javac.compilerargs=-Xlint:unchecked
41	javac.source=1.6	41	javac.source=1.6
42	spec.version.base=3.39.0	42	spec.version.base=3.40.0
43	compile.ant.jar=${ant.core.lib}	43	compile.ant.jar=${ant.core.lib}
44	src-bridge.cp.extra=build/classes:${compile.ant.jar}	44	src-bridge.cp.extra=build/classes:${compile.ant.jar}
45	extra.module.files=\	45	extra.module.files=\
Lines 47-53 Link Here
47	ant/lib/,\	47	ant/lib/,\
48	ant/bin/,\	48	ant/bin/,\
49	ant/etc/	49	ant/etc/
50	extra.license.files=external/ant-1.7.1-license.txt	50	extra.license.files=external/ant-1.8.0-license.txt
51	nbm.executable.files=\	51	nbm.executable.files=\
52	ant/bin/ant,\	52	ant/bin/ant,\
53	ant/bin/antRun,\	53	ant/bin/antRun,\

Lines 1-14 Link Here

(-)a/o.apache.tools.ant.module/release/ant/patches/ant-42275.diff (-2 lines)
1	Index: src/main/org/apache/tools/ant/launch/Locator.java
2	===================================================================

Return to bug 179463

Lines 107-113 Link Here

(-)a/o.apache.tools.ant.module/build.xml (-3 / +5 lines)
107	<fileset dir="${cluster}">	107	<fileset dir="${cluster}">
108	<include name="ant/lib/*.jar"/>	108	<include name="ant/lib/*.jar"/>
109	</fileset>	109	</fileset>
110	<mapper type="glob" from="ant${file.separator}lib${file.separator}.jar" to="apache--1.7.1.jar"/>	110	<mapper type="glob" from="ant${file.separator}lib${file.separator}.jar" to="apache--1.8.0.jar"/>
111	</copy>	111	</copy>
112	<copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>	112	<copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>
113	<!-- XXX ought to only do this in case jnlp.sign.jars=true -->	113	<!-- XXX ought to only do this in case jnlp.sign.jars=true -->
Lines 204-220 Link Here
204	- arch.xml	204	- arch.xml
205	- external/build.xml	205	- external/build.xml
206	and rename external/ant-*-license.txt (and update the version numbers mentioned in it)	206	and rename external/ant-*-license.txt (and update the version numbers mentioned in it)
207	and hg rm the old .zip files and hg add the new ones	207	and fix external/binaries-list
208	(last two steps also in ${ant-docs}/external)	208	(last two steps also in ${ant-docs}/external)
		209	5a. Rebuild junit/external/Ant-*-binary-patch-72080.jar if not yet applied upstream.
209	6. Run: ant -f ${ant-docs}/build.xml preview-javahelp	210	6. Run: ant -f ${ant-docs}/build.xml preview-javahelp
210	You can ignore links to api/org/apache/... which will be broken, as well as a few other things.	211	You can ignore links to api/org/apache/... which will be broken, as well as a few other things.
211	But for real problems in the HTML, commit fixes to ${ant-docs}/manual/ in the ant.apache.org SVN trunk.	212	But for real problems in the HTML, commit fixes to docs/manual/ in the ant.apache.org SVN trunk.
212	Sanity-check the helpset and adjust ${ant-docs}/antsrc/MakeManual.java as needed.	213	Sanity-check the helpset and adjust ${ant-docs}/antsrc/MakeManual.java as needed.
213	7. Increase spec versions in nbproject/project.properties and ${ant-docs}/manifest.mf.	214	7. Increase spec versions in nbproject/project.properties and ${ant-docs}/manifest.mf.
214	8. Test everything, including at least:	215	8. Test everything, including at least:
215	ant -f ${here}/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean netbeans test-unit	216	ant -f ${here}/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean netbeans test-unit
216	ant -f ${ant-docs}/build.xml clean netbeans	217	ant -f ${ant-docs}/build.xml clean netbeans
217	ant -f ${here}/../java.project/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit	218	ant -f ${here}/../java.project/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit
		219	ant -f ${here}/../java.j2seproject/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit
218	ant -f ${here}/../build.xml commit-validation	220	ant -f ${here}/../build.xml commit-validation
219	9. Submit a patch for https://svn.apache.org/repos/asf/ant/core/trunk/xdocs/external.xml	221	9. Submit a patch for https://svn.apache.org/repos/asf/ant/core/trunk/xdocs/external.xml
220	mentioning that the bundled version in NB is now ${release.version}.	222	mentioning that the bundled version in NB is now ${release.version}.