Repository: servicemix Updated Branches: refs/heads/master c9dd91785 -> cd3deb9b9
SM-2301 Problem installing activiti feature after upgrade to Camel 2.13.1 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/fb557e26 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/fb557e26 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/fb557e26 Branch: refs/heads/master Commit: fb557e2629d1fd195eb32cde1f124b2c134f7cfc Parents: c9dd917 Author: Krzysztof Sobkowiak <[email protected]> Authored: Thu May 22 22:35:36 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Thu May 22 22:35:36 2014 +0200 ---------------------------------------------------------------------- .../main/filtered-resources/etc/org.apache.karaf.features.cfg | 2 +- assembly/src/main/filtered-resources/internal.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/fb557e26/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg index 553d098..8c0494c 100644 --- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg +++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg @@ -41,7 +41,7 @@ featuresRepositories=mvn:org.apache.karaf.features/standard/${karaf.version}/xml # # Comma separated list of features to install at startup # -featuresBoot=config,standard,package,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war +featuresBoot=config,standard,package,kar,ssh,management,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war # http://git-wip-us.apache.org/repos/asf/servicemix/blob/fb557e26/assembly/src/main/filtered-resources/internal.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml index ff93b6b..7fe188b 100644 --- a/assembly/src/main/filtered-resources/internal.xml +++ b/assembly/src/main/filtered-resources/internal.xml @@ -27,4 +27,9 @@ <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle> </feature> + <!-- workaround for SM-2301 --> + <feature name="joda-time"> + <bundle start-level='10'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle> + </feature> + </features>
