Repository: servicemix Updated Branches: refs/heads/servicemix-5.1.x 214ceabbe -> a464549c8
SM-2284 Intermittent test failure in CamelExamplesTest.testCamelDroolsExample Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/a464549c Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/a464549c Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/a464549c Branch: refs/heads/servicemix-5.1.x Commit: a464549c84c68c607293d3185172d17ff93b6b09 Parents: 214ceab Author: Krzysztof Sobkowiak <[email protected]> Authored: Thu May 15 19:37:14 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Thu May 15 19:37:14 2014 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/etc/org.apache.karaf.features.cfg | 2 +- assembly/src/main/filtered-resources/features.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/a464549c/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 3ae6292..d7c5409 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 @@ -20,7 +20,7 @@ # # Defines if the startlvl should be respected during feature startup. The default value is false. # -#respectStartLvlDuringFeatureStartup=false +respectStartLvlDuringFeatureStartup=true # # Comma separated list of features repositories to register by default http://git-wip-us.apache.org/repos/asf/servicemix/blob/a464549c/assembly/src/main/filtered-resources/features.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml index 34fb47a..9795021 100644 --- a/assembly/src/main/filtered-resources/features.xml +++ b/assembly/src/main/filtered-resources/features.xml @@ -92,7 +92,7 @@ <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle> </feature> - <feature name="drools" version="${drools.version}" resolver="(obr)"> + <feature name="drools" version="${drools.version}" resolver="(obr)" start-level='50'> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle> </feature>
