This is an automated email from the ASF dual-hosted git repository.
emi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit dc04a3e144276f2ce83991be0a92cc2c657e97a3
Author: sim3 <si...@ijskes.org>
AuthorDate: Mon Jul 2 16:59:24 2018 +0200
replaced all references to 1.10.1 to 1.10.4
---
o.apache.tools.ant.module/arch.xml | 2 +-
o.apache.tools.ant.module/build.xml | 2 +-
o.apache.tools.ant.module/external/build.xml | 48 +++++++++++-----------
.../nbproject/project.properties | 2 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/o.apache.tools.ant.module/arch.xml
b/o.apache.tools.ant.module/arch.xml
index 5395ff9..85a12fd 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 0093390..ed978fd 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/build.xml
b/o.apache.tools.ant.module/external/build.xml
index f2e3ad4..c6eed1c 100644
--- a/o.apache.tools.ant.module/external/build.xml
+++ b/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.1.jar" />
- <include name="ant-apache-bcel-1.10.1.jar" />
- <include name="ant-apache-bsf-1.10.1.jar" />
- <include name="ant-apache-log4j-1.10.1.jar" />
- <include name="ant-apache-oro-1.10.1.jar" />
- <include name="ant-apache-regexp-1.10.1.jar" />
- <include name="ant-apache-resolver-1.10.1.jar" />
- <include name="ant-apache-xalan2-1.10.1.jar" />
- <include name="ant-commons-logging-1.10.1.jar" />
- <include name="ant-commons-net-1.10.1.jar" />
- <include name="ant-jai-1.10.1.jar" />
- <include name="ant-javamail-1.10.1.jar" />
- <include name="ant-jdepend-1.10.1.jar" />
- <include name="ant-jmf-1.10.1.jar" />
- <include name="ant-jsch-1.10.1.jar" />
- <include name="ant-junit-1.10.1.jar" />
- <include name="ant-junit4-1.10.1.jar" />
- <include name="ant-launcher-1.10.1.jar" />
- <include name="ant-netrexx-1.10.1.jar" />
- <include name="ant-swing-1.10.1.jar" />
- <include name="ant-testutil-1.10.1.jar" />
- <include name="ant-xz-1.10.1.jar" />
- <include name="ant-1.10.1.jar" />
+ <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.1.jar" to="*.jar"/>
+ <globmapper from="*-1.10.4.jar" to="*.jar"/>
</copy>
</target>
<target name="clean">
diff --git a/o.apache.tools.ant.module/nbproject/project.properties
b/o.apache.tools.ant.module/nbproject/project.properties
index 750c1cc..17a2ec1 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,\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
