Author: ilgrosso
Date: Tue Oct 14 13:33:50 2014
New Revision: 1631758
URL: http://svn.apache.org/r1631758
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1631738-1631757
Merged /syncope/branches/1_1_X:r1631709-1631753
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1631758&r1=1631757&r2=1631758&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Oct 14 13:33:50 2014
@@ -325,7 +325,7 @@ under the License.
<aspectj.version>1.8.2</aspectj.version>
- <cxf.version>3.0.1</cxf.version>
+ <cxf.version>3.0.2</cxf.version>
<spring.version>4.0.7.RELEASE</spring.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<jackson.version>2.4.2</jackson.version>
