Author: dkulp
Date: Wed Oct 19 18:33:07 2011
New Revision: 1186388
URL: http://svn.apache.org/viewvc?rev=1186388&view=rev
Log:
Merged revisions 1184930 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1184930 | sergeyb | 2011-10-16 16:54:30 -0400 (Sun, 16 Oct 2011) | 1 line
Updating jsr311 api bundle version to 1.1.1
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1186388&r1=1186387&r2=1186388&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Wed Oct 19 18:33:07 2011
@@ -27,7 +27,7 @@
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.2_spec/${cxf.specs.jaxws.api.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'>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/${cxf.servicemix.specs.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>
<feature name='cxf-jaxb' version='${cxf.jaxb.bundle.version}'
resolver='(obr)'>
