You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/12/21 03:48:44 UTC
svn commit: r1424791 - in /cxf/branches/2.6.x-fixes: ./
osgi/karaf/features/src/main/resources/features.xml
Author: ffang
Date: Fri Dec 21 02:48:44 2012
New Revision: 1424791
URL: http://svn.apache.org/viewvc?rev=1424791&view=rev
Log:
Merged revisions 1424789 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1424789 | ffang | 2012-12-21 10:40:13 +0800 (δΊ”, 21 12 2012) | 1 line
[CXF-4717]should add dependency='true' for javamail bundle in cxf features.xml
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1424789
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1424791&r1=1424790&r2=1424791&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml Fri Dec 21 02:48:44 2012
@@ -50,7 +50,7 @@
<bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
- <bundle start-level='10'>mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
+ <bundle start-level='10' dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>