Author: coheigea
Date: Tue Mar 26 15:11:19 2013
New Revision: 1461173
URL: http://svn.apache.org/r1461173
Log:
Merged revisions 1461168 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1461168 | coheigea | 2013-03-26 15:08:17 +0000 (Tue, 26 Mar 2013) | 2 lines
Updating to use SLF4J 1.7.5
........
Modified:
cxf/branches/2.7.x-fixes/parent/pom.xml
Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1461173&r1=1461172&r2=1461173&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Tue Mar 26 15:11:19 2013
@@ -144,6 +144,7 @@
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
+ <cxf.slf4j.version>1.7.5</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
<cxf.spring.version>3.0.7.RELEASE</cxf.spring.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
@@ -745,12 +746,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.2</version>
+ <version>${cxf.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.2</version>
+ <version>${cxf.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
