You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2020/09/06 20:00:24 UTC
[netbeans] branch master updated: [NETBEANS-4694] Upgraded Ant to
1.10.8
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new fb20750 [NETBEANS-4694] Upgraded Ant to 1.10.8
fb20750 is described below
commit fb20750a44d488800e8667a9383b1cd7980617c6
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Fri Aug 14 23:13:37 2020 -0700
[NETBEANS-4694] Upgraded Ant to 1.10.8
---
extide/o.apache.tools.ant.module/arch.xml | 2 +-
extide/o.apache.tools.ant.module/build.xml | 2 +-
...t-1.10.4-license.txt => ant-1.10.8-license.txt} | 4 +-
...ant-1.10.4-notice.txt => ant-1.10.8-notice.txt} | 0
.../external/binaries-list | 48 +++++++++++-----------
.../o.apache.tools.ant.module/external/build.xml | 48 +++++++++++-----------
.../nbproject/project.properties | 2 +-
7 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/extide/o.apache.tools.ant.module/arch.xml b/extide/o.apache.tools.ant.module/arch.xml
index 78ae556..aeb1ee0 100644
--- a/extide/o.apache.tools.ant.module/arch.xml
+++ b/extide/o.apache.tools.ant.module/arch.xml
@@ -314,7 +314,7 @@
<li>
<api group="java" name="Ant" type="import" category="third" url="http://ant.apache.org/">
Ant itself, of course.
- 1.8.0+ is required, 1.10.4 recommended (and currently bundled); some features may be limited to newer versions.
+ 1.8.0+ is required, 1.10.8 recommended (and currently bundled); some features may be limited to newer versions.
</api>
</li>
</ol>
diff --git a/extide/o.apache.tools.ant.module/build.xml b/extide/o.apache.tools.ant.module/build.xml
index bd8f14a..0972a06 100644
--- a/extide/o.apache.tools.ant.module/build.xml
+++ b/extide/o.apache.tools.ant.module/build.xml
@@ -80,7 +80,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.4.jar"/>
+ <mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.8.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 -->
diff --git a/extide/o.apache.tools.ant.module/external/ant-1.10.4-license.txt b/extide/o.apache.tools.ant.module/external/ant-1.10.8-license.txt
similarity index 96%
rename from extide/o.apache.tools.ant.module/external/ant-1.10.4-license.txt
rename to extide/o.apache.tools.ant.module/external/ant-1.10.8-license.txt
index 4522336..c10bce9 100644
--- a/extide/o.apache.tools.ant.module/external/ant-1.10.4-license.txt
+++ b/extide/o.apache.tools.ant.module/external/ant-1.10.8-license.txt
@@ -1,7 +1,7 @@
Name: Apache Ant
Origin: Apache Software Foundation
-Version: 1.10.4
-Files: ant-misc-1.10.4.zip ant-1.10.4.jar ant-antlr-1.10.4.jar ant-apache-bcel-1.10.4.jar ant-apache-bsf-1.10.4.jar ant-apache-log4j-1.10.4.jar ant-apache-oro-1.10.4.jar ant-apache-regexp-1.10.4.jar ant-apache-resolver-1.10.4.jar ant-apache-xalan2-1.10.4.jar ant-commons-logging-1.10.4.jar ant-commons-net-1.10.4.jar ant-jai-1.10.4.jar ant-javamail-1.10.4.jar ant-jdepend-1.10.4.jar ant-jmf-1.10.4.jar ant-jsch-1.10.4.jar ant-junit-1.10.4.jar ant-junit4-1.10.4.jar ant-launcher-1.10.4.jar ant [...]
+Version: 1.10.8
+Files: ant-misc-1.10.8.zip ant-1.10.8.jar ant-antlr-1.10.8.jar ant-apache-bcel-1.10.8.jar ant-apache-bsf-1.10.8.jar ant-apache-log4j-1.10.8.jar ant-apache-oro-1.10.8.jar ant-apache-regexp-1.10.8.jar ant-apache-resolver-1.10.8.jar ant-apache-xalan2-1.10.8.jar ant-commons-logging-1.10.8.jar ant-commons-net-1.10.8.jar ant-jai-1.10.8.jar ant-javamail-1.10.8.jar ant-jdepend-1.10.8.jar ant-jmf-1.10.8.jar ant-jsch-1.10.8.jar ant-junit-1.10.8.jar ant-junit4-1.10.8.jar ant-launcher-1.10.8.jar ant [...]
Description: Ant build tool.
License: Apache-2.0-ant
URL: https://builds.apache.org/view/All/job/Ant_Nightly/lastBuild/
diff --git a/extide/o.apache.tools.ant.module/external/ant-1.10.4-notice.txt b/extide/o.apache.tools.ant.module/external/ant-1.10.8-notice.txt
similarity index 100%
rename from extide/o.apache.tools.ant.module/external/ant-1.10.4-notice.txt
rename to extide/o.apache.tools.ant.module/external/ant-1.10.8-notice.txt
diff --git a/extide/o.apache.tools.ant.module/external/binaries-list b/extide/o.apache.tools.ant.module/external/binaries-list
index 1dfe08e..2a6b885 100644
--- a/extide/o.apache.tools.ant.module/external/binaries-list
+++ b/extide/o.apache.tools.ant.module/external/binaries-list
@@ -14,27 +14,27 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-D6330851B59C33A3A8D98C86FF438F23DD3B4267 ant-misc-1.10.4.zip
-A164A1EF47F15ECDF4F986B23694D000237429EF org.apache.ant:ant:1.10.4
-550AAA1B4671A51B89A5C3DB32B5B42E8EE616FF org.apache.ant:ant-antlr:1.10.4
-1E95DA3613FC33F984A6664FD172310C705DEFBC org.apache.ant:ant-apache-bcel:1.10.4
-92F42F81CFE1EC4348A0BABC9EEF55C2E14D388B org.apache.ant:ant-apache-bsf:1.10.4
-4564B1E9502EE401EE43E98FC7EEAFF8F8741F95 org.apache.ant:ant-apache-log4j:1.10.4
-DE1E5CB6A930CF81933411858C7505717D3E1D28 org.apache.ant:ant-apache-oro:1.10.4
-D6061456B239C9D56204C3204F5CCE5F64455690 org.apache.ant:ant-apache-regexp:1.10.4
-EA3B8355696331C03301B3EB0EF77A65857BE502 org.apache.ant:ant-apache-resolver:1.10.4
-0A93369AE0CAE7E76EEF9F24CD157881CA051943 org.apache.ant:ant-apache-xalan2:1.10.4
-FA9B661B31F3232DE77E5685B5CEA7ED7ABD8754 org.apache.ant:ant-commons-logging:1.10.4
-2161D22EABD78425A58B637B1E1D770B26111C64 org.apache.ant:ant-commons-net:1.10.4
-32BBAD05AC034DC2AA40B81170227BA3028BD286 org.apache.ant:ant-jai:1.10.4
-5E215ADBE4E5DCFC53C2BB90FF38056E6EE733FD org.apache.ant:ant-javamail:1.10.4
-CAC4F42150E4043D19801B8E20ACD7B8A7E4E82D org.apache.ant:ant-jdepend:1.10.4
-6E62191CC5C9DC2A5B4C70C87F41D1CA6A6CEA19 org.apache.ant:ant-jmf:1.10.4
-F6D72BEC0AF904BA3CD11B24DD9649E0E1982367 org.apache.ant:ant-jsch:1.10.4
-3BFD5B656A60777492E5EF0D99B8AA11BFFA309F org.apache.ant:ant-junit:1.10.4
-A79FD54C34AF7C07872DE598951C7FAC2F540426 org.apache.ant:ant-junit4:1.10.4
-9C4E40A331BB07E30AD87E0F55D48231C1711FE1 org.apache.ant:ant-launcher:1.10.4
-5C84A8063C793F39B75E81B6FC7A501B8FEC5A0D org.apache.ant:ant-netrexx:1.10.4
-A5BF7707EE8EDF597D3C353F61B7DC8019D80FD5 org.apache.ant:ant-swing:1.10.4
-1E617966BB4ECC0C49D2E6D1D2B0511FA470D43E org.apache.ant:ant-testutil:1.10.4
-2D154E15E744AA3FF2DDAE8A6C1019CC595F6A81 org.apache.ant:ant-xz:1.10.4
+A4CDC20F1F620A6208B42F81C224CDB6B9C1968D ant-misc-1.10.8.zip
+AE148ABB0532B685C5EEB22FDEC9D124E89BE5DE org.apache.ant:ant:1.10.8
+3D728985E3B6A71B80D10DB0D574A60B496590A1 org.apache.ant:ant-antlr:1.10.8
+0F2ADD1F8BCA7992322BBDFC63B596B00A8DB8FD org.apache.ant:ant-apache-bcel:1.10.8
+5B095EBB1C1A1B0F6A3B889D3161BCE4CE07860D org.apache.ant:ant-apache-bsf:1.10.8
+9A3E49630CAF4A67AD6188DC0D9C2D4C52CDF279 org.apache.ant:ant-apache-log4j:1.10.8
+6B261964B550BE885C9656BA268A8DCD140F6314 org.apache.ant:ant-apache-oro:1.10.8
+0E8C9E896CA9A10BBF205FE396EBF6808CB45B86 org.apache.ant:ant-apache-regexp:1.10.8
+73CE9524001122178D9E7DB9F7FEB68642FC0651 org.apache.ant:ant-apache-resolver:1.10.8
+015B6F2317E0EAC2EE1F07C34D315184B4D7A63A org.apache.ant:ant-apache-xalan2:1.10.8
+741230FB8C8EEB99AAB9EC7074CC871FDB7B1FDA org.apache.ant:ant-commons-logging:1.10.8
+2AADB99C4AF42A1B69E35269551D3C636E247899 org.apache.ant:ant-commons-net:1.10.8
+0B2D6F189F2EFEC0C5A01725094EEC2D95E8F88F org.apache.ant:ant-jai:1.10.8
+BFD7AA4221EA0A9B98DB9E0C908E0426CCB1F2E7 org.apache.ant:ant-javamail:1.10.8
+64206C8AC4DA3E444470651865688C12C5ABB14E org.apache.ant:ant-jdepend:1.10.8
+9B606CF8EF4787A56281A827C66E8AA11972596E org.apache.ant:ant-jmf:1.10.8
+C4D8745B230F2B38B540D5DDD1ABB287DA1F416A org.apache.ant:ant-jsch:1.10.8
+F75D2CBE7F63DB600FC34E23AA447C27095056CF org.apache.ant:ant-junit:1.10.8
+07222C675958C696D6EA3609E8A5C57E4D426F1E org.apache.ant:ant-junit4:1.10.8
+2CA8688D2DAD5694237576DB782B37279989614D org.apache.ant:ant-launcher:1.10.8
+94EBEAB3DBF8A6FC135996AD91854CA0223EE255 org.apache.ant:ant-netrexx:1.10.8
+12AE1CFC42449D3F9017318E751F221C685C2750 org.apache.ant:ant-swing:1.10.8
+5981C0AE8195D838577493854F6B56ADF07DD33A org.apache.ant:ant-testutil:1.10.8
+E8425D9ECEAB2AAC51CC1CCA5D719645F8601D12 org.apache.ant:ant-xz:1.10.8
diff --git a/extide/o.apache.tools.ant.module/external/build.xml b/extide/o.apache.tools.ant.module/external/build.xml
index c6eed1c..bf1397c 100644
--- a/extide/o.apache.tools.ant.module/external/build.xml
+++ b/extide/o.apache.tools.ant.module/external/build.xml
@@ -24,31 +24,31 @@
<mkdir dir="lib"/>
<copy todir="lib">
<fileset dir=".">
- <include name="ant-antlr-1.10.4.jar" />
- <include name="ant-apache-bcel-1.10.4.jar" />
- <include name="ant-apache-bsf-1.10.4.jar" />
- <include name="ant-apache-log4j-1.10.4.jar" />
- <include name="ant-apache-oro-1.10.4.jar" />
- <include name="ant-apache-regexp-1.10.4.jar" />
- <include name="ant-apache-resolver-1.10.4.jar" />
- <include name="ant-apache-xalan2-1.10.4.jar" />
- <include name="ant-commons-logging-1.10.4.jar" />
- <include name="ant-commons-net-1.10.4.jar" />
- <include name="ant-jai-1.10.4.jar" />
- <include name="ant-javamail-1.10.4.jar" />
- <include name="ant-jdepend-1.10.4.jar" />
- <include name="ant-jmf-1.10.4.jar" />
- <include name="ant-jsch-1.10.4.jar" />
- <include name="ant-junit-1.10.4.jar" />
- <include name="ant-junit4-1.10.4.jar" />
- <include name="ant-launcher-1.10.4.jar" />
- <include name="ant-netrexx-1.10.4.jar" />
- <include name="ant-swing-1.10.4.jar" />
- <include name="ant-testutil-1.10.4.jar" />
- <include name="ant-xz-1.10.4.jar" />
- <include name="ant-1.10.4.jar" />
+ <include name="ant-antlr-1.10.8.jar" />
+ <include name="ant-apache-bcel-1.10.8.jar" />
+ <include name="ant-apache-bsf-1.10.8.jar" />
+ <include name="ant-apache-log4j-1.10.8.jar" />
+ <include name="ant-apache-oro-1.10.8.jar" />
+ <include name="ant-apache-regexp-1.10.8.jar" />
+ <include name="ant-apache-resolver-1.10.8.jar" />
+ <include name="ant-apache-xalan2-1.10.8.jar" />
+ <include name="ant-commons-logging-1.10.8.jar" />
+ <include name="ant-commons-net-1.10.8.jar" />
+ <include name="ant-jai-1.10.8.jar" />
+ <include name="ant-javamail-1.10.8.jar" />
+ <include name="ant-jdepend-1.10.8.jar" />
+ <include name="ant-jmf-1.10.8.jar" />
+ <include name="ant-jsch-1.10.8.jar" />
+ <include name="ant-junit-1.10.8.jar" />
+ <include name="ant-junit4-1.10.8.jar" />
+ <include name="ant-launcher-1.10.8.jar" />
+ <include name="ant-netrexx-1.10.8.jar" />
+ <include name="ant-swing-1.10.8.jar" />
+ <include name="ant-testutil-1.10.8.jar" />
+ <include name="ant-xz-1.10.8.jar" />
+ <include name="ant-1.10.8.jar" />
</fileset>
- <globmapper from="*-1.10.4.jar" to="*.jar"/>
+ <globmapper from="*-1.10.8.jar" to="*.jar"/>
</copy>
</target>
<target name="clean">
diff --git a/extide/o.apache.tools.ant.module/nbproject/project.properties b/extide/o.apache.tools.ant.module/nbproject/project.properties
index 1ac21a0..0d2d3fc 100644
--- a/extide/o.apache.tools.ant.module/nbproject/project.properties
+++ b/extide/o.apache.tools.ant.module/nbproject/project.properties
@@ -26,7 +26,7 @@ extra.module.files=\
ant/lib/,\
ant/bin/,\
ant/etc/
-extra.license.files=external/ant-1.10.4-license.txt
+extra.license.files=external/ant-1.10.8-license.txt
nbm.executable.files=\
ant/bin/ant,\
ant/bin/antRun,\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists