From 15c0c0edebc8980dfa3d64f507962f7b822d0fdc Mon Sep 17 00:00:00 2001

From: Stanislav Ochotnicky <sochotnicky@redhat.com>

Date: Thu, 30 Jul 2020 15:35:08 +0200

Subject: [PATCH 0/8] Remove avalon-logkit

---

 pom.xml                                                     | 6 ------

 .../apache/velocity/runtime/defaults/velocity.properties    | 4 ++--

 src/java/org/apache/velocity/runtime/log/LogManager.java    | 2 +-

 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml

index 77a8e38..f453208 100644

--- a/pom.xml

+++ b/pom.xml

@@ -196,12 +196,6 @@

       <version>2.3</version>

       <scope>provided</scope>

     </dependency>

-    <dependency>

-      <groupId>logkit</groupId>

-      <artifactId>logkit</artifactId>

-      <version>2.0</version>

-      <scope>provided</scope>

-    </dependency>

     <dependency>

       <groupId>ant</groupId>

       <artifactId>ant</artifactId>

diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties

index 750a59a..7fac119 100644

--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties

+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties

@@ -20,10 +20,10 @@

 # ----------------------------------------------------------------------------

 # ----------------------------------------------------------------------------

-#  default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute

+#  default LogChute to use: default: JdkLogChute

 # ----------------------------------------------------------------------------

-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute

+runtime.log.logsystem.class = org.apache.velocity.runtime.log.JdkLogChute

 # ---------------------------------------------------------------------------

 # This is the location of the Velocity Runtime log.

-- 

2.26.2