Author: coheigea
Date: Fri Mar 22 11:53:10 2013
New Revision: 1459735
URL: http://svn.apache.org/r1459735
Log:
Merging from 1.0.x
Modified:
cxf/fediz/trunk/ (props changed)
cxf/fediz/trunk/pom.xml
Propchange: cxf/fediz/trunk/
------------------------------------------------------------------------------
Merged /cxf/fediz/branches/1.0.x-fixes:r1459733
Modified: cxf/fediz/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1459735&r1=1459734&r2=1459735&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Fri Mar 22 11:53:10 2013
@@ -44,7 +44,7 @@
<junit.version>4.8.2</junit.version>
<log4j.version>1.2.15</log4j.version>
<servlet.version>2.5</servlet.version>
- <slf4j.version>1.6.5</slf4j.version>
+ <slf4j.version>1.7.2</slf4j.version>
<spring.version>3.0.7.RELEASE</spring.version>
<tomcat.version>7.0.27</tomcat.version>
<wss4j.version>1.6.9</wss4j.version>