Hi Hadrian I just want to apologize they way I may express myself. I am not trying to attack you personally. If you read it that way - they I am really sorry. Its just that me as a person, I am very direct.
I know we are all working in the best interrest for the community. I think we should learn from this to be more careful when we cut a release. And when we are "in release mode". Willem have reverted the commit, so the code on trunk should be in good shape and ready for a re-cut of the release. In terms of Karaf 2.2.x and SMX 4.4, we should target support for that with Camel 2.8.0. The Camel 2.7.0 release was ment for ppl to try out the next JDK6/spring3/slf4j logger stuff we did. eg all the big stuff, which may in some way break or cause trouble when migrating. That allow the ppl to give early feedback to us, so we can correct it for 2.8 release. Take care. On Thu, Mar 10, 2011 at 6:24 AM, Claus Ibsen <claus.ib...@gmail.com> wrote: > Hi Hadrian > > I think this commit is bad. > > OSGi is something that can really play tricks on you! > And should have time to be throughly tested. > You can't just go around changing feature files and whatnot 5 seconds > before you build a release. > > We should wait with this upgrade for Camel 2.8. > That release is due in 6 weeks or the likes. Why not wait for that and > give proper time to test this. > > SMX 4.4 should use Camel 2.8 anyway. > > I am voting -1 on this commit. > > > On Wed, Mar 9, 2011 at 6:22 PM, <hadr...@apache.org> wrote: >> Author: hadrian >> Date: Wed Mar 9 17:22:46 2011 >> New Revision: 1079896 >> >> URL: http://svn.apache.org/viewvc?rev=1079896&view=rev >> Log: >> CAMEL-3763. Patch applied with thanks to Jean-Baptiste >> >> Modified: >> camel/trunk/platforms/karaf/features/src/main/resources/features.xml >> camel/trunk/platforms/karaf/pom.xml >> >> Modified: >> camel/trunk/platforms/karaf/features/src/main/resources/features.xml >> URL: >> http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1079896&r1=1079895&r2=1079896&view=diff >> ============================================================================== >> --- camel/trunk/platforms/karaf/features/src/main/resources/features.xml >> (original) >> +++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed >> Mar 9 17:22:46 2011 >> @@ -17,46 +17,12 @@ >> limitations under the License. >> --> >> <features> >> - <feature name='spring' version='${spring-version}'> >> - >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle> >> - <bundle>mvn:org.springframework/spring-asm/${spring-version}</bundle> >> - <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle> >> - >> <bundle>mvn:org.springframework/spring-aspects/${spring-version}</bundle> >> - <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle> >> - <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle> >> - >> <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle> >> - >> <bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle> >> - >> <bundle>mvn:org.springframework/spring-expression/${spring-version}</bundle> >> - </feature> >> - <feature name='spring-dm' version='${spring-osgi-version}'> >> - <feature version='${spring-version}'>spring</feature> >> - >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle> >> - >> <bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring-osgi-version}</bundle> >> - >> <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring-osgi-version}</bundle> >> - >> <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle> >> - >> <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle> >> - </feature> >> - <feature name='jetty7' version='${pom.version}'> >> - >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-version}</bundle> >> - >> <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty-version}</bundle> >> - <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty-version}</bundle> >> - </feature> >> - <feature name='camel' version='${pom.version}'> >> + <feature name='camel' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <feature version='${pom.version}'>camel-spring</feature> >> </feature> >> - <feature name='camel-core' version='${pom.version}'> >> - <feature version="${spring-version}">spring</feature> >> + <feature name='camel-core' version='${pom.version}' resolver='(obr)'> >> + <feature version='${spring-version}'>spring</feature> >> >> <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> >> @@ -64,7 +30,7 @@ >> >> <bundle>mvn:org.fusesource.commonman/commons-management/${commons-management-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-core/${pom.version}</bundle> >> </feature> >> - <feature name='camel-spring' version='${pom.version}'> >> + <feature name='camel-spring' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> >> <feature version='${spring-version}'>spring</feature> >> <feature version='${spring-osgi-version}'>spring-dm</feature> >> @@ -72,17 +38,16 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle> >> </feature> >> - <feature name='camel-blueprint' version='${pom.version}'> >> + <feature name='camel-blueprint' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-blueprint/${pom.version}</bundle> >> - >> <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries-blueprint-version}</bundle> >> </feature> >> - <feature name='camel-test' version='${pom.version}'> >> + <feature name='camel-test' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle> >> </feature> >> - <feature name='camel-cxf' version='${pom.version}'> >> + <feature name='camel-cxf' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> >> <bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle> >> @@ -125,54 +90,54 @@ >> <feature version='${pom.version}'>jetty7</feature> >> <bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle> >> </feature> >> - <feature name='camel-cache' version='${pom.version}'> >> + <feature name='camel-cache' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-cache/${pom.version}</bundle> >> </feature> >> - <feature name='camel-castor' version='${pom.version}'> >> + <feature name='camel-castor' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.regexp/${regexp-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-castor/${pom.version}</bundle> >> </feature> >> - <feature name='camel-crypto' version='${pom.version}'> >> + <feature name='camel-crypto' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle> >> <bundle>mvn:org.apache.camel/camel-crypto/${pom.version}</bundle> >> </feature> >> - <feature name='camel-http' version='${pom.version}'> >> + <feature name='camel-http' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> >> <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-http/${pom.version}</bundle> >> </feature> >> - <feature name='camel-http4' version='${pom.version}'> >> + <feature name='camel-http4' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> >> >> <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-http4/${pom.version}</bundle> >> </feature> >> - <feature name='camel-mina' version='${pom.version}'> >> + <feature name='camel-mina' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-mina/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jetty' version='${pom.version}'> >> + <feature name='camel-jetty' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>jetty7</feature> >> <feature version='${pom.version}'>camel-core</feature> >> <feature version='${pom.version}'>camel-http</feature> >> <bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle> >> </feature> >> - <feature name='camel-servlet' version='${pom.version}'> >> + <feature name='camel-servlet' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-http</feature> >> <bundle>mvn:org.apache.camel/camel-servlet/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jms' version='${pom.version}'> >> + <feature name='camel-jms' version='${pom.version}' resolver='(obr)'> >> <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle> >> <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle> >> <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle> >> @@ -184,11 +149,11 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jms/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jmx' version='${pom.version}'> >> + <feature name='camel-jmx' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jmx/${pom.version}</bundle> >> </feature> >> - <feature name='camel-amqp' version='${pom.version}'> >> + <feature name='camel-amqp' version='${pom.version}' resolver='(obr)'> >> <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> >> >> <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle> >> @@ -196,13 +161,13 @@ >> <feature version='${pom.version}'>camel-jms</feature> >> <bundle>mvn:org.apache.camel/camel-amqp/${pom.version}</bundle> >> </feature> >> - <feature name='camel-atom' version='${pom.version}'> >> + <feature name='camel-atom' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle> >> <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle> >> <bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle> >> </feature> >> - <feature name='camel-aws' version='${pom.version}'> >> + <feature name='camel-aws' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> >> <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle> >> @@ -211,7 +176,7 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-aws/${pom.version}</bundle> >> </feature> >> - <feature name='camel-bam' version='${pom.version}'> >> + <feature name='camel-bam' version='${pom.version}' resolver='(obr)'> >> <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle> >> <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> >> @@ -228,18 +193,18 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-bam/${pom.version}</bundle> >> </feature> >> - <feature name='camel-bean-validator' version='${pom.version}'> >> + <feature name='camel-bean-validator' version='${pom.version}' >> resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix-specs-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-bean-validator/${pom.version}</bundle> >> </feature> >> - <feature name='camel-bindy' version='${pom.version}'> >> + <feature name='camel-bindy' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-bindy/${pom.version}</bundle> >> </feature> >> - <feature name='camel-cometd' version='${pom.version}'> >> + <feature name='camel-cometd' version='${pom.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/${jetty-version}</bundle> >> <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-version}</bundle> >> @@ -253,12 +218,12 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-cometd/${pom.version}</bundle> >> </feature> >> - <feature name='camel-csv' version='${pom.version}'> >> + <feature name='camel-csv' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-csv/${pom.version}</bundle> >> </feature> >> - <feature name='camel-dozer' version='${pom.version}'> >> + <feature name='camel-dozer' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle> >> @@ -269,50 +234,50 @@ >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle> >> </feature> >> - <feature name='camel-eventadmin' version='${pom.version}'> >> + <feature name='camel-eventadmin' version='${pom.version}' >> resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-eventadmin/${pom.version}</bundle> >> </feature> >> - <feature name='camel-exec' version='${pom.version}'> >> + <feature name='camel-exec' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.commons/commons-exec/${commons-exec-version}</bundle> >> <!-- Force the commons-io version as it's specific to camel-exec --> >> <bundle>mvn:commons-io/commons-io/1.4</bundle> >> <bundle>mvn:org.apache.camel/camel-exec/${pom.version}</bundle> >> </feature> >> - <feature name='camel-flatpack' version='${pom.version}'> >> + <feature name='camel-flatpack' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-flatpack/${pom.version}</bundle> >> </feature> >> - <feature name='camel-freemarker' version='${pom.version}'> >> + <feature name='camel-freemarker' version='${pom.version}' >> resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-freemarker/${pom.version}</bundle> >> </feature> >> - <feature name='camel-ftp' version='${pom.version}'> >> + <feature name='camel-ftp' version='${pom.version}' resolver='(obr)'> >> <bundle>mvn:commons-net/commons-net/${commons-net-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle> >> </feature> >> - <feature name='camel-guice' version='${pom.version}'> >> + <feature name='camel-guice' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-guice/${pom.version}</bundle> >> </feature> >> - <feature name='camel-groovy' version='${pom.version}'> >> + <feature name='camel-groovy' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> >> <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-groovy/${pom.version}</bundle> >> </feature> >> - <feature name='camel-hl7' version='${pom.version}'> >> + <feature name='camel-hl7' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> >> @@ -325,13 +290,13 @@ >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle> >> </feature> >> - <feature name='camel-hawtdb' version='${pom.version}'> >> + <feature name='camel-hawtdb' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle> >> <bundle>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle> >> </feature> >> - <feature name='camel-ibatis' version='${pom.version}'> >> + <feature name='camel-ibatis' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> @@ -341,40 +306,40 @@ >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-ibatis/${pom.version}</bundle> >> </feature> >> - <feature name='camel-irc' version='${pom.version}'> >> + <feature name='camel-irc' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-irc/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jackson' version='${pom.version}'> >> + <feature name='camel-jackson' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> >> >> <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jackson/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jasypt' version='${pom.version}'> >> + <feature name='camel-jasypt' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jasypt/${pom.version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt-bundle-version}</bundle> >> </feature> >> - <feature name='camel-jaxb' version='${pom.version}'> >> + <feature name='camel-jaxb' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jaxb/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jcr' version='${pom.version}'> >> + <feature name='camel-jcr' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jcr/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jing' version='${pom.version}'> >> + <feature name='camel-jing' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-jing/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jibx' version='${pom.version}'> >> + <feature name='camel-jibx' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jibx/${pom.version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jibx/${jibx-bundle-version}</bundle> >> @@ -384,16 +349,16 @@ >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle> >> </feature> >> - <feature name='camel-jdbc' version='${pom.version}'> >> + <feature name='camel-jdbc' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jdbc/${pom.version}</bundle> >> </feature> >> - <feature name='camel-josql' version='${pom.version}'> >> + <feature name='camel-josql' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-josql/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jpa' version='${pom.version}'> >> + <feature name='camel-jpa' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle> >> <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle> >> @@ -411,7 +376,7 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jpa/${pom.version}</bundle> >> </feature> >> - <feature name='camel-jxpath' version='${pom.version}'> >> + <feature name='camel-jxpath' version='${pom.version}' resolver='(obr)'> >> <!-- All those bundles should be optional I think, but the >> commons-jxpath osgi metadata is not really good --> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${el-api-1.0-version}</bundle> >> @@ -422,35 +387,35 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-jxpath/${pom.version}</bundle> >> </feature> >> - <feature name='camel-juel' version='${pom.version}'> >> + <feature name='camel-juel' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-juel/${pom.version}</bundle> >> </feature> >> - <feature name='camel-kestrel' version='${pom.version}'> >> + <feature name='camel-kestrel' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spymemcached/${spymemcached-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-kestrel/${pom.version}</bundle> >> </feature> >> - <feature name='camel-ldap' version='${pom.version}'> >> + <feature name='camel-ldap' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-ldap/${pom.version}</bundle> >> </feature> >> - <feature name='camel-lucene' version='${pom.version}'> >> + <feature name='camel-lucene' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-lucene/${pom.version}</bundle> >> </feature> >> - <feature name='camel-mail' version='${pom.version}'> >> + <feature name='camel-mail' version='${pom.version}' resolver='(obr)'> >> <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle> >> >> <bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle> >> >> <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle> >> </feature> >> - <feature name='camel-msv' version='${pom.version}'> >> + <feature name='camel-msv' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> >> @@ -458,12 +423,12 @@ >> <bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle> >> <feature version='${pom.version}'>camel-spring</feature> >> </feature> >> - <feature name='camel-mvel' version='${pom.version}'> >> + <feature name='camel-mvel' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-mvel/${pom.version}</bundle> >> </feature> >> - <feature name='camel-mybatis' version='${pom.version}'> >> + <feature name='camel-mybatis' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> @@ -472,36 +437,36 @@ >> <bundle>mvn:org.mybatis/mybatis/${mybatis-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-mybatis/${pom.version}</bundle> >> </feature> >> - <feature name='camel-nagios' version='${pom.version}'> >> + <feature name='camel-nagios' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-nagios/${pom.version}</bundle> >> </feature> >> - <feature name='camel-netty' version='${pom.version}'> >> + <feature name='camel-netty' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-netty/${pom.version}</bundle> >> </feature> >> - <feature name='camel-ognl' version='${pom.version}'> >> + <feature name='camel-ognl' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle> >> </feature> >> - <feature name='camel-paxlogging' version='${pom.version}'> >> + <feature name='camel-paxlogging' version='${pom.version}' >> resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-paxlogging/${pom.version}</bundle> >> </feature> >> - <feature name='camel-printer' version='${pom.version}'> >> + <feature name='camel-printer' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-printer/${pom.version}</bundle> >> </feature> >> - <feature name='camel-protobuf' version='${pom.version}'> >> + <feature name='camel-protobuf' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-protobuf/${pom.version}</bundle> >> </feature> >> - <feature name='camel-quartz' version='${pom.version}'> >> + <feature name='camel-quartz' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle> >> <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> >> @@ -511,41 +476,41 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle> >> </feature> >> - <feature name='camel-quickfix' version='${pom.version}'> >> + <feature name='camel-quickfix' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-quickfix/${pom.version}</bundle> >> </feature> >> - <feature name='camel-restlet' version='${pom.version}'> >> + <feature name='camel-restlet' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle> >> >> <bundle>mvn:http://maven.restlet.org!org.restlet.jse/org.restlet/${restlet-version}</bundle> >> </feature> >> - <feature name='camel-rmi' version='${pom.version}'> >> + <feature name='camel-rmi' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-rmi/${pom.version}</bundle> >> </feature> >> - <feature name='camel-routebox' version='${pom.version}'> >> + <feature name='camel-routebox' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-routebox/${pom.version}</bundle> >> </feature> >> - <feature name='camel-rss' version='${pom.version}'> >> + <feature name='camel-rss' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-atom</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle> >> </feature> >> - <feature name='camel-saxon' version='${pom.version}'> >> + <feature name='camel-saxon' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle> >> </feature> >> - <feature name='camel-scala' version='${pom.version}'> >> + <feature name='camel-scala' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle> >> </feature> >> - <feature name='camel-script' version='${pom.version}'> >> + <feature name='camel-script' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-script/${pom.version}</bundle> >> @@ -555,53 +520,53 @@ >> <feature version='${pom.version}'>camel-script</feature> >> <bundle>mvn:org.jruby/jruby/${jruby-version}</bundle> >> </feature> --> >> - <feature name='camel-sip' version='${pom.version}'> >> + <feature name='camel-sip' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-sip/${pom.version}</bundle> >> </feature> >> - <feature name='camel-shiro' version='${pom.version}'> >> + <feature name='camel-shiro' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.shiro/${shiro-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-shiro/${pom.version}</bundle> >> </feature> >> - <feature name='camel-smpp' version='${pom.version}'> >> + <feature name='camel-smpp' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-smpp/${pom.version}</bundle> >> </feature> >> - <feature name='camel-snmp' version='${pom.version}'> >> + <feature name='camel-snmp' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-snmp/${pom.version}</bundle> >> </feature> >> - <feature name='camel-soap' version='${pom.version}'> >> + <feature name='camel-soap' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-jaxb</feature> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata-spec-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-soap/${pom.version}</bundle> >> </feature> >> - <feature name='camel-spring-integration' version='${pom.version}'> >> + <feature name='camel-spring-integration' version='${pom.version}' >> resolver='(obr)'> >> >> <bundle>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle> >> </feature> >> - <feature name='camel-spring-javaconfig' version='${pom.version}'> >> + <feature name='camel-spring-javaconfig' version='${pom.version}' >> resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle> >> <feature version='${pom.version}'>camel-spring</feature> >> <bundle>mvn:org.springframework/spring-test/${spring-version}</bundle> >> >> <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle> >> </feature> >> - <feature name='camel-spring-security' version='${pom.version}'> >> + <feature name='camel-spring-security' version='${pom.version}' >> resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle> >> >> <bundle>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle> >> >> <bundle>mvn:org.apache.camel/camel-spring-security/${pom.version}</bundle> >> </feature> >> - <feature name='camel-spring-ws' version='${pom.version}'> >> + <feature name='camel-spring-ws' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> >> @@ -614,33 +579,33 @@ >> >> <bundle>mvn:org.springframework.ws/spring-ws-support/${spring-ws-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-spring-ws/${pom.version}</bundle> >> </feature> >> - <feature name='camel-sql' version='${pom.version}'> >> + <feature name='camel-sql' version='${pom.version}' resolver='(obr)'> >> <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> >> <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-sql/${pom.version}</bundle> >> </feature> >> - <feature name='camel-stream' version='${pom.version}'> >> + <feature name='camel-stream' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle> >> </feature> >> - <feature name='camel-string-template' version='${pom.version}'> >> + <feature name='camel-string-template' version='${pom.version}' >> resolver='(obr)'> >> <feature version='${pom.version}'>camel-spring</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle> >> </feature> >> - <feature name='camel-syslog' version='${pom.version}'> >> + <feature name='camel-syslog' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-syslog/${pom.version}</bundle> >> </feature> >> - <feature name='camel-tagsoup' version='${pom.version}'> >> + <feature name='camel-tagsoup' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/${tagsoup-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-tagsoup/${pom.version}</bundle> >> </feature> >> - <feature name='camel-velocity' version='${pom.version}'> >> + <feature name='camel-velocity' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle> >> <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> >> >> <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> >> @@ -653,13 +618,13 @@ >> <feature version='${pom.version}'>camel-spring</feature> >> <bundle>mvn:org.apache.camel/camel-velocity/${pom.version}</bundle> >> </feature> >> - <feature name='camel-xmlbeans' version='${pom.version}'> >> + <feature name='camel-xmlbeans' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-xmlbeans/${pom.version}</bundle> >> </feature> >> - <feature name='camel-xmlsecurity' version='${pom.version}'> >> + <feature name='camel-xmlsecurity' version='${pom.version}' >> resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle> >> @@ -668,13 +633,13 @@ >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-xmlsecurity/${pom.version}</bundle> >> </feature> >> - <feature name='camel-xmpp' version='${pom.version}'> >> + <feature name='camel-xmpp' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:org.apache.camel/camel-xmpp/${pom.version}</bundle> >> </feature> >> - <feature name='camel-xstream' version='${pom.version}'> >> + <feature name='camel-xstream' version='${pom.version}' resolver='(obr)'> >> >> <bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle> >> <feature version='${pom.version}'>camel-core</feature> >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle> >> @@ -684,7 +649,7 @@ >> >> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-xstream/${pom.version}</bundle> >> </feature> >> - <feature name='camel-hazelcast' version='${pom.version}'> >> + <feature name='camel-hazelcast' version='${pom.version}' resolver='(obr)'> >> <feature version='${pom.version}'>camel-core</feature> >> <bundle>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle> >> <bundle>mvn:org.apache.camel/camel-hazelcast/${pom.version}</bundle> >> >> Modified: camel/trunk/platforms/karaf/pom.xml >> URL: >> http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=1079896&r1=1079895&r2=1079896&view=diff >> ============================================================================== >> --- camel/trunk/platforms/karaf/pom.xml (original) >> +++ camel/trunk/platforms/karaf/pom.xml Wed Mar 9 17:22:46 2011 >> @@ -34,7 +34,7 @@ >> <name>Camel :: Platforms :: Apache Karaf</name> >> >> <properties> >> - <karaf-version>2.1.4</karaf-version> >> + <karaf-version>2.2.0</karaf-version> >> </properties> >> >> <modules> >> >> >> > > > > -- > Claus Ibsen > ----------------- > FuseSource > Email: cib...@fusesource.com > Web: http://fusesource.com > Twitter: davsclaus > Blog: http://davsclaus.blogspot.com/ > Author of Camel in Action: http://www.manning.com/ibsen/ > -- Claus Ibsen ----------------- FuseSource Email: cib...@fusesource.com Web: http://fusesource.com Twitter: davsclaus Blog: http://davsclaus.blogspot.com/ Author of Camel in Action: http://www.manning.com/ibsen/
