Skip to content

Upgrade the bundled Ant version to 1.10.16 #9326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neilcsmith-net wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade the bundled Ant version to 1.10.16 #9326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extide/o.apache.tools.ant.module/arch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
<li>
<api group="java" name="Ant" type="import" category="third" url="https://ant.apache.org">
Ant itself, of course.
1.8.0+ is required, 1.10.15 recommended (and currently bundled); some features may be limited to newer versions.
1.8.0+ is required, 1.10.16 recommended (and currently bundled); some features may be limited to newer versions.
</api>
</li>
</ol>
Expand Down
10 changes: 5 additions & 5 deletions extide/o.apache.tools.ant.module/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@
</target>

<target name="netbeans-extra" depends="jar-bridge">
<unzip src="external/apache-ant-1.10.15-bin.zip" dest="build"/>
<unzip src="external/apache-ant-1.10.16-bin.zip" dest="build"/>
<mkdir dir="${cluster}/ant/lib"/>
<copy todir="${cluster}/ant/lib">
<fileset dir="build/apache-ant-1.10.15/lib" includes="*.jar"/>
<fileset dir="build/apache-ant-1.10.16/lib" includes="*.jar"/>
</copy>
<mkdir dir="${cluster}/ant/bin"/>
<copy todir="${cluster}/ant/bin">
<fileset dir="build/apache-ant-1.10.15/bin"/>
<fileset dir="build/apache-ant-1.10.16/bin"/>
</copy>
<mkdir dir="${cluster}/ant/etc"/>
<copy todir="${cluster}/ant/etc">
<fileset dir="build/apache-ant-1.10.15/etc"/>
<fileset dir="build/apache-ant-1.10.16/etc"/>
</copy>
</target>

Expand All @@ -84,7 +84,7 @@
<fileset dir="${cluster}">
<include name="ant/lib/*.jar"/>
</fileset>
<mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.15.jar"/>
<mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.16.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 -->
Expand Down
6 changes: 3 additions & 3 deletions ...t.module/external/ant-1.10.15-license.txt → ...t.module/external/ant-1.10.16-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Name: Apache Ant
Origin: Apache Software Foundation
Version: 1.10.15
Files: apache-ant-1.10.15-bin.zip
Version: 1.10.16
Files: apache-ant-1.10.16-bin.zip
Description: Ant build tool.
License: Apache-2.0-ant
URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip
URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.16-bin.zip

/*
* Apache License
Expand Down
2 changes: 1 addition & 1 deletion ...nt.module/external/ant-1.10.15-notice.txt → ...nt.module/external/ant-1.10.16-notice.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Ant
Copyright 1999-2024 The Apache Software Foundation
Copyright 1999-2026 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
Expand Down
2 changes: 1 addition & 1 deletion extide/o.apache.tools.ant.module/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
1B460A543CAF0B2087FEF210C7B4813909901FDC https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip apache-ant-1.10.15-bin.zip
9B5A81EF394C1C9BFFABC55AD25147FC41C9F784 https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.16-bin.zip apache-ant-1.10.16-bin.zip
48 changes: 24 additions & 24 deletions extide/o.apache.tools.ant.module/external/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@
<mkdir dir="lib"/>
<copy todir="lib">
<fileset dir=".">
<include name="ant-antlr-1.10.15.jar" />
<include name="ant-apache-bcel-1.10.15.jar" />
<include name="ant-apache-bsf-1.10.15.jar" />
<include name="ant-apache-log4j-1.10.15.jar" />
<include name="ant-apache-oro-1.10.15.jar" />
<include name="ant-apache-regexp-1.10.15.jar" />
<include name="ant-apache-resolver-1.10.15.jar" />
<include name="ant-apache-xalan2-1.10.15.jar" />
<include name="ant-commons-logging-1.10.15.jar" />
<include name="ant-commons-net-1.10.15.jar" />
<include name="ant-jai-1.10.15.jar" />
<include name="ant-javamail-1.10.15.jar" />
<include name="ant-jdepend-1.10.15.jar" />
<include name="ant-jmf-1.10.15.jar" />
<include name="ant-jsch-1.10.15.jar" />
<include name="ant-junit-1.10.15.jar" />
<include name="ant-junit4-1.10.15.jar" />
<include name="ant-launcher-1.10.15.jar" />
<include name="ant-netrexx-1.10.15.jar" />
<include name="ant-swing-1.10.15.jar" />
<include name="ant-testutil-1.10.15.jar" />
<include name="ant-xz-1.10.15.jar" />
<include name="ant-1.10.15.jar" />
<include name="ant-antlr-1.10.16.jar" />
<include name="ant-apache-bcel-1.10.16.jar" />
<include name="ant-apache-bsf-1.10.16.jar" />
<include name="ant-apache-log4j-1.10.16.jar" />
<include name="ant-apache-oro-1.10.16.jar" />
<include name="ant-apache-regexp-1.10.16.jar" />
<include name="ant-apache-resolver-1.10.16.jar" />
<include name="ant-apache-xalan2-1.10.16.jar" />
<include name="ant-commons-logging-1.10.16.jar" />
<include name="ant-commons-net-1.10.16.jar" />
<include name="ant-jai-1.10.16.jar" />
<include name="ant-javamail-1.10.16.jar" />
<include name="ant-jdepend-1.10.16.jar" />
<include name="ant-jmf-1.10.16.jar" />
<include name="ant-jsch-1.10.16.jar" />
<include name="ant-junit-1.10.16.jar" />
<include name="ant-junit4-1.10.16.jar" />
<include name="ant-launcher-1.10.16.jar" />
<include name="ant-netrexx-1.10.16.jar" />
<include name="ant-swing-1.10.16.jar" />
<include name="ant-testutil-1.10.16.jar" />
<include name="ant-xz-1.10.16.jar" />
<include name="ant-1.10.16.jar" />
Comment on lines -27 to +49
Copy link
Copy Markdown
Member

@mbien mbien Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ant-imageio.jar, ant-jakartamail.jar and ant-junitlauncher.jar are not listed here

Copy link
Copy Markdown
Member Author

@neilcsmith-net neilcsmith-net Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we use this file for anything?! Checking NB29, those JARs are included in extide/ant. Seems we might have a bunch of legacy things related to bundling Ant that we no longer use?

Copy link
Copy Markdown
Member

@mbien mbien Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't really know. just saw that the image jar is new since 1.10.15, so I thought i mention it.

</fileset>
<globmapper from="*-1.10.15.jar" to="*.jar"/>
<globmapper from="*-1.10.16.jar" to="*.jar"/>
</copy>
</target>
<target name="clean">
Expand Down
2 changes: 1 addition & 1 deletion extide/o.apache.tools.ant.module/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extra.module.files=\
ant/lib/,\
ant/bin/,\
ant/etc/
extra.license.files=external/ant-1.10.15-license.txt
extra.license.files=external/ant-1.10.16-license.txt
nbm.executable.files=\
ant/bin/ant,\
ant/bin/antRun,\
Expand Down
Loading