Skip to content

Commit

Permalink
apache-ant: update to 1.10.2.
Browse files Browse the repository at this point in the history
Changes from Ant 1.10.1 TO Ant 1.10.2
=====================================

Changes that could break older environments:
-------------------------------------------

 * updated the dependency of BCEL to 6.2.
   Bugzilla Report 61196

 * delete task previously would silently accept wildcard (*)
   value for the "file" attribute. That's no longer the case
   and an exception could get thrown by the underlying filesystem
   for such use. Usage like:

   <delete file="/foo/bar/*.something"/>

   should instead be changed to use resource collections like:

   <delete>
   	 <fileset dir="/foo/bar/" includes="*.something"/>
   </delete>

 * Commons Net 3.6 is binary-code, but not source compatible;
   see change list of Commons Net 3.0 for details

 * The Log4jListener is marked as deprecated as the required log4j library
   (in version 1.x) is not maintained any more.

 * Image task is marked as deprecated as the required JAI library is not
   maintained any more and internal APIs that JAI depended on are no longer
   available in Java 9.

Fixed bugs:
-----------

 * <genkey>'s <dname> child now skips <param>s that lack a key or
   value.
   Bugzilla Report 60767

 * bootstrapping Ant on Windows failed
   Bugzilla Report 61027

 * Fixed the issue where the SCP based tasks would try to change
   the permissions on the parent directory of a transferred file,
   instead of changing it on the transferred file itself.
   Bugzilla Reports 59648 and 43271

 * Fixed the issue where the source file being copied could end
   up being corrupted if the target of the copy happened to be
   the same source file (symlinked back to itself).
   Bugzilla Report 60644

 * Fixed the issue where symlink creation with "overwrite=false",
   on existing symlink whose target was a directory, would end
   up creating a new symlink under the target directory.
   Bugzilla Report 58683

 * Improvement to the Zip task for reduced memory usage in certain
   cases. Thanks to Glen Lewis for reporting the issue and
   suggesting the fix.
   Bugzilla Report 19516

 * Fixed an issue where the content redirected from output/error
   streams of a process, could end up being truncated.
   Bugzilla Report 58833, 58451

 * <fileset>/<zipfileset>/<tarfileset> will now throw an exception
   with a more useful error message when setFile is called twice on
   the same instance.
   Bugzilla Report 62071

Other changes:
--------------

 * Added forceCsvQuoteChar option to <csv> task. When enabled the
   values always get quoted.
   Github Pull Request #32

 * Added <encoding> attributes to various script related tasks and a
   compiled attribute to scriptdef.
   Github Pull Request #30

 * Added support for jarsigner's -tsadigestalg to <signjar>.
   Bugzilla Report 60665

 * added "regexp" attribute to <linecontainsregexp>
   Bugzilla Report 60968

 * reduced GC pressure by replacing all usage of FileInputStream and
   FileOutputStream.

 * Task can now also use attribute setters that expect a
   java.nio.file.Path argument.
   Bugzilla Report 61042

 * added a new magic property ant.tstamp.now that can be used to
   override the current time/date used by <tstamp>.
   Bugzilla Report 61079

 * added Orion support to ejbjar
   Github Pull Request #33

 * SCP task, when configured to use SFTP protocol, now preserves last
   modified timestamp on files that it uploads, if the
   preserveLastModified attribute is set to true for that task
   Bugzilla Report 58589

 * zip and the related tasks can now set the modification time of all
   entries to a fixed timestamp.
   Github Pull Request #36

 * Jsch library dependency has now been upgraded to 0.1.54. Jsch is
   the library behind the sshexec and scp Ant tasks.
   Bugzilla Report 61718

 * Added a new <javaversion> condition.

 * added "javac10+" as new supported value for javac's compiler attribute.

 * javah has been removed from Java 10. The task will now throw an
   exception if you try to use it while running Java 10 or newer.

 * Updated Maven Ant Tasks, Jakarta Regexp and JUnit 4 to the latest
   stable version (2.1.3, 1.4, and 4.12 respectively); updated
   JRuby to the latest Java 5 compatible version (1.6.8); added
   resolve target for AntUnit to facilitate updates.
   Github Pull Request #50

 * Updated Java Mail API, Jython, Rhino and Commons Net to the latest
   stable version (1.6.0, 2.7.0, 1.7.7.2 and 3.6, respectively).
   Github Pull Request #53
  • Loading branch information
0-wiz-0 committed Feb 25, 2018
1 parent b053130 commit 650bdb0
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
4 changes: 2 additions & 2 deletions devel/apache-ant/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.42 2017/02/08 11:50:02 prlw1 Exp $
# $NetBSD: Makefile,v 1.43 2018/02/25 20:44:59 wiz Exp $

DISTNAME= apache-ant-1.10.1-bin
DISTNAME= apache-ant-1.10.2-bin
PKGNAME= ${DISTNAME:S/-bin//}
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/}
Expand Down
5 changes: 4 additions & 1 deletion devel/apache-ant/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.21 2017/02/08 11:50:02 prlw1 Exp $
@comment $NetBSD: PLIST,v 1.22 2018/02/25 20:44:59 wiz Exp $
bin/ant
bin/antRun
lib/java/ant/ant-antlr.jar
Expand Down Expand Up @@ -339,6 +339,7 @@ share/doc/java/ant/api/org/apache/tools/ant/filters/UniqFilter.html
share/doc/java/ant/api/org/apache/tools/ant/filters/package-frame.html
share/doc/java/ant/api/org/apache/tools/ant/filters/package-summary.html
share/doc/java/ant/api/org/apache/tools/ant/filters/package-tree.html
share/doc/java/ant/api/org/apache/tools/ant/filters/util/ChainReaderHelper.ChainReader.html
share/doc/java/ant/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
share/doc/java/ant/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
share/doc/java/ant/api/org/apache/tools/ant/filters/util/package-frame.html
Expand Down Expand Up @@ -661,6 +662,7 @@ share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/IsReference.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/IsSet.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/IsSigned.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/IsTrue.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/JavaVersion.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/Matches.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/Not.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/condition/Or.html
Expand Down Expand Up @@ -809,6 +811,7 @@ share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTas
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.html
share/doc/java/ant/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.html
Expand Down
12 changes: 6 additions & 6 deletions devel/apache-ant/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.26 2017/02/08 11:50:02 prlw1 Exp $
$NetBSD: distinfo,v 1.27 2018/02/25 20:44:59 wiz Exp $

SHA1 (apache-ant-1.10.1-bin.tar.xz) = e65d1ee3edca5ed00d4335f9e139281bc71c7ef6
RMD160 (apache-ant-1.10.1-bin.tar.xz) = a5b80311525ac8e424fd32c2ae8ab176945131eb
SHA512 (apache-ant-1.10.1-bin.tar.xz) = 8732ecfd96bcfde626260939f17fdb7e85700092ef69932b250e3572810cd53eaac24e1c72921d89900170804d27cc3100bee7c8b5159d0e5b64c3d79e07bec6
Size (apache-ant-1.10.1-bin.tar.xz) = 4317736 bytes
SHA1 (patch-aa) = 2cbee5444e1da56072fc61506b28d22dde6dbcdc
SHA1 (apache-ant-1.10.2-bin.tar.xz) = f8b24adf1813b6411598c3085c91300b1bba562d
RMD160 (apache-ant-1.10.2-bin.tar.xz) = 8ae8819fc54a381441f568dfe99f016d641f2e4e
SHA512 (apache-ant-1.10.2-bin.tar.xz) = a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385
Size (apache-ant-1.10.2-bin.tar.xz) = 4386316 bytes
SHA1 (patch-aa) = 5f614ed545c7cca33096af1f4975f7947439286f
24 changes: 12 additions & 12 deletions devel/apache-ant/patches/patch-aa
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
$NetBSD: patch-aa,v 1.5 2014/09/03 19:36:52 tonio Exp $
$NetBSD: patch-aa,v 1.6 2018/02/25 20:44:59 wiz Exp $

Initialize paths to appropriate defaults for pkgsrc.

--- bin/ant.orig 2010-02-02 01:35:22.000000000 +0100
+++ bin/ant 2010-04-13 22:52:56.000000000 +0200
@@ -91,6 +91,15 @@
MINGW*) mingw=true ;;
esac
--- bin/ant.orig 2018-02-03 16:51:21.000000000 +0000
+++ bin/ant
@@ -91,6 +91,15 @@ else

# load user ant configuration
if [ -f "$HOME/.ant/ant.conf" ]; then
+if [ "$ANT_HOME" = "" ] ; then
+ # try to find ANT
+ ANT_HOME=@PREFIX@
Expand All @@ -17,10 +17,10 @@ Initialize paths to appropriate defaults for pkgsrc.
+ JAVA_HOME='@JAVA_HOME@'
+fi
+
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
## resolve links - $0 may be a link to ant's home
PRG="$0"
@@ -129,7 +138,12 @@
. $HOME/.ant/ant.conf
fi
if [ -f "$HOME/.antrc" ]; then
@@ -172,7 +181,12 @@ if $mingw; then
fi

# set ANT_LIB location
Expand All @@ -32,5 +32,5 @@ Initialize paths to appropriate defaults for pkgsrc.
+ JAVACMD=@PREFIX@/bin/java
+fi

if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
if [ -z "$JAVACMD" ]; then
if [ -n "$JAVA_HOME" ]; then

0 comments on commit 650bdb0

Please sign in to comment.