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 2023/05/14 09:28:59 UTC
[ant] branch master updated (8fb54871b -> 6f68fbdef)
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
from 8fb54871b bz-66411: Handling forked VM timeout in a similar way as failed test so that settings like haltonfailure have effect This closes #197 pull request at github.com/apache/ant
new d08818ad6 unconditionally sort entrySet in <echoproperties>
new 6f68fbdef whitespace
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
WHATSNEW | 3 +++
.../tools/ant/taskdefs/optional/EchoProperties.java | 16 ++++++----------
2 files changed, 9 insertions(+), 10 deletions(-)
[ant] 02/02: whitespace
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit 6f68fbdefad521741b37304cfdfc6d8646cf1839
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sun May 14 11:25:01 2023 +0200
whitespace
---
.../apache/tools/ant/taskdefs/optional/EchoProperties.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
index 2eb91820d..1ca9441a5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
@@ -359,12 +359,12 @@ public class EchoProperties extends Task {
@Override
public Set<Map.Entry<Object, Object>> entrySet() {
- Set<Map.Entry<Object, Object>> t =
- new TreeSet<>(Comparator.comparing(
- ((Function<Map.Entry<Object, Object>, Object>) Map.Entry::getKey)
- .andThen(Object::toString)));
- t.addAll(super.entrySet());
- return t;
+ Set<Map.Entry<Object, Object>> t =
+ new TreeSet<>(Comparator.comparing(
+ ((Function<Map.Entry<Object, Object>, Object>) Map.Entry::getKey)
+ .andThen(Object::toString)));
+ t.addAll(super.entrySet());
+ return t;
}
};
allProps.forEach((k, v) -> props.put(String.valueOf(k), String.valueOf(v)));
[ant] 01/02: unconditionally sort entrySet in
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit d08818ad6de7e1ce3228db970125987bb3dc3d7c
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sun May 14 11:24:05 2023 +0200
unconditionally sort entrySet in <echoproperties>
see https://bz.apache.org/bugzilla/show_bug.cgi?id=66588
---
WHATSNEW | 3 +++
src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java | 6 +-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/WHATSNEW b/WHATSNEW
index eb9d38b6b..4e4252ab1 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -41,6 +41,9 @@ Other changes:
for runnning the forked tests.
Bugzilla Report 66464
+ * made sure <echoproperties> sorts the echoed properties on JDK9+ as well.
+ Bugzilla Report 66588
+
Changes from Ant 1.10.12 TO Ant 1.10.13
=======================================
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
index 7404bdcae..2eb91820d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
@@ -359,16 +359,12 @@ public class EchoProperties extends Task {
@Override
public Set<Map.Entry<Object, Object>> entrySet() {
- Set<Map.Entry<Object, Object>> result = super.entrySet();
- if (JavaEnvUtils.isKaffe()) {
Set<Map.Entry<Object, Object>> t =
new TreeSet<>(Comparator.comparing(
((Function<Map.Entry<Object, Object>, Object>) Map.Entry::getKey)
.andThen(Object::toString)));
- t.addAll(result);
+ t.addAll(super.entrySet());
return t;
- }
- return result;
}
};
allProps.forEach((k, v) -> props.put(String.valueOf(k), String.valueOf(v)));