You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/08 09:56:03 UTC
svn commit: r1406961 - in /camel/trunk: parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Thu Nov 8 08:56:02 2012
New Revision: 1406961
URL: http://svn.apache.org/viewvc?rev=1406961&view=rev
Log:
Fixed OSGi features to validate
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1406961&r1=1406960&r2=1406961&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Nov 8 08:56:02 2012
@@ -168,6 +168,7 @@
<isorelax-version>20050913</isorelax-version>
<jini-version>2.1</jini-version>
<jackson-version>1.9.10</jackson-version>
+ <jackson2-version>2.1.0</jackson2-version>
<jackrabbit-version>2.2.12</jackrabbit-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasypt-bundle-version>1.9.0_1</jasypt-bundle-version>
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=1406961&r1=1406960&r2=1406961&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Nov 8 08:56:02 2012
@@ -102,13 +102,14 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle>
</feature>
- <!-- camel-cmis doesn't work yet -->
+<!-- TODO: camel-cmis doesn't work yet
<feature name='camel-cmis' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-specs</feature>
<bundle dependency='true'>mvn:org.apache.chemistry.opencmis/chemistry-opencmis-osgi-client/${cmis-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cmis/${project.version}</bundle>
</feature>
+-->
<feature name='camel-crypto' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
@@ -287,10 +288,10 @@
<feature>http</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guava/${google-guava-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-smile/${jackson-version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle>
<bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.regexp/${regexp-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch-bundle-version}</bundle>
@@ -767,6 +768,7 @@
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
<feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
<feature version='[3,4)'>spring-web</feature>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
@@ -775,6 +777,7 @@
<bundle>mvn:org.apache.camel/camel-spring-security/${project.version}</bundle>
</feature>
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
<bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>