Author: gk Date: Fri Aug 11 06:53:33 2017 New Revision: 1804753 URL: http://svn.apache.org/viewvc?rev=1804753&view=rev Log: - revert until rechecked further implications (fulcrum, webapp, dependencies)
Modified: turbine/core/trunk/pom.xml Modified: turbine/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1804753&r1=1804752&r2=1804753&view=diff ============================================================================== --- turbine/core/trunk/pom.xml (original) +++ turbine/core/trunk/pom.xml Fri Aug 11 06:53:33 2017 @@ -980,26 +980,26 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <version>1.7.10</version> <optional>true</optional> </dependency> - <dependency><!-- redirect log4j to slf4j --> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> + <dependency> <!-- delegate slf4j to log4j --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.7.10</version> + <optional>true</optional> </dependency> <dependency> <!-- redirect JCL to slf4j --> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> + <version>1.7.10</version> <optional>true</optional> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> - <optional>true</optional> - </dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> @@ -1092,7 +1092,6 @@ <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>