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/b49d325f Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b49d325f Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b49d325f Branch: refs/heads/master Commit: b49d325fe8678afa471e4ee561240022ac27c960 Parents: 6f56918 f1d2c15 Author: Stefan Bodewig <[email protected]> Authored: Wed Oct 17 13:34:53 2018 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Wed Oct 17 13:35:03 2018 +0200 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/b49d325f/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java ---------------------------------------------------------------------- diff --cc src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java index 6f96497,e9e8f16..7763a54 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java @@@ -126,7 -126,7 +126,7 @@@ public abstract class AbstractJarSigner */ private String providerName, providerClass, providerArg; - private List<Commandline.Argument> additionalArgs = new ArrayList(); - private List<Commandline.Argument> additionalArgs = new ArrayList<Commandline.Argument>(); ++ private List<Commandline.Argument> additionalArgs = new ArrayList<>(); /** * Set the maximum memory to be used by the jarsigner process
