svn commit: r1869692 - in /turbine/core/trunk: pom.xml src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java

[gk...@apache.org]

Author: gk
Date: Tue Nov 12 11:10:25 2019
New Revision: 1869692

URL: http://svn.apache.org/viewvc?rev=1869692&view=rev
Log:
- update yauaa 5.12
- cleanup slf4j
- add debug log config props in TurbineVelocityService

Modified:
    turbine/core/trunk/pom.xml
    turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java

Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1869692&r1=1869691&r2=1869692&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue Nov 12 11:10:25 2019
@@ -955,9 +955,10 @@
       <version>1.9.4</version>
     </dependency>
     <dependency>
+      <!-- yauaa uses slf4j-api, need for log4j-slf4j-impl mapping-->
       <groupId>nl.basjes.parse.useragent</groupId>
       <artifactId>yauaa</artifactId>
-      <version>5.11</version>
+      <version>5.12</version>
     </dependency>
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
@@ -1081,7 +1082,8 @@
       <artifactId>jabsorb</artifactId>
       <version>1.3.2</version>
       <optional>true</optional>
-      <!-- requires maven version >= 3,  exclude old versions: org.slf4j:slf4j-jdk14,slf4j-api,(renamed)cl104-over-slf4j,org.mortbay.jetty:jsp-2.1, commons-httpclient:commons-httpclient,
+      <!-- requires maven version >= 3,  
+         exclude old versions: org.slf4j:slf4j-jdk14,slf4j-api,(renamed)cl104-over-slf4j,org.mortbay.jetty:jsp-2.1, commons-httpclient:commons-httpclient,
          mvn eclipse:eclipse still no wildcard exclude (mvn version 3.3.9)
       -->
       <exclusions>
@@ -1322,7 +1324,6 @@
     <fulcrum.intake>2.0.0</fulcrum.intake>
     <fulcrum.parser>2.0.1</fulcrum.parser>
     <fulcrum.security>2.0.0-SNAPSHOT</fulcrum.security>
-    <slf4j.version>1.7.26</slf4j.version>
     <dependency.check.skip>true</dependency.check.skip>
     <torque.version>4.0</torque.version>
     <jacoco.skip>true</jacoco.skip>

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=1869692&r1=1869691&r2=1869692&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java Tue Nov 12 11:10:25 2019
@@ -511,6 +511,7 @@ public class TurbineVelocityService
                 {
                     velocity.addProperty(key, value);
                 }
+                log.debug("Adding {} -> {}", key, value);
                 continue; // for()
             }