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/12/18 13:16:01 UTC
[1/2] ant git commit: use HTML entity instead of unicode escape
sequence
Repository: ant
Updated Branches:
refs/heads/master ff3faffc7 -> 33885eff5
use HTML entity instead of unicode escape sequence
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/de95b34f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/de95b34f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/de95b34f
Branch: refs/heads/master
Commit: de95b34f04b0aeddda90eac167349727271c864a
Parents: 6f5db5e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Dec 18 14:15:08 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Dec 18 14:15:08 2017 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Zip.java | 4 ++--
src/main/org/apache/tools/ant/util/DateUtils.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/de95b34f/src/main/org/apache/tools/ant/taskdefs/Zip.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index b8e3604..5bcbe73 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -601,10 +601,10 @@ public class Zip extends MatchingTask {
/**
* Set all stored file modification times to {@code time}.
* @param time Milliseconds since 1970-01-01 00:00, or
- * <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][\u00b1ZZ[[:]ZZ]]</code>, or
+ * <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][±ZZ[[:]ZZ]]</code>, or
* <code>MM/DD/YYYY HH:MM[:SS] {AM/PM}</code>, where {a/b} indicates
* that you must choose one of a or b, and [c] indicates that you
- * may use or omit c. \u00b1ZZZZ is the timezone offset, and may be
+ * may use or omit c. ±ZZZZ is the timezone offset, and may be
* literally "Z" to mean GMT.
* @since Ant 1.9.10
*/
http://git-wip-us.apache.org/repos/asf/ant/blob/de95b34f/src/main/org/apache/tools/ant/util/DateUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java
index 2cf5bc9..b63e098 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -346,10 +346,10 @@ public final class DateUtils {
* That is:
* <ul>
* <li>Milliseconds since 1970-01-01 00:00</li>
- * <li><code>YYYY-MM-DD{T| }HH:MM[:SS[.SSS]][ ][\u00b1ZZ[[:]ZZ]]</code></li>
+ * <li><code>YYYY-MM-DD{T| }HH:MM[:SS[.SSS]][ ][±ZZ[[:]ZZ]]</code></li>
* <li><code>MM/DD/YYYY HH:MM[:SS] {AM|PM}</code></li></ul>
* where {a|b} indicates that you must choose one of a or b, and [c]
- * indicates that you may use or omit c. \u00b1ZZZZ is the timezone offset, and
+ * indicates that you may use or omit c. ±ZZZZ is the timezone offset, and
* may be literally "Z" to mean GMT.
*
* @param dateStr String
[2/2] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
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/33885eff
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/33885eff
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/33885eff
Branch: refs/heads/master
Commit: 33885eff5106cc9751550b7ae5a761d071da42ad
Parents: ff3faff de95b34
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Dec 18 14:15:51 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Dec 18 14:15:51 2017 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Zip.java | 4 ++--
src/main/org/apache/tools/ant/util/DateUtils.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/33885eff/src/main/org/apache/tools/ant/taskdefs/Zip.java
----------------------------------------------------------------------
diff --cc src/main/org/apache/tools/ant/taskdefs/Zip.java
index 4907953,5bcbe73..1673278
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@@ -592,12 -601,12 +592,12 @@@ public class Zip extends MatchingTask
/**
* Set all stored file modification times to {@code time}.
* @param time Milliseconds since 1970-01-01 00:00, or
- * <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][\u00b1ZZ[[:]ZZ]]</code>, or
+ * <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][±ZZ[[:]ZZ]]</code>, or
* <code>MM/DD/YYYY HH:MM[:SS] {AM/PM}</code>, where {a/b} indicates
* that you must choose one of a or b, and [c] indicates that you
- * may use or omit c. \u00b1ZZZZ is the timezone offset, and may be
+ * may use or omit c. ±ZZZZ is the timezone offset, and may be
* literally "Z" to mean GMT.
- * @since Ant 1.9.10
+ * @since Ant 1.10.2
*/
public void setModificationtime(String time) {
fixedModTime = time;
http://git-wip-us.apache.org/repos/asf/ant/blob/33885eff/src/main/org/apache/tools/ant/util/DateUtils.java
----------------------------------------------------------------------