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/08/20 08:02:06 UTC
svn commit: r1515708 - /cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml
Author: dkulp
Date: Tue Aug 20 06:02:05 2013
New Revision: 1515708
URL: http://svn.apache.org/r1515708
Log:
Merged revisions 1515707 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1515707 | dkulp | 2013-08-20 02:00:10 -0400 (Tue, 20 Aug 2013) | 4 lines
Revert "Merged revisions 1515486 via git cherry-pick from"
This reverts commit 0b7f8ad699443b56b8364c7e5ba614e71b7ea40e.
........
Modified:
cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml
Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml?rev=1515708&r1=1515707&r2=1515708&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml Tue Aug 20 06:02:05 2013
@@ -34,7 +34,8 @@
<cxf.osgi.import>
javax.activation;version="${cxf.osgi.javax.activation.version}",
javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
- javax.xml.stream*;version="${cxf.osgi.javax.stream.version}"
+ javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
+ com.sun.tools*;resolution:=optional,
</cxf.osgi.import>
</properties>
<build>
@@ -115,6 +116,10 @@
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <dependency>
<groupId>${cxf.asm.groupId}</groupId>
<artifactId>${cxf.asm.artifactId}</artifactId>
<optional>true</optional>