From 538b7c9ffee7a18064f7726c8b20faf681adb218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mat=C3=A8rne?= <jhm@apache.org>
Date: Mon, 22 Jan 2018 11:13:32 +0100
Subject: [PATCH] deprecate Log4jListener

---
 manual/listeners.html                                    | 9 +++++++--
 .../org/apache/tools/ant/listener/Log4jListener.java     | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/manual/listeners.html b/manual/listeners.html
index 2015cd521..673106f5b 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -97,7 +97,11 @@ listeners and loggers.</p>
   <tr>
     <td width="33%"><code><a href="#Log4jListener">
     org.apache.tools.ant.listener.Log4jListener</a></code></td>
-    <td width="33%">Passes events to Log4j for highly customizable logging.</td>
+    <td width="33%">
+        Passes events to Apache Log4j for highly customizable logging.<br>
+        <b>Deprecated:</b> Apache Log4j (1) is not developed any more. Last
+        release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
+    </td>
     <td width="34%">BuildListener</td>
   </tr>
   <tr>
@@ -364,6 +368,8 @@ Background is one of the following:
 
 
 <h3><a name="Log4jListener">Log4jListener</a></h3>
+<p><b>Deprecated:</b> Apache Log4j (1) is not developed any more. Last
+release is 1.2.17 from 26-May-2012 and contains vulnerability issues.</p>
 <p>Passes build events to Log4j, using the full classname's of the generator of
 each build event as the category:</p>
 <ul>
@@ -436,7 +442,6 @@ is declared at all.</p>
 
 
 
-
 <h3><a name="TimestampedLogger">TimestampedLogger</a></h3>
 <p>
   Acts like the default logger, except that the final success/failure message also includes
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index b25ad1cf0..ad9426e68 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -28,9 +28,12 @@ import org.apache.tools.ant.Task;
 
 
 /**
- *  Listener which sends events to Log4j logging system
- *
+ * Listener which sends events to Log4j logging system.
+ * @deprecated Apache Log4j (1) is not developed any more. Last
+ *     release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
+ *     Use the standard listener or your own custom listener instead.
  */
+@Deprecated
 public class Log4jListener implements BuildListener {
 
     /**