You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2014/03/30 23:00:18 UTC
svn commit: r1583199 - in /tiles/framework/branches/TILES_3_0_X: ./
assembly/ tiles-api/ tiles-compat/ tiles-core/ tiles-el/ tiles-extras/
tiles-freemarker/ tiles-jsp/ tiles-mvel/ tiles-ognl/ tiles-servlet/
tiles-template/ tiles-test-pom/tiles-test/ ti...
Author: mck
Date: Sun Mar 30 21:00:18 2014
New Revision: 1583199
URL: http://svn.apache.org/r1583199
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
- bump to slf4j 1.7.6
reference: http://www.slf4j.org/faq.html#maven2
Modified:
tiles/framework/branches/TILES_3_0_X/assembly/pom.xml
tiles/framework/branches/TILES_3_0_X/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-api/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-compat/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-core/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-el/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-extras/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-mvel/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-ognl/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-servlet/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-template/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml
Modified: tiles/framework/branches/TILES_3_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/assembly/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/assembly/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/assembly/pom.xml Sun Mar 30 21:00:18 2014
@@ -199,12 +199,9 @@
<type>jar</type>
</dependency>
- <!-- Optional dependencies that will be redistributed -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
- <scope>runtime</scope>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
Modified: tiles/framework/branches/TILES_3_0_X/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/pom.xml Sun Mar 30 21:00:18 2014
@@ -216,14 +216,13 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.8</version>
+ <version>1.7.6</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -316,7 +315,14 @@
<tiles.autotag.version>1.1.0</tiles.autotag.version>
</properties>
- <dependencies />
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<profiles>
<profile>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-api/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-api/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-api/pom.xml Sun Mar 30 21:00:18 2014
@@ -74,16 +74,15 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
- </dependency>
+ </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.apache.tiles</groupId>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-compat/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-compat/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-compat/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-compat/pom.xml Sun Mar 30 21:00:18 2014
@@ -89,8 +89,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-core/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-core/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-core/pom.xml Sun Mar 30 21:00:18 2014
@@ -93,8 +93,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-el/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-el/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-el/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-el/pom.xml Sun Mar 30 21:00:18 2014
@@ -61,17 +61,17 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.el; resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ org.apache.el; resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
@@ -85,8 +85,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-extras/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-extras/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-extras/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-extras/pom.xml Sun Mar 30 21:00:18 2014
@@ -110,7 +110,7 @@
<artifactId>tiles-compat</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
@@ -137,8 +137,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml Sun Mar 30 21:00:18 2014
@@ -64,8 +64,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml Sun Mar 30 21:00:18 2014
@@ -127,8 +127,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-mvel/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-mvel/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-mvel/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-mvel/pom.xml Sun Mar 30 21:00:18 2014
@@ -80,8 +80,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-ognl/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-ognl/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-ognl/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-ognl/pom.xml Sun Mar 30 21:00:18 2014
@@ -80,8 +80,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-servlet/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-servlet/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-servlet/pom.xml Sun Mar 30 21:00:18 2014
@@ -95,8 +95,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-template/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-template/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-template/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-template/pom.xml Sun Mar 30 21:00:18 2014
@@ -59,8 +59,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/pom.xml Sun Mar 30 21:00:18 2014
@@ -63,11 +63,10 @@
<version>${tiles.request.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml?rev=1583199&r1=1583198&r2=1583199&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml Sun Mar 30 21:00:18 2014
@@ -66,8 +66,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>