cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1412440 - in /cxf/branches/2.6.x-fixes: ./ osgi/karaf/features/src/main/resources/features.xml
Date Thu, 22 Nov 2012 07:36:54 GMT
Author: ffang
Date: Thu Nov 22 07:36:53 2012
New Revision: 1412440

URL: http://svn.apache.org/viewvc?rev=1412440&view=rev
Log:
Merged revisions 1412437 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1412437 | ffang | 2012-11-22 15:17:03 +0800 (四, 22 11 2012) | 1 line
  
  [CXF-4644]shouldn't have dependency='true' for saaj-impl bundle 
........

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/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1412437

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=1412440&r1=1412439&r2=1412440&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 Thu Nov 22
07:36:53 2012
@@ -83,7 +83,7 @@
         <feature version="${project.version}">cxf-specs</feature>
         <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
-        <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
+        <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>



Mime
View raw message