You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/05/04 04:56:34 UTC
svn commit: r1479032 - /cxf/branches/2.7.x-fixes/parent/pom.xml
Author: dkulp
Date: Sat May 4 02:56:34 2013
New Revision: 1479032
URL: http://svn.apache.org/r1479032
Log:
Fix bad merge
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=1479032&r1=1479031&r2=1479032&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Sat May 4 02:56:34 2013
@@ -102,13 +102,9 @@
<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>