Author: dkulp
Date: Mon Aug 19 16:31:57 2013
New Revision: 1515498
URL: http://svn.apache.org/r1515498
Log:
Merged revisions 1515486 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1515486 | dkulp | 2013-08-19 12:12:11 -0400 (Mon, 19 Aug 2013) | 2 lines
jaxb databinding doesn't use jaxb-xjc
........
Modified:
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/pom.xml
Modified: cxf/branches/2.7.x-fixes/rt/databinding/jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/jaxb/pom.xml?rev=1515498&r1=1515497&r2=1515498&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/databinding/jaxb/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/databinding/jaxb/pom.xml Mon Aug 19 16:31:57
2013
@@ -34,8 +34,7 @@
<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}",
- com.sun.tools*;resolution:=optional,
+ javax.xml.stream*;version="${cxf.osgi.javax.stream.version}"
</cxf.osgi.import>
</properties>
<build>
@@ -116,10 +115,6 @@
<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>
