Author: dkulp
Date: Fri May 3 15:38:31 2013
New Revision: 1478842
URL: http://svn.apache.org/r1478842
Log:
Merged revisions 1478805 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1478805 | dkulp | 2013-05-03 10:18:32 -0400 (Fri, 03 May 2013) | 2 lines
Update mina version
........
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=1478842&r1=1478841&r2=1478842&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Fri May 3 15:38:31 2013
@@ -102,8 +102,13 @@
<cxf.httpcomponents.core.version>4.2.2</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
+<<<<<<< HEAD
<cxf.mina.version>2.0.5</cxf.mina.version>
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
+=======
+ <cxf.mina.version>2.0.7</cxf.mina.version>
+
<cxf.javax.annotation-api.version>1.2-b02</cxf.javax.annotation-api.version>
+>>>>>>> e5bcb29... Update mina version
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
<cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
