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/03 16:37:00 UTC
[1/2] ant git commit: looks like a bad merge,
seems Jenkins doesn't build everything
Repository: ant
Updated Branches:
refs/heads/master f11bc4eaa -> 314eb433e
looks like a bad merge, seems Jenkins doesn't build everything
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/87409137
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/87409137
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/87409137
Branch: refs/heads/master
Commit: 87409137ed04aedffa31a8e831075f10de9d82e8
Parents: a390fd6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 3 16:33:40 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 3 16:33:40 2018 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/listener/Log4jListener.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/87409137/src/main/org/apache/tools/ant/listener/Log4jListener.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index 4adf796..b691300 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -34,21 +34,18 @@ import org.apache.tools.ant.Task;
@Deprecated
public class Log4jListener implements BuildListener {
- /** Indicates if the listener was initialized. */
- private final boolean initialized;
-
/**
* log category we log into
*/
public static final String LOG_ANT = "org.apache.tools.ant";
- /**
+ /**
* Construct the listener
- */
- public Log4jListener() {
+ */
+ public Log4jListener() {
// trigger the log4j initialization (if at all it's not yet initialized)
- final Logger log = Logger.getLogger(LOG_ANT);
- }
+ final Logger log = Logger.getLogger(LOG_ANT);
+ }
/**
* @see BuildListener#buildStarted
[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/314eb433
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/314eb433
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/314eb433
Branch: refs/heads/master
Commit: 314eb433eede2345a41962c0e1d4636eb26b1939
Parents: f11bc4e 8740913
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 3 17:33:09 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 3 17:33:09 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/listener/Log4jListener.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/314eb433/src/main/org/apache/tools/ant/listener/Log4jListener.java
----------------------------------------------------------------------