cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1424792 - in /cxf/branches/2.5.x-fixes: ./ osgi/karaf/features/src/main/resources/features.xml
Date Fri, 21 Dec 2012 02:55:44 GMT
Author: ffang
Date: Fri Dec 21 02:55:44 2012
New Revision: 1424792

URL: http://svn.apache.org/viewvc?rev=1424792&view=rev
Log:
Merged revisions 1424791 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1424791 | ffang | 2012-12-21 10:48:44 +0800 (五, 21 12 2012) | 9 lines
  
  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.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1424789
  Merged /cxf/branches/2.6.x-fixes:r1424791

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1424792&r1=1424791&r2=1424792&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml Fri Dec 21
02:55:44 2012
@@ -51,7 +51,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>
     </feature>
 



Mime
View raw message