Skip to content

Commit f842783

Browse files
neilcsmith-netneilcsmith-net
authored
Merge pull request #9335 from neilcsmith-net/ant-1-10-17
Upgrade the bundled Ant version to 1.10.17
2 parents c6c3e08 + 1dd7694 commit f842783

7 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎extide/o.apache.tools.ant.module/arch.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
<li>
315315
<api group="java" name="Ant" type="import" category="third" url="https://ant.apache.org">
316316
Ant itself, of course.
317-
1.8.0+ is required, 1.10.15 recommended (and currently bundled); some features may be limited to newer versions.
317+
1.8.0+ is required, 1.10.17 recommended (and currently bundled); some features may be limited to newer versions.
318318
</api>
319319
</li>
320320
</ol>

‎extide/o.apache.tools.ant.module/build.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@
5454
</target>
5555

5656
<target name="netbeans-extra" depends="jar-bridge">
57-
<unzip src="external/apache-ant-1.10.15-bin.zip" dest="build"/>
57+
<unzip src="external/apache-ant-1.10.17-bin.zip" dest="build"/>
5858
<mkdir dir="${cluster}/ant/lib"/>
5959
<copy todir="${cluster}/ant/lib">
60-
<fileset dir="build/apache-ant-1.10.15/lib" includes="*.jar"/>
60+
<fileset dir="build/apache-ant-1.10.17/lib" includes="*.jar"/>
6161
</copy>
6262
<mkdir dir="${cluster}/ant/bin"/>
6363
<copy todir="${cluster}/ant/bin">
64-
<fileset dir="build/apache-ant-1.10.15/bin"/>
64+
<fileset dir="build/apache-ant-1.10.17/bin"/>
6565
</copy>
6666
<mkdir dir="${cluster}/ant/etc"/>
6767
<copy todir="${cluster}/ant/etc">
68-
<fileset dir="build/apache-ant-1.10.15/etc"/>
68+
<fileset dir="build/apache-ant-1.10.17/etc"/>
6969
</copy>
7070
</target>
7171

@@ -84,7 +84,7 @@
8484
<fileset dir="${cluster}">
8585
<include name="ant/lib/*.jar"/>
8686
</fileset>
87-
<mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.15.jar"/>
87+
<mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.17.jar"/>
8888
</copy>
8989
<copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>
9090
<!-- XXX ought to only do this in case jnlp.sign.jars=true -->

extide/o.apache.tools.ant.module/external/ant-1.10.15-license.txt renamed to extide/o.apache.tools.ant.module/external/ant-1.10.17-license.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Name: Apache Ant
22
Origin: Apache Software Foundation
3-
Version: 1.10.15
4-
Files: apache-ant-1.10.15-bin.zip
3+
Version: 1.10.17
4+
Files: apache-ant-1.10.17-bin.zip
55
Description: Ant build tool.
66
License: Apache-2.0-ant
7-
URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip
7+
URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.17-bin.zip
88

99
/*
1010
* Apache License

extide/o.apache.tools.ant.module/external/ant-1.10.15-notice.txt renamed to extide/o.apache.tools.ant.module/external/ant-1.10.17-notice.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Ant
2-
Copyright 1999-2024 The Apache Software Foundation
2+
Copyright 1999-2026 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).

‎extide/o.apache.tools.ant.module/external/binaries-list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
1B460A543CAF0B2087FEF210C7B4813909901FDC https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip apache-ant-1.10.15-bin.zip
17+
DA43C59186A9AB890C6FDD6967053F64C6907249 https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.17-bin.zip apache-ant-1.10.17-bin.zip

‎extide/o.apache.tools.ant.module/external/build.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@
2424
<mkdir dir="lib"/>
2525
<copy todir="lib">
2626
<fileset dir=".">
27-
<include name="ant-antlr-1.10.15.jar" />
28-
<include name="ant-apache-bcel-1.10.15.jar" />
29-
<include name="ant-apache-bsf-1.10.15.jar" />
30-
<include name="ant-apache-log4j-1.10.15.jar" />
31-
<include name="ant-apache-oro-1.10.15.jar" />
32-
<include name="ant-apache-regexp-1.10.15.jar" />
33-
<include name="ant-apache-resolver-1.10.15.jar" />
34-
<include name="ant-apache-xalan2-1.10.15.jar" />
35-
<include name="ant-commons-logging-1.10.15.jar" />
36-
<include name="ant-commons-net-1.10.15.jar" />
37-
<include name="ant-jai-1.10.15.jar" />
38-
<include name="ant-javamail-1.10.15.jar" />
39-
<include name="ant-jdepend-1.10.15.jar" />
40-
<include name="ant-jmf-1.10.15.jar" />
41-
<include name="ant-jsch-1.10.15.jar" />
42-
<include name="ant-junit-1.10.15.jar" />
43-
<include name="ant-junit4-1.10.15.jar" />
44-
<include name="ant-launcher-1.10.15.jar" />
45-
<include name="ant-netrexx-1.10.15.jar" />
46-
<include name="ant-swing-1.10.15.jar" />
47-
<include name="ant-testutil-1.10.15.jar" />
48-
<include name="ant-xz-1.10.15.jar" />
49-
<include name="ant-1.10.15.jar" />
27+
<include name="ant-antlr-1.10.17.jar" />
28+
<include name="ant-apache-bcel-1.10.17.jar" />
29+
<include name="ant-apache-bsf-1.10.17.jar" />
30+
<include name="ant-apache-log4j-1.10.17.jar" />
31+
<include name="ant-apache-oro-1.10.17.jar" />
32+
<include name="ant-apache-regexp-1.10.17.jar" />
33+
<include name="ant-apache-resolver-1.10.17.jar" />
34+
<include name="ant-apache-xalan2-1.10.17.jar" />
35+
<include name="ant-commons-logging-1.10.17.jar" />
36+
<include name="ant-commons-net-1.10.17.jar" />
37+
<include name="ant-jai-1.10.17.jar" />
38+
<include name="ant-javamail-1.10.17.jar" />
39+
<include name="ant-jdepend-1.10.17.jar" />
40+
<include name="ant-jmf-1.10.17.jar" />
41+
<include name="ant-jsch-1.10.17.jar" />
42+
<include name="ant-junit-1.10.17.jar" />
43+
<include name="ant-junit4-1.10.17.jar" />
44+
<include name="ant-launcher-1.10.17.jar" />
45+
<include name="ant-netrexx-1.10.17.jar" />
46+
<include name="ant-swing-1.10.17.jar" />
47+
<include name="ant-testutil-1.10.17.jar" />
48+
<include name="ant-xz-1.10.17.jar" />
49+
<include name="ant-1.10.17.jar" />
5050
</fileset>
51-
<globmapper from="*-1.10.15.jar" to="*.jar"/>
51+
<globmapper from="*-1.10.17.jar" to="*.jar"/>
5252
</copy>
5353
</target>
5454
<target name="clean">

‎extide/o.apache.tools.ant.module/nbproject/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extra.module.files=\
2626
ant/lib/,\
2727
ant/bin/,\
2828
ant/etc/
29-
extra.license.files=external/ant-1.10.15-license.txt
29+
extra.license.files=external/ant-1.10.17-license.txt
3030
nbm.executable.files=\
3131
ant/bin/ant,\
3232
ant/bin/antRun,\

0 commit comments

Comments
 (0)