You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/08/28 18:08:30 UTC
svn commit: r1378198 - in /cxf/branches/2.6.x-fixes: ./
rt/databinding/jaxb/pom.xml
Author: ay
Date: Tue Aug 28 16:08:30 2012
New Revision: 1378198
URL: http://svn.apache.org/viewvc?rev=1378198&view=rev
Log:
Merged revisions 1378196 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1378196 | ay | 2012-08-28 18:01:36 +0200 (Tue, 28 Aug 2012) | 1 line
[CXF-4488] Making importing com.sun.tools* by cxf-rt-databinding-jaxb in CXF 2.6 optional
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/databinding/jaxb/pom.xml
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1378198&r1=1378197&r2=1378198&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 28 16:08:30 2012
@@ -35,6 +35,7 @@
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,
</cxf.osgi.import>
</properties>
<build>