You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/07/07 20:28:08 UTC
[GitHub] emilianbold closed pull request #628: Cherry-pick Ant 1.0.4 commits
for release90
emilianbold closed pull request #628: Cherry-pick Ant 1.0.4 commits for release90
URL: https://github.com/apache/incubator-netbeans/pull/628
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/o.apache.tools.ant.module/arch.xml b/o.apache.tools.ant.module/arch.xml
index 5395ff95a2..85a12fda24 100644
--- a/o.apache.tools.ant.module/arch.xml
+++ b/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.1 recommended (and currently bundled); some features may be limited to newer versions.
+ 1.8.0+ is required, 1.10.4 recommended (and currently bundled); some features may be limited to newer versions.
</api>
</li>
</ol>
diff --git a/o.apache.tools.ant.module/build.xml b/o.apache.tools.ant.module/build.xml
index 0093390db3..ed978fda6d 100644
--- a/o.apache.tools.ant.module/build.xml
+++ b/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.1.jar"/>
+ <mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.4.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/o.apache.tools.ant.module/external/ant-1.10.1-license.txt b/o.apache.tools.ant.module/external/ant-1.10.4-license.txt
similarity index 96%
rename from o.apache.tools.ant.module/external/ant-1.10.1-license.txt
rename to o.apache.tools.ant.module/external/ant-1.10.4-license.txt
index e9538cbce3..45223364a6 100644
--- a/o.apache.tools.ant.module/external/ant-1.10.1-license.txt
+++ b/o.apache.tools.ant.module/external/ant-1.10.4-license.txt
@@ -1,7 +1,7 @@
Name: Apache Ant
Origin: Apache Software Foundation
-Version: 1.10.1
-Files: ant-libs-1.10.1.zip ant-misc-1.10.1.zip
+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-netrexx-1.10.4.jar ant-swing-1.10.4.jar ant-testutil-1.10.4.jar ant-xz-1.10.4.jar
Description: Ant build tool.
License: Apache-2.0-ant
URL: https://builds.apache.org/view/All/job/Ant_Nightly/lastBuild/
diff --git a/o.apache.tools.ant.module/external/ant-1.10.1-notice.txt b/o.apache.tools.ant.module/external/ant-1.10.4-notice.txt
similarity index 74%
rename from o.apache.tools.ant.module/external/ant-1.10.1-notice.txt
rename to o.apache.tools.ant.module/external/ant-1.10.4-notice.txt
index 5d1a710155..a48eed4d33 100644
--- a/o.apache.tools.ant.module/external/ant-1.10.1-notice.txt
+++ b/o.apache.tools.ant.module/external/ant-1.10.4-notice.txt
@@ -1,5 +1,5 @@
Apache Ant
-Copyright 1999-2017 The Apache Software Foundation
+Copyright 1999-2018 The Apache Software Foundation
The <sync> task is based on code Copyright (c) 2002, Landmark
Graphics Corp that has been kindly donated to the Apache Software
diff --git a/o.apache.tools.ant.module/external/binaries-list b/o.apache.tools.ant.module/external/binaries-list
index dd376e2dac..1dfe08ee26 100644
--- a/o.apache.tools.ant.module/external/binaries-list
+++ b/o.apache.tools.ant.module/external/binaries-list
@@ -14,5 +14,27 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-0B539A378C2EA52B17BD0326ECE03DF66E3A65E9 ant-libs-1.10.1.zip
-F6E0317E5F315E395DA47E5B008D01FAA48C91FB ant-misc-1.10.1.zip
+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
diff --git a/o.apache.tools.ant.module/external/build.xml b/o.apache.tools.ant.module/external/build.xml
index b874a26b2a..c6eed1cb7b 100644
--- a/o.apache.tools.ant.module/external/build.xml
+++ b/o.apache.tools.ant.module/external/build.xml
@@ -21,7 +21,35 @@
-->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
<target name="unzip">
- <unzip src="ant-libs-1.10.1.zip" dest="lib"/>
+ <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" />
+ </fileset>
+ <globmapper from="*-1.10.4.jar" to="*.jar"/>
+ </copy>
</target>
<target name="clean">
<delete dir="lib"/>
diff --git a/o.apache.tools.ant.module/nbproject/project.properties b/o.apache.tools.ant.module/nbproject/project.properties
index d02010bc44..f86a19874c 100644
--- a/o.apache.tools.ant.module/nbproject/project.properties
+++ b/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.1-license.txt
+extra.license.files=external/ant-1.10.4-license.txt
nbm.executable.files=\
ant/bin/ant,\
ant/bin/antRun,\
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists