Author: ffang Date: Sun Jan 6 01:21:46 2013 New Revision: 1429452 URL: http://svn.apache.org/viewvc?rev=1429452&view=rev Log: Merged revisions 1429451 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1429451 | ffang | 2013-01-06 09:16:13 +0800 (日, 06 1 2013) | 9 lines Merged revisions 1429450 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1429450 | ffang | 2013-01-06 09:12:45 +0800 (日, 06 1 2013) | 1 line [CXF-4731]add dependency=\'true\' for stax-api 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:r1429450 Merged /cxf/branches/2.6.x-fixes:r1429451 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=1429452&r1=1429451&r2=1429452&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 Sun Jan 6 01:21:46 2013 @@ -47,7 +47,7 @@ <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle> <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle> <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle> - <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle> + <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle> <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>
