[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2a359a6d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2a359a6d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2a359a6d

Branch: refs/heads/master
Commit: 2a359a6d3d13c572b4bac8e8c2fc21ad5001e32c
Parents: 872a9bc 6b76234
Author: Stefan Bodewig 
Authored: Sat Sep 29 18:01:36 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Sep 29 18:01:36 2018 +0200

--
 manual/Tasks/javadoc.html| 3 +--
 .../org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java | 2 ++
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java  | 4 ++--
 src/main/org/apache/tools/ant/types/Commandline.java | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/2a359a6d/manual/Tasks/javadoc.html
--
diff --cc manual/Tasks/javadoc.html
index c818e92,768b442..2f0abe3
--- a/manual/Tasks/javadoc.html
+++ b/manual/Tasks/javadoc.html
@@@ -24,518 -24,547 +24,517 @@@
  
  
  
 -Javadoc/Javadoc2
 +Javadoc/Javadoc2
 +Deprecation: the javadoc2 task simply points to 
the javadoc
 +task and it's there for backwards compatibility reasons. Since this task will 
be removed in future
 +versions, you are strongly encouraged to use javadoc instead.
  Description
 -Generates code documentation using the javadoc tool.
 -The source directory will be recursively scanned for Java source files to 
process
 -but only those matching the inclusion rules, and not matching the exclusions 
rules
 -will be passed to the javadoc tool. This
 -allows wildcards to be used to choose between package names, reducing 
verbosity
 -and management costs over time. This task, however, has no notion of
 -changed files, unlike the javac task. 
This means
 -all packages will be processed each time this task is run. In general, 
however,
 -this task is used much less frequently.
 -NOTE: since javadoc calls System.exit(), javadoc cannot be run inside the
 -same VM as Apache Ant without breaking functionality. For this reason, this 
task
 -always forks the VM. This overhead is not significant since javadoc is 
normally a heavy
 -application and will be called infrequently.
 -NOTE: the packagelist attribute allows you to specify the list of packages 
to
 -document outside of the Ant file. It's a much better practice to include 
everything
 -inside the build.xml file. This option was added in order to 
make it easier to
 -migrate from regular makefiles, where you would use this option of javadoc.
 -The packages listed in packagelist are not checked, so the task performs even
 -if some packages are missing or broken. Use this option if you wish to 
convert from
 -an existing makefile. Once things are running you should then switch to the 
regular
 -notation. 
 -
 -DEPRECATION: the javadoc2 task simply points to the javadoc task 
and it's
 -there for back compatibility reasons. Since this task will be removed in 
future
 -versions, you are strongly encouraged to use javadoc
 -instead.
 -
 -In the table below, 1.2 means available if your current Java VM is
 -a 1.2 VM (but not 1.3 or later), 1.4+ for any VM of at least version 1.4, 
otherwise
 -any VM of at least version 1.2 is acceptable. JDKs 1.4 are no longer 
supported.
 -If you specify the executable attribute it is up to you
 -to ensure that this command supports the attributes you wish to use.
 -
 -Note:When generating the JavaDocs for classes which contains 
annotations
 -you maybe get a java.lang.ClassCastException: 
com.sun.tools.javadoc.ClassDocImpl.
 -This is due https://bugs.openjdk.java.net/browse/JDK-6442982; 
target="_blank">bug-6442982. The cause is that JavaDoc cannot find the 
implementations of used annotations.
 -The workaround is providing the jars with these implementations (like JAXBs 
@XmlType, ...)
 -to javadoc using classpath, classpathref attributes 
or nested
 -classpath element.
 -
 -Note: many problems with running javadoc stem from command
 -  lines that have become too long - even though the error message
 -  doesn't give the slightest hint this may be the problem.  If you
 -  encounter problems with the task, try to set
 -  the useexternalfile attribute to true
 -  first.
 -
 -If you use multiple ways to specify where javadoc should be looking
 -  for sources your result will be the union of all specified
 -  documentations.  If you, e.g., specify a sourcepath attribute and
 -  also a nested packageset both pointing at the same directory your
 -  excludepackagenames attribute won't have any effect unless it agrees
 -  with the exclude patterns of the packageset (and vice versa).
 +Generates code documentation using the javadoc tool.
 +The 

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d4cc7cf0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d4cc7cf0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d4cc7cf0

Branch: refs/heads/master
Commit: d4cc7cf0a9537e79509cf22dd9b030dfc3bec08f
Parents: 0b3e006 857095d
Author: Stefan Bodewig 
Authored: Sat May 5 17:30:12 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat May 5 17:30:12 2018 +0200

--
 WHATSNEW   |  4 +++-
 manual/Tasks/unzip.html|  3 ++-
 src/main/org/apache/tools/ant/taskdefs/Expand.java |  2 +-
 src/tests/antunit/taskdefs/unzip-test.xml  | 10 +-
 4 files changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d4cc7cf0/WHATSNEW
--

http://git-wip-us.apache.org/repos/asf/ant/blob/d4cc7cf0/manual/Tasks/unzip.html
--
diff --cc manual/Tasks/unzip.html
index 8b67f3b,dbf4a16..7076e5a
--- a/manual/Tasks/unzip.html
+++ b/manual/Tasks/unzip.html
@@@ -24,106 -24,129 +24,107 @@@
  
  
  
 -Unjar/Untar/Unwar/Unzip
 +Unjar/Untar/Unwar/Unzip
  Description
  Unzips a zip-, war-, or jar file.
 -PatternSets are used to select 
files to extract
 -from the archive.  If no patternset is used, all files are extracted.
 -
 -
 -Resource
 -Collections may be used to select archived files to perform
 -unarchival upon.  Only file system based resource collections are
 -supported by Unjar/Unwar/Unzip, this includes fileset, filelist, path, and files.
 -Untar supports arbitrary resource collections.
 -Prior to Apache Ant 1.7 only fileset has been supported as a nested 
element.
 -
 -You can define filename transformations by using a nested mapper element.  The default mapper is the
 -identity mapper.
 -
 +PatternSets are used to select 
files to
 +extract from the archive.  If no patternset is used, all files are 
extracted.
 +
 +resource collections may 
be used to select
 +archived files to perform unarchival upon.  Only file system based resource 
collections are
 +supported by Unjar/Unwar/Unzip, this
 +includes fileset, filelist, path,
 +and files. Untar 
supports arbitrary
 +resource collections.  Prior to Apache Ant 1.7 only fileset has 
been supported as a
 +nested element.
 +
 +You can define filename transformations by using a
 +nested mapper element.  The default mapper 
is the
 +identity mapper.
  File permissions will not be restored on extracted files.
 -The untar task recognizes the long pathname entries used by GNU tar.
 +The untar task recognizes the long pathname entries used by 
GNU tar.
  
 -Please note that different ZIP tools handle timestamps
 -differently when it comes to applying timezone offset calculations of
 -files.  Some ZIP libraries will store the timestamps as they've been
 -read from the filesystem while others will modify the timestamps both
 -when reading and writing the files to make all timestamps use the same
 -timezone.  A ZIP archive created by one library may extract files with
 -"wrong timestamps" when extracted by another library.
 -
 -Ant's ZIP classes use the same algorithm as the InfoZIP tools and
 -zlib (timestamps get adjusted), Windows' "compressed folders" function
 -and WinZIP don't change the timestamps.  This means that using the
 -unzip task on files created by Windows' compressed folders function
 -may create files with timestamps that are "wrong", the same is true if
 -you use Windows' functions to extract an Ant generated ZIP
 -archive.
 +Please note that different ZIP tools handle timestamps 
differently when it comes
 +to applying timezone offset calculations of files.  Some ZIP libraries will 
store the timestamps as
 +they've been read from the filesystem while others will modify the timestamps 
both when reading and
 +writing the files to make all timestamps use the same timezone.  A ZIP 
archive created by one
 +library may extract files with "wrong timestamps" when extracted by another 
library.
  
 +Ant's ZIP classes use the same algorithm as the InfoZIP tools and zlib 
(timestamps get adjusted),
 +Windows' "compressed folders" function and WinZIP don't change the 
timestamps.  This means that
 +using the unzip task on files created by Windows' compressed 
folders function may
 +create files with timestamps that are "wrong", the same is true if you use 
Windows' functions to
 +extract an Ant generated ZIP archive.
  
  Parameters
 -
 +

 -Attribute
 -Description
 -Required
 +Attribute
 +Description
 +Required


 -src
 -archive file to expand.
 -Yes, if filesets are not 

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6c032e68
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6c032e68
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6c032e68

Branch: refs/heads/master
Commit: 6c032e687dc5db46e199bb17856dfb7a91ad48a3
Parents: 81c3e6e 38a22b0
Author: Stefan Bodewig 
Authored: Sat Apr 14 18:56:07 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 18:56:07 2018 +0200

--
 src/tests/antunit/core/location/location.xml   | 2 +-
 .../taskdefs/optional/junit/junit-outputtoformatters-test.xml  | 2 +-
 src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 2 +-
 src/tests/antunit/taskdefs/taskdef-test.xml| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6c032e68/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
--
diff --cc src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index 72f21ae,b03911e..a201603
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@@ -18,9 -18,11 +18,9 @@@
  
  
  
 -
 -
 -
 +
  
- 
+ 
  
  
  

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5db13f65
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5db13f65
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5db13f65

Branch: refs/heads/master
Commit: 5db13f65771663b4ad18e1aced1e002e706cd7f0
Parents: 5886bd3 4bfc483
Author: Stefan Bodewig 
Authored: Tue Mar 20 14:55:36 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Mar 20 14:55:36 2018 +0100

--
 src/tests/antunit/taskdefs/signjar-test.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f11bc4ea
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f11bc4ea
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f11bc4ea

Branch: refs/heads/master
Commit: f11bc4eaa38aecd467c8c9d954100baa0c71c893
Parents: 32d178f a390fd6
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:51:50 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:51:50 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 13 +++--
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 36 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/f11bc4ea/WHATSNEW
--

http://git-wip-us.apache.org/repos/asf/ant/blob/f11bc4ea/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bed7cf07
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bed7cf07
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bed7cf07

Branch: refs/heads/master
Commit: bed7cf07678c53452eac4e8aff6b9a18ffd0256e
Parents: 02e72b8 5892ab0
Author: Stefan Bodewig 
Authored: Fri Jan 26 20:31:04 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Jan 26 20:31:04 2018 +0100

--
 .../junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/bed7cf07/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
--

[3/3] ant git commit: Merge branch '1.9.x' closes #55

[bodewig]

Merge branch '1.9.x' closes #55


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c48100f8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c48100f8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c48100f8

Branch: refs/heads/master
Commit: c48100f88dad59e6c8cc81ebfc1b4180aedcf5d0
Parents: 1721393 f57d60d
Author: Stefan Bodewig 
Authored: Fri Jan 26 18:36:55 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Jan 26 18:36:55 2018 +0100

--

--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/8d8b2110
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/8d8b2110
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/8d8b2110

Branch: refs/heads/master
Commit: 8d8b21108569f63c375fca390cc723fa5f61d061
Parents: 454e4e2 685324a
Author: Stefan Bodewig 
Authored: Sun Dec 10 11:41:50 2017 +0100
Committer: Stefan Bodewig 
Committed: Sun Dec 10 11:41:50 2017 +0100

--
 WHATSNEW | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/8d8b2110/WHATSNEW
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/966708a2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/966708a2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/966708a2

Branch: refs/heads/master
Commit: 966708a294a4b731ebfafe4af5da776969919f89
Parents: 2ec41af 7c6c749
Author: Stefan Bodewig 
Authored: Mon May 8 18:45:59 2017 +0200
Committer: Stefan Bodewig 
Committed: Mon May 8 18:45:59 2017 +0200

--
 WHATSNEW|  4 +++
 manual/Tasks/tstamp.html|  6 +
 manual/running.html |  5 
 src/main/org/apache/tools/ant/MagicNames.java   | 13 ++
 .../org/apache/tools/ant/taskdefs/Tstamp.java   | 19 +-
 src/tests/antunit/taskdefs/tstamp-test.xml  | 27 
 6 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/966708a2/WHATSNEW
--
diff --cc WHATSNEW
index b552951,aa2ad03..ba2213e
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -28,15 -18,12 +28,19 @@@ Other changes
   * added "regexp" attribute to 
 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 .
+Bugzilla Report 61079
+ 
 -Changes from Ant 1.9.8 TO Ant 1.9.9
 -===
 +Changes from Ant 1.10.0 TO Ant 1.10.1
 +=
  
  Fixed bugs:
  ---

http://git-wip-us.apache.org/repos/asf/ant/blob/966708a2/manual/Tasks/tstamp.html
--
diff --cc manual/Tasks/tstamp.html
index 82812a5,6baa0c8..c9a83c9
--- a/manual/Tasks/tstamp.html
+++ b/manual/Tasks/tstamp.html
@@@ -40,6 -40,12 +40,12 @@@ time-stamped filenames, or used to repl
  to indicate, for example, the release date. The best place for this task is
  probably in an initialization target.
  
 -Since Ant 1.9.10 the magic
++Since Ant 1.10.2 the magic
+   property ant.tstamp.now can be used to specify a fixed
+   date value in order to create reproducible builds. Its value must be
+   a number and is interpreted as seconds since the epoch (midnight
+   1970-01-01).
+ 
  Parameters
  


http://git-wip-us.apache.org/repos/asf/ant/blob/966708a2/src/main/org/apache/tools/ant/MagicNames.java
--
diff --cc src/main/org/apache/tools/ant/MagicNames.java
index 336c3bc,67ab8a8..5f6aec9
--- a/src/main/org/apache/tools/ant/MagicNames.java
+++ b/src/main/org/apache/tools/ant/MagicNames.java
@@@ -295,5 -289,18 +295,18 @@@ public final class MagicNames 
   * Value {@value}
   */
  public static final String HTTP_AGENT_PROPERTY = "ant.http.agent";
+ 
+ /**
+  * Magic property that can be set to contain a value for tstamp's
+  * "now" in order to make builds that use the task create
+  * reproducible results.
+  *
+  * The value is expected to be a number representing the date
+  * as seconds since the epoch.
+  *
+  * Value: {@value}
 - * @since Ant 1.9.10
++ * @since Ant 1.10.2
+  */
+ public static final String TSTAMP_NOW = "ant.tstamp.now";
  }
  

http://git-wip-us.apache.org/repos/asf/ant/blob/966708a2/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
--
diff --cc src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 0610c39,a6a35d7..98dd779
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@@ -66,12 -67,15 +67,12 @@@ public class Tstamp extends Task 
   * the standard ones, to get their retaliation in early.
   * @throws BuildException on error.
   */
 +@Override
  public void execute() throws BuildException {
  try {
- Date d = new Date();
+ Date d = getNow();
  
 -Enumeration i = customFormats.elements();
 -while (i.hasMoreElements()) {
 -CustomFormat cts = (CustomFormat) i.nextElement();
 -cts.execute(getProject(), d, getLocation());
 -}
 +customFormats.forEach(cts -> cts.execute(getProject(), d, 
getLocation()));
  
  SimpleDateFormat dstamp = new SimpleDateFormat ("MMdd");
  setProperty("DSTAMP", dstamp.format(d));

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/00d140c1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/00d140c1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/00d140c1

Branch: refs/heads/master
Commit: 00d140c1b2ac131485862741145ddfbd68024892
Parents: c11dcf2 5347475
Author: Stefan Bodewig 
Authored: Tue Apr 11 16:32:00 2017 +0200
Committer: Stefan Bodewig 
Committed: Tue Apr 11 16:32:00 2017 +0200

--
 WHATSNEW | 15 +--
 manual/Types/filterchain.html|  7 ++-
 .../apache/tools/ant/filters/LineContainsRegExp.java | 15 +++
 3 files changed, 26 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/00d140c1/WHATSNEW
--
diff --cc WHATSNEW
index 3284d98,9dac453..5bc79b5
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,6 -1,13 +1,13 @@@
 -Changes from Ant 1.9.9 TO Ant 1.9.10
 -
 +Changes from Ant 1.10.1 TO Ant 1.10.2
 +=
  
+ Fixed bugs:
+ ---
+ 
+  * 's  child now skips s that lack a key or
+value.
+Bugzilla Report 60767
+ 
  Other changes:
  --
  
@@@ -8,22 -15,11 +15,18 @@@
 values always get quoted.
 Github Pull Request #32
  
 + * Added  attributes to various script related tasks and a
 +   compiled attribute to scriptdef.
 +   Github Pull Request #30
 +
 + * Added support for jarsigner's -tsadigestalg to .
 +   Bugzilla Report 60665
 +
- Fixed bugs:
- ---
- 
-  * 's  child now skips s that lack a key or
-value.
-Bugzilla Report 60767
+  * added "regexp" attribute to 
+Bugzilla Report 60968
  
 -Changes from Ant 1.9.8 TO Ant 1.9.9
 -===
 +Changes from Ant 1.10.0 TO Ant 1.10.1
 +=
  
  Fixed bugs:
  ---

http://git-wip-us.apache.org/repos/asf/ant/blob/00d140c1/manual/Types/filterchain.html
--
diff --cc manual/Types/filterchain.html
index 4c5f94e,c83b106..8f4066f
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@@ -422,7 -422,12 +422,12 @@@ regular expression matching strings


  regexp
- Regular expression to be searched for.
+ Regular expression to be searched for.
 -  Starting with 1.9.10 this also works as an attribute
++  Starting with 1.10.2 this also works as an attribute
+ on linecontainsregexp, in earlier versions of Ant
+ you must use a nested element when using the convenience
+ method.
+ 
  Yes



http://git-wip-us.apache.org/repos/asf/ant/blob/00d140c1/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
--
diff --cc src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
index 23a2005,09dce77..4b7f53e
--- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
+++ b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
@@@ -220,6 -220,16 +220,16 @@@ public final class LineContainsRegEx
  }
  
  /**
+  * Set the regular expression as an attribute.
 - * @since Ant 1.9.10
++ * @since Ant 1.10.2
+  */
+ public void setRegexp(String pattern) {
+ RegularExpression regexp = new RegularExpression();
+ regexp.setPattern(pattern);
+ regexps.addElement(regexp);
+ }
+ 
+ /**
   * Parses parameters to add user defined regular expressions.
   */
  private void initialize() {

[3/3] ant git commit: Merge branch '1.9.x' - closes #29

[bodewig]

Merge branch '1.9.x' - closes #29


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0dfa2918
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0dfa2918
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0dfa2918

Branch: refs/heads/master
Commit: 0dfa2918b51c213a13edbcc660984f631f6c92f7
Parents: 9ef4ba3 8d03bfd
Author: Stefan Bodewig 
Authored: Sat Jan 14 18:59:36 2017 +0100
Committer: Stefan Bodewig 
Committed: Sat Jan 14 18:59:40 2017 +0100

--
 src/script/ant | 39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/451c4244
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/451c4244
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/451c4244

Branch: refs/heads/master
Commit: 451c424445d29ac1b02bc937a1b271967a30a365
Parents: 2002644 6c8b354
Author: Stefan Bodewig 
Authored: Wed Dec 21 07:25:43 2016 +0100
Committer: Stefan Bodewig 
Committed: Wed Dec 21 07:25:43 2016 +0100

--
 src/main/org/apache/tools/ant/Main.java |  2 +-
 .../tools/ant/input/DefaultInputHandler.java|  8 +--
 .../ant/taskdefs/optional/junit/JUnitTask.java  | 12 +++---
 .../junit/PlainJUnitResultFormatter.java|  6 -
 .../tools/ant/taskdefs/optional/net/FTP.java|  4 ++--
 .../optional/net/FTPTaskMirrorImpl.java |  4 ++--
 .../ant/taskdefs/optional/net/RExecTask.java| 10 +++--
 .../ant/taskdefs/optional/net/TelnetTask.java   | 10 +++--
 .../taskdefs/optional/splash/SplashTask.java|  2 +-
 .../apache/tools/ant/taskdefs/rmic/SunRmic.java |  8 ++-
 .../types/selectors/ContainsRegexpSelector.java |  9 +---
 .../tools/ant/util/SymbolicLinkUtils.java   | 23 +---
 12 files changed, 70 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/451c4244/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/1f045ecb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1f045ecb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1f045ecb

Branch: refs/heads/master
Commit: 1f045ecb31fc97340e7dce1c70e133a62e1e4271
Parents: 197ed22 99deebc
Author: Stefan Bodewig 
Authored: Tue Dec 20 22:27:22 2016 +0100
Committer: Stefan Bodewig 
Committed: Tue Dec 20 22:27:22 2016 +0100

--
 src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c43870d4
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c43870d4
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c43870d4

Branch: refs/heads/master
Commit: c43870d4523ec9d379a9aeda11f2ce45160d6102
Parents: a50633c 642a050
Author: Stefan Bodewig 
Authored: Wed Sep 28 21:10:14 2016 +0200
Committer: Stefan Bodewig 
Committed: Wed Sep 28 21:10:14 2016 +0200

--

--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/047844b2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/047844b2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/047844b2

Branch: refs/heads/master
Commit: 047844b2471041b02b1662a8726270ee7d8ad47d
Parents: 98e87c5 ee85859
Author: Stefan Bodewig 
Authored: Sun Jul 31 06:24:36 2016 +0200
Committer: Stefan Bodewig 
Committed: Sun Jul 31 06:24:36 2016 +0200

--
 WHATSNEW|  4 ++
 manual/Tasks/javac.html | 17 ++
 manual/Tasks/javah.html |  8 +++
 manual/Tasks/rmic.html  |  2 +-
 .../org/apache/tools/ant/taskdefs/Javac.java| 21 +++
 .../compilers/DefaultCompilerAdapter.java   | 10 
 src/tests/antunit/taskdefs/javac-test.xml   | 59 +++-
 7 files changed, 105 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/047844b2/WHATSNEW
--

http://git-wip-us.apache.org/repos/asf/ant/blob/047844b2/manual/Tasks/javah.html
--

http://git-wip-us.apache.org/repos/asf/ant/blob/047844b2/src/main/org/apache/tools/ant/taskdefs/Javac.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/047844b2/src/tests/antunit/taskdefs/javac-test.xml
--
diff --cc src/tests/antunit/taskdefs/javac-test.xml
index a3ffc82,05c3269..60bc552
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@@ -264,4 -315,31 +266,31 @@@ public class Adapter implements Compile

  
 
+ 
 -  
++  
+ 
+ 
+ 
+ 
+   
+ 
+   
+   
+   
+   
+   
  

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b746f1e7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b746f1e7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b746f1e7

Branch: refs/heads/master
Commit: b746f1e7d046f522dbe94a193018a24f6932914c
Parents: e896e5a e74054f
Author: Stefan Bodewig 
Authored: Sat Jul 30 12:07:30 2016 +0200
Committer: Stefan Bodewig 
Committed: Sat Jul 30 12:07:30 2016 +0200

--
 WHATSNEW|  4 
 bootstrap.bat   |  1 +
 manual/Tasks/rmic.html  |  4 +++-
 .../ant/taskdefs/rmic/DefaultRmicAdapter.java   | 14 
 .../tools/ant/taskdefs/RmicAdvancedTest.java| 23 
 5 files changed, 41 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/b746f1e7/WHATSNEW
--

http://git-wip-us.apache.org/repos/asf/ant/blob/b746f1e7/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9dee500e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9dee500e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9dee500e

Branch: refs/heads/master
Commit: 9dee500e597ba2c985b7253a8d4b04629e4e0e55
Parents: 2d86edf a394a0b
Author: Stefan Bodewig 
Authored: Thu Jun 23 16:39:09 2016 +0200
Committer: Stefan Bodewig 
Committed: Thu Jun 23 16:39:09 2016 +0200

--
 CONTRIBUTORS | 2 ++
 WHATSNEW | 5 +
 contributors.xml | 8 
 src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 4 
 4 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/9dee500e/WHATSNEW
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5c13bb84
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5c13bb84
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5c13bb84

Branch: refs/heads/master
Commit: 5c13bb8417c6d45c261c74e6af6e4844c916a154
Parents: d5f2b0c deaa7d5
Author: Stefan Bodewig 
Authored: Mon May 23 06:01:03 2016 +0200
Committer: Stefan Bodewig 
Committed: Mon May 23 06:01:03 2016 +0200

--
 CONTRIBUTORS|  1 +
 WHATSNEW|  3 +
 contributors.xml|  4 +
 manual/Tasks/scp.html   |  6 ++
 .../optional/ssh/AbstractSshMessage.java| 22 +
 .../tools/ant/taskdefs/optional/ssh/Scp.java| 17 +++-
 .../taskdefs/optional/ssh/ScpFromMessage.java   | 27 +-
 .../ant/taskdefs/optional/ssh/ScpToMessage.java | 95 ++--
 8 files changed, 162 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/5c13bb84/WHATSNEW
--

[3/3] ant git commit: Merge branch '1.9.x'

[bodewig]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0c2ca552
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0c2ca552
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0c2ca552

Branch: refs/heads/master
Commit: 0c2ca5525577917b25a6a053e77535fe03c12601
Parents: a80c75a 647bdfb
Author: Stefan Bodewig 
Authored: Sun May 1 06:43:01 2016 +0200
Committer: Stefan Bodewig 
Committed: Sun May 1 06:43:01 2016 +0200

--
 WHATSNEW|  3 ++
 src/main/org/apache/tools/ant/taskdefs/Get.java | 30 ++--
 2 files changed, 18 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/0c2ca552/WHATSNEW
--