You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/04/11 14:32:16 UTC
[3/3] ant git commit: Merge branch '1.9.x'
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 <bo...@apache.org>
Authored: Tue Apr 11 16:32:00 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
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:
+ -----------
+
+ * <genkey>'s <dname> child now skips <param>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 <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
+
- Fixed bugs:
- -----------
-
- * <genkey>'s <dname> child now skips <param>s that lack a key or
- value.
- Bugzilla Report 60767
+ * added "regexp" attribute to <linecontainsregexp>
+ 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
</tr>
<tr>
<td vAlign=top>regexp</td>
- <td vAlign=top align="center">Regular expression to be searched for.</td>
+ <td vAlign=top align="center">Regular expression to be searched for.<br>
- <em>Starting with 1.9.10 this also works as an attribute
++ <em>Starting with 1.10.2 this also works as an attribute
+ on <code>linecontainsregexp</code>, in earlier versions of Ant
+ you must use a nested element when using the convenience
+ method.</em>
+ </td>
<td vAlign=top align="center">Yes</td>
</tr>
<tr>
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() {