svn commit: r1583196 - in /tiles/request/branches/TREQ_1_0_X: ./ tiles-request-api/ tiles-request-freemarker/ tiles-request-jsp/ tiles-request-portlet-wildcard/ tiles-request-portlet/ tiles-request-servlet-wildcard/

mck Sun, 30 Mar 2014 13:41:24 -0700

Author: mck
Date: Sun Mar 30 20:40:08 2014
New Revision: 1583196

URL: http://svn.apache.org/r1583196
Log:
clean up slf4j dependencies
 - tiles should declare slf4j-api as depedency to be included transitively 
since its code references it,
 - tiles should not declare at all any slf4j implementation dependency in 
compile or runtime scope,
 - include in all test scopes sl4j-simple


Modified:
    tiles/request/branches/TREQ_1_0_X/pom.xml
    tiles/request/branches/TREQ_1_0_X/tiles-request-api/pom.xml
    tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/pom.xml
    tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/pom.xml
    tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml
    tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/pom.xml
    tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/pom.xml

Modified: tiles/request/branches/TREQ_1_0_X/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/pom.xml (original)
+++ tiles/request/branches/TREQ_1_0_X/pom.xml Sun Mar 30 20:40:08 2014
@@ -168,7 +168,7 @@ under the License.
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-jdk14</artifactId>
+                <artifactId>slf4j-api</artifactId>
                 <version>1.5.8</version>
             </dependency>
             <dependency>
@@ -289,6 +289,14 @@ under the License.
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.5.8</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
     <profiles>
         <profile>
             <id>apache-release</id>

Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-api/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-api/pom.xml (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-api/pom.xml Sun Mar 30 
20:40:08 2014
@@ -34,8 +34,7 @@ under the License.
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <optional>true</optional>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/pom.xml 
(original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/pom.xml Sun Mar 
30 20:40:08 2014
@@ -49,11 +49,10 @@ under the License.
                <artifactId>servlet-api</artifactId>
                <scope>provided</scope>
        </dependency>
-       <dependency>
-               <groupId>org.slf4j</groupId>
-               <artifactId>slf4j-jdk14</artifactId>
-               <optional>true</optional>
-       </dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+    </dependency>
        <dependency>
                <groupId>junit</groupId>
                <artifactId>junit</artifactId>

Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/pom.xml (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/pom.xml Sun Mar 30 
20:40:08 2014
@@ -40,11 +40,10 @@ under the License.
                        <groupId>org.apache.tiles</groupId>
                        <artifactId>tiles-request-servlet</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-jdk14</artifactId>
-                       <optional>true</optional>
-               </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>servlet-api</artifactId>

Modified: 
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml 
(original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/pom.xml 
Sun Mar 30 20:40:08 2014
@@ -83,11 +83,9 @@
       <artifactId>jcl-over-slf4j</artifactId>
       <optional>true</optional>
     </dependency>
-
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <optional>true</optional>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
     </dependency>
 
 

Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/pom.xml (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/pom.xml Sun Mar 30 
20:40:08 2014
@@ -73,9 +73,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <optional>true</optional>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
     </dependency>
 
     <dependency>

Modified: 
tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/pom.xml
URL: 
http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/pom.xml?rev=1583196&r1=1583195&r2=1583196&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/pom.xml 
(original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/pom.xml 
Sun Mar 30 20:40:08 2014
@@ -67,9 +67,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <optional>true</optional>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

svn commit: r1583196 - in /tiles/request/branches/TREQ_1_0_X: ./ tiles-request-api/ tiles-request-freemarker/ tiles-request-jsp/ tiles-request-portlet-wildcard/ tiles-request-portlet/ tiles-request-servlet-wildcard/

Reply via email to