You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/06/20 08:22:19 UTC
svn commit: r1137515 - in /cxf/branches/2.3.x-fixes: ./
distribution/karaf/features/src/main/resources/features.xml
Author: ffang
Date: Mon Jun 20 06:22:19 2011
New Revision: 1137515
URL: http://svn.apache.org/viewvc?rev=1137515&view=rev
Log:
Merged revisions 1137512 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1137512 | ffang | 2011-06-20 14:11:13 +0800 (一, 20 6 2011) | 9 lines
Merged revisions 1137509 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1137509 | ffang | 2011-06-20 14:07:43 +0800 (一, 20 6 2011) | 1 line
[CXF-3600]add OBR resolver to karaf features descriptor
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/features.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/features.xml?rev=1137515&r1=1137514&r2=1137515&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/features.xml Mon Jun 20 06:22:19 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
<features>
- <feature name='spring' version='${cxf.spring.version}'>
+ <feature name='spring' version='${cxf.spring.version}' resolver='(obr)'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
<bundle>mvn:org.springframework/spring-asm/${cxf.spring.version}</bundle>
<bundle>mvn:org.springframework/spring-aop/${cxf.spring.version}</bundle>
@@ -27,7 +27,7 @@
<bundle>mvn:org.springframework/spring-context-support/${cxf.spring.version}</bundle>
<bundle>mvn:org.springframework/spring-expression/${cxf.spring.version}</bundle>
</feature>
- <feature name='jetty7' version='${cxf.jetty.version}'>
+ <feature name='jetty7' version='${cxf.jetty.version}' resolver='(obr)'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-util/${cxf.jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-io/${cxf.jetty.version}</bundle>
@@ -38,14 +38,14 @@
<bundle>mvn:org.eclipse.jetty/jetty-servlet/${cxf.jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-xml/${cxf.jetty.version}</bundle>
</feature>
- <feature name='jaxb' version='${jaxb-bundle-version}'>
+ <feature name='jaxb' version='${jaxb-bundle-version}' resolver='(obr)'>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
</feature>
<!-- Current the abdera bundle is not working as we expect -->
- <feature name='abdera' version='${cxf.abdera.version}'>
+ <feature name='abdera' version='${cxf.abdera.version}' resolver='(obr)'>
<bundle>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
<!--bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle-->
<bundle>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
@@ -55,7 +55,7 @@
<bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
<feature version='${jaxb-bundle-version}'>jaxb</feature>
</feature>
- <feature name='cxf-all' version='${pom.version}'>
+ <feature name='cxf-all' version='${pom.version}' resolver='(obr)'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.springframework/spring-jms/${cxf.spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>