Author: ffang
Date: Mon Jun 25 12:20:52 2012
New Revision: 1353489
URL: http://svn.apache.org/viewvc?rev=1353489&view=rev
Log:
Merged revisions 1353452 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1353452 | ffang | 2012-06-25 18:46:21 +0800 (δΈ€, 25 6 2012) | 1 line
[CXF-4394]should add dependency='true' for spec bundles 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/
------------------------------------------------------------------------------
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=1353489&r1=1353488&r2=1353489&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
Mon Jun 25 12:20:52 2012
@@ -43,13 +43,13 @@
<feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
<bundle
start-level='9'>mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
- <bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
+ <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'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
- <bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
- <bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${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>
<bundle
start-level='10'>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>
