velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r1043116 - in /velocity/engine/trunk: WHY_FIVE_JARS.txt WHY_SIX_JARS.txt velocity-engine-uberjar/pom.xml
Date Tue, 07 Dec 2010 16:29:49 GMT
Author: apetrelli
Date: Tue Dec  7 16:29:49 2010
New Revision: 1043116

URL: http://svn.apache.org/viewvc?rev=1043116&view=rev
Log:
VELOCITY-621
Added velocity-engine-slf4j to uberjar.

Added:
    velocity/engine/trunk/WHY_SIX_JARS.txt
      - copied, changed from r1040971, velocity/engine/trunk/WHY_FIVE_JARS.txt
Removed:
    velocity/engine/trunk/WHY_FIVE_JARS.txt
Modified:
    velocity/engine/trunk/velocity-engine-uberjar/pom.xml

Copied: velocity/engine/trunk/WHY_SIX_JARS.txt (from r1040971, velocity/engine/trunk/WHY_FIVE_JARS.txt)
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/WHY_SIX_JARS.txt?p2=velocity/engine/trunk/WHY_SIX_JARS.txt&p1=velocity/engine/trunk/WHY_FIVE_JARS.txt&r1=1040971&r2=1043116&rev=1043116&view=diff
==============================================================================
--- velocity/engine/trunk/WHY_FIVE_JARS.txt (original)
+++ velocity/engine/trunk/WHY_SIX_JARS.txt Tue Dec  7 16:29:49 2010
@@ -1,7 +1,7 @@
-WHY ARE THERE TWO JARS?  WHAT'S THE DIFFERENCE?
+WHY ARE THERE SIX JARS?  WHAT'S THE DIFFERENCE?
 ===============================================
 
-We are including five jars with the Velocity distribution. This
+We are including six jars with the Velocity distribution. This
 document describes the differences and what they are intended for.
 
 All of the jars are included in the root directory of the Velocity
@@ -54,6 +54,13 @@ velocity-engine-log4j-<version>.jar
   This jar contains the Log4J Log Chute, that allows logging using Log4j.
   It needs to be used together with velocity-engine-core-<version>.jar
 
+velocity-engine-slf4j-<version>.jar
+--------------------------
+
+  This jar contains the SLF4J Log Chute, that allows logging using
+  Commons Logging.
+  It needs to be used together with velocity-engine-core-<version>.jar
+
 velocity-engine-servlet-<version>.jar
 --------------------------
 

Modified: velocity/engine/trunk/velocity-engine-uberjar/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-uberjar/pom.xml?rev=1043116&r1=1043115&r2=1043116&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-uberjar/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-uberjar/pom.xml Tue Dec  7 16:29:49 2010
@@ -28,6 +28,7 @@
                                 <includes>
                                     <include>org.apache.velocity:velocity-engine-core</include>
                                     <include>org.apache.velocity:velocity-engine-commons-logging</include>
+                                    <include>org.apache.velocity:velocity-engine-slf4j</include>
                                     <include>org.apache.velocity:velocity-engine-log4j</include>
                                     <include>org.apache.velocity:velocity-engine-servlet</include>
                                 </includes>
@@ -59,6 +60,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-slf4j</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-servlet</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>



Mime
View raw message