Jonathan Anstey

AMQ-4412 - align jackson version with Camel

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461819 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5855 - Use guava 13.0.1 rather than SMX bundle

Conflicts:

parent/pom.xml

platforms/karaf/features/src/main/resources/features.xml

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1418455 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5855 - Use guava 13.0.1 rather than SMX bundle

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1418453 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5851 - upgrade to mvel 2.1.3.Final

Conflicts:

parent/pom.xml

platforms/karaf/features/src/main/resources/features.xml

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1418070 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5851 - upgrade to mvel 2.1.3.Final

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1418067 13f79535-47bb-0310-9956-ffa450edef68

AMQ-4179 - can't install activemq-extra feature

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1410325 13f79535-47bb-0310-9956-ffa450edef68

Fix CS

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1393503 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5676 - use factory rather than instance ref for custom message listener container

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1393502 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5676 - use factory rather than instance ref for custom message listener container

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1393491 13f79535-47bb-0310-9956-ffa450edef68

Fix CS

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1393441 13f79535-47bb-0310-9956-ffa450edef68

Polish shutdown code

Conflicts:

camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x@1393424 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5677 - Stopping a seda consumer leaves a thread running

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x@1393423 13f79535-47bb-0310-9956-ffa450edef68

Polish shutdown code

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x@1393411 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5677 - Stopping a seda consumer leaves a thread running

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x@1393410 13f79535-47bb-0310-9956-ffa450edef68

Polish shutdown code

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1393407 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5677 - Stopping a seda consumer leaves a thread running

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1393406 13f79535-47bb-0310-9956-ffa450edef68

Polish shutdown code

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1393404 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5677 - Stopping a seda consumer leaves a thread running

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1393403 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5676 - missed test case in 1st commit

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1393103 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5676 - Allow for custom listener container in camel-jms

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1393102 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5676 - missed test case in 1st commit

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1393100 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5676 - Allow for custom listener container in camel-jms

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1393097 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5659 - Make the buffer size in CachedOutputStream configurable

Conflicts:

camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x@1391135 13f79535-47bb-0310-9956-ffa450edef68

Fix compile error. shutdownExecutorService flag didn't exist in 2.9

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x@1391134 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5659 - Make the buffer size in CachedOutputStream configurable

Conflicts:

camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x@1391133 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5659 - Make the buffer size in CachedOutputStream configurable

Conflicts:

camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1391115 13f79535-47bb-0310-9956-ffa450edef68

CAMEL-5659 - Make the buffer size in CachedOutputStream configurable

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1391106 13f79535-47bb-0310-9956-ffa450edef68

Remove pax-exam dependencies that don't exist in the later (2.x) releases

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1382977 13f79535-47bb-0310-9956-ffa450edef68

Remove pax-exam dependencies that don't exist in the later (2.x) releases

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1382975 13f79535-47bb-0310-9956-ffa450edef68

Use smx specs version rather than hardcode jcr-api specs jar

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x@1378226 13f79535-47bb-0310-9956-ffa450edef68