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 2012/09/25 21:24:02 UTC
svn commit: r1390076 - /cxf/branches/2.5.x-fixes/api/pom.xml
Author: dkulp
Date: Tue Sep 25 19:24:01 2012
New Revision: 1390076
URL: http://svn.apache.org/viewvc?rev=1390076&view=rev
Log:
Merged revisions 1389587 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1389587 | dkulp | 2012-09-24 17:04:15 -0400 (Mon, 24 Sep 2012) | 10 lines
Merged revisions 1389552 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1389552 | dkulp | 2012-09-24 16:05:26 -0400 (Mon, 24 Sep 2012) | 2 lines
Update to latest log4j
........
........
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=1390076&r1=1390075&r2=1390076&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:01 2012
@@ -46,9 +46,31 @@
</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>