cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1390077 - /cxf/branches/2.5.x-fixes/api/pom.xml
Date Tue, 25 Sep 2012 19:24:04 GMT
Author: dkulp
Date: Tue Sep 25 19:24:04 2012
New Revision: 1390077

URL: http://svn.apache.org/viewvc?rev=1390077&view=rev
Log:
Revert as not used on 2.5.x

Modified:
    cxf/branches/2.5.x-fixes/api/pom.xml

Modified: cxf/branches/2.5.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/pom.xml?rev=1390077&r1=1390076&r2=1390077&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/api/pom.xml Tue Sep 25 19:24:04 2012
@@ -46,31 +46,9 @@
         </dependency>
 
         <dependency>
-<<<<<<< HEAD
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
-=======
-            <groupId>${cxf.asm.groupId}</groupId>
-            <artifactId>${cxf.asm.artifactId}</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <optional>true</optional>
->>>>>>> 463bc3a... Merged revisions 1389552 via  git cherry-pick from
         </dependency>
 
         <dependency>



Mime
View raw message