Repository: servicemix Updated Branches: refs/heads/servicemix-5.1.x a464549c8 -> 77a034787
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/bfeb5ec4 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/bfeb5ec4 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/bfeb5ec4 Branch: refs/heads/servicemix-5.1.x Commit: bfeb5ec4cc020fbcc52febcc803ba5be33ce852c Parents: a464549 Author: Krzysztof Sobkowiak <[email protected]> Authored: Thu May 22 22:03:53 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Thu May 22 22:03:53 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/bfeb5ec4/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 d7c5409..e4a9d47 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 @@ -30,7 +30,7 @@ featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.v # # Comma separated list of features to install at startup # -featuresBoot=config,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war +featuresBoot=config,kar,ssh,management,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war # # Defines if the boot features are started in asynchronous mode (in a dedicated thread) http://git-wip-us.apache.org/repos/asf/servicemix/blob/bfeb5ec4/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 6c81d1d..76da7fe 100644 --- a/assembly/src/main/filtered-resources/internal.xml +++ b/assembly/src/main/filtered-resources/internal.xml @@ -26,4 +26,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>
