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 2018/02/17 17:26:06 UTC
[1/6] ant git commit: port granularity fixes from master branch
Repository: ant
Updated Branches:
refs/heads/master c053271df -> 0a3b2c002
port granularity fixes from master branch
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d9f60aab
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d9f60aab
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d9f60aab
Branch: refs/heads/master
Commit: d9f60aab39ffb55d5b8efbda08b4a4f09b2dbcb2
Parents: 2a5857c
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 16:32:27 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 16:32:27 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/types/selectors/DateSelector.java | 2 +-
src/main/org/apache/tools/ant/types/selectors/MappingSelector.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d9f60aab/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
index c5ff5d5..f8db485 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
@@ -42,7 +42,7 @@ public class DateSelector extends BaseExtendSelector {
private long millis = -1;
private String dateTime = null;
private boolean includeDirs = false;
- private long granularity = 0;
+ private long granularity = FILE_UTILS.getFileTimestampGranularity();
private String pattern;
private TimeComparison when = TimeComparison.EQUAL;
http://git-wip-us.apache.org/repos/asf/ant/blob/d9f60aab/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
index 1a27494..9360740 100644
--- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
@@ -40,7 +40,7 @@ public abstract class MappingSelector extends BaseSelector {
protected File targetdir = null;
protected Mapper mapperElement = null;
protected FileNameMapper map = null;
- protected int granularity = 0;
+ protected int granularity = (int) FILE_UTILS.getFileTimestampGranularity();
// CheckStyle:VisibilityModifier ON
[5/6] ant git commit: frequency used to accept a null Collection
before Java8 refactoring
Posted by bo...@apache.org.
frequency used to accept a null Collection before Java8 refactoring
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4d0a7d5f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4d0a7d5f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4d0a7d5f
Branch: refs/heads/master
Commit: 4d0a7d5f26d031f91224cfe988db070891f12a30
Parents: 82f7d9b
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 17:03:41 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 17:03:41 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/util/CollectionUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/4d0a7d5f/src/main/org/apache/tools/ant/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java b/src/main/org/apache/tools/ant/util/CollectionUtils.java
index 70b2810..2119a9e 100644
--- a/src/main/org/apache/tools/ant/util/CollectionUtils.java
+++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java
@@ -252,7 +252,7 @@ public class CollectionUtils {
*/
@Deprecated
public static int frequency(Collection<?> c, Object o) {
- return Collections.frequency(c, o);
+ return c == null ? 0 : Collections.frequency(c, o);
}
private CollectionUtils() {
[3/6] ant git commit: move cast back after type compatibility check
Posted by bo...@apache.org.
move cast back after type compatibility check
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e8117b6d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e8117b6d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e8117b6d
Branch: refs/heads/master
Commit: e8117b6d3c38e54ac8758d8da8e886639af4fb1b
Parents: e041e2a
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 16:50:47 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 16:50:47 2018 +0100
----------------------------------------------------------------------
.../ant/types/selectors/modifiedselector/ModifiedSelector.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e8117b6d/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index 3592041..f3b33e2 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -404,13 +404,12 @@ public class ModifiedSelector extends BaseExtendSelector
clazz = Class.forName(classname);
}
- @SuppressWarnings("unchecked")
- T rv = (T) clazz.newInstance();
+ Object rv = clazz.newInstance();
if (!type.isInstance(rv)) {
throw new BuildException("Specified class (%s) %s", classname, msg);
}
- return rv;
+ return (T) rv;
} catch (ClassNotFoundException e) {
throw new BuildException("Specified class (%s) not found.", classname);
} catch (Exception e) {
[2/6] 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/e041e2ae
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e041e2ae
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e041e2ae
Branch: refs/heads/master
Commit: e041e2aefb35bafde833ea234de37eba8838149d
Parents: c053271 d9f60aa
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 16:33:21 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 16:33:21 2018 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] ant git commit: bring back early exit that was there before
Java8 refactoring
Posted by bo...@apache.org.
bring back early exit that was there before Java8 refactoring
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0a3b2c00
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0a3b2c00
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0a3b2c00
Branch: refs/heads/master
Commit: 0a3b2c002b018f6eca717e47c17bcacd881fd44c
Parents: 4d0a7d5
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 17:49:02 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 17:49:02 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0a3b2c00/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
index 6cf3962..707d154 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
@@ -222,6 +222,9 @@ public abstract class ScriptRunnerBase {
*/
public void setSrc(File file) {
String filename = file.getPath();
+ if (!file.exists()) {
+ throw new BuildException("file " + filename + " not found.");
+ }
try (InputStream in = Files.newInputStream(file.toPath())) {
final Charset charset = null == encoding ? Charset.defaultCharset()
[4/6] ant git commit: Java8 refactoring also removed null check on
mappers
Posted by bo...@apache.org.
Java8 refactoring also removed null check on mappers
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/82f7d9be
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/82f7d9be
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/82f7d9be
Branch: refs/heads/master
Commit: 82f7d9be1dddb66d9e516ef636783dd11b7bbb0b
Parents: e8117b6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 17 16:58:32 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 17 16:58:32 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/util/ChainedMapper.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/82f7d9be/src/main/org/apache/tools/ant/util/ChainedMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index cec4f2e..fcf64ae 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -36,6 +36,7 @@ public class ChainedMapper extends ContainerMapper {
// resources have a null name and users may use a mapper like
// MergeMapper to provide a name for it.
String[] result = getMappers().stream()
+ .filter(Objects::nonNull)
.reduce(new String[] { sourceFileName }, (i, m) -> Stream.of(i)
.map(m::mapFileName).filter(Objects::nonNull).flatMap(Stream::of).toArray(String[]::new),
(i, o) -> o);