Author: gk
Date: Thu Aug 10 10:14:53 2017
New Revision: 1804655
URL: http://svn.apache.org/viewvc?rev=1804655&view=rev
Log:
- use log4j-over-slf4j, remove log4j + slf4j-log4j12 dependency
Modified:
turbine/core/trunk/pom.xml
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1804655&r1=1804654&r2=1804655&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Aug 10 10:14:53 2017
@@ -980,26 +980,26 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.10</version>
+ <version>${slf4j.version}</version>
<optional>true</optional>
</dependency>
- <dependency> <!-- delegate slf4j to log4j -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.10</version>
- <optional>true</optional>
+ <dependency><!-- redirect log4j to slf4j -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency> <!-- redirect JCL to slf4j -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.10</version>
+ <version>${slf4j.version}</version>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
@@ -1092,6 +1092,7 @@
<properties>
<!-- TODO: Change for release -->
<turbine.site.path>turbine/development/turbine-4.0</turbine.site.path>
+ <slf4j.version>1.7.25</slf4j.version>
</properties>
</project>
