diff --git a/akka-camel/src/test/scala/CamelContextLifecycleTest.scala b/akka-camel/src/test/scala/CamelContextLifecycleTest.scala
index b8caea0805..cf558ec8d9 100644
--- a/akka-camel/src/test/scala/CamelContextLifecycleTest.scala
+++ b/akka-camel/src/test/scala/CamelContextLifecycleTest.scala
@@ -13,7 +13,9 @@ class CamelContextLifecycleTest extends JUnitSuite with CamelContextLifecycle {
     init(ctx)
     assert(context.isStreamCaching === true)
     assert(!context.asInstanceOf[TestCamelContext].isStarted)
-    assert(!template.asInstanceOf[DefaultProducerTemplate].isStarted)
+    // In Camel 2.3 CamelComtext.createProducerTemplate starts
+    // the template before returning it (wasn't started in 2.2)
+    assert(template.asInstanceOf[DefaultProducerTemplate].isStarted)
     start
     assert(context.asInstanceOf[TestCamelContext].isStarted)
     assert(template.asInstanceOf[DefaultProducerTemplate].isStarted)
diff --git a/akka-samples/akka-sample-camel/src/main/scala/Boot.scala b/akka-samples/akka-sample-camel/src/main/scala/Boot.scala
index 810f31aba5..5b08e15a1a 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/Boot.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/Boot.scala
@@ -45,21 +45,19 @@ class Boot {
   // Publish subscribe example
 
   //
-  // Cometd example is disabled because of unresolved sbt/ivy dependency resolution issues.
-  // If you want to run this example, make sure to replace all jetty-*-6.1.22.jar files
-  //  on the classpath with corresponding jetty-*-6.1.11.jar files.
+  // Cometd example commented out because camel-cometd is broken in Camel 2.3
   //
 
-  //val cometdUri = "cometd://localhost:8111/test/abc?resourceBase=target"
-  //val cometdSubscriber = new Subscriber("cometd-subscriber", cometdUri).start
-  //val cometdPublisher = new Publisher("cometd-publisher", cometdUri).start
+  //val cometdUri = "cometd://localhost:8111/test/abc?baseResource=file:target"
+  //val cometdSubscriber = actorOf(new Subscriber("cometd-subscriber", cometdUri)).start
+  //val cometdPublisher = actorOf(new Publisher("cometd-publisher", cometdUri)).start
 
   val jmsUri = "jms:topic:test"
   val jmsSubscriber1 = actorOf(new Subscriber("jms-subscriber-1", jmsUri)).start
   val jmsSubscriber2 = actorOf(new Subscriber("jms-subscriber-2", jmsUri)).start
   val jmsPublisher =   actorOf(new Publisher("jms-publisher", jmsUri)).start
 
-  //val cometdPublisherBridge = new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/cometd", cometdPublisher).start
+  //val cometdPublisherBridge = actorOf(new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/cometd", cometdPublisher)).start
   val jmsPublisherBridge = actorOf(new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/jms", jmsPublisher)).start
 
   actorOf[Consumer4].start // POSTing "stop" to http://0.0.0.0:8877/camel/stop stops and unpublishes this actor
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 0d782c3459..daf43c2ca4 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -234,7 +234,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
   }
 
   class AkkaCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
-    val camel_core = "org.apache.camel" % "camel-core" % "2.2.0" % "compile"
+    val camel_core = "org.apache.camel" % "camel-core" % "2.3.0" % "compile"
   }
 
   class AkkaPersistenceCommonProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
@@ -337,11 +337,10 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
   }
 
   class AkkaSampleCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) {
-    val commons_codec = "commons-codec" % "commons-codec" % "1.3" % "compile"
     val spring_jms = "org.springframework" % "spring-jms" % "3.0.1.RELEASE" % "compile"
-    val camel_jetty = "org.apache.camel" % "camel-jetty" % "2.2.0" % "compile"
-    val camel_jms = "org.apache.camel" % "camel-jms" % "2.2.0" % "compile"
-    val activemq_core = "org.apache.activemq" % "activemq-core" % "5.3.0" % "compile"
+    val camel_jetty = "org.apache.camel" % "camel-jetty" % "2.3.0" % "compile"
+    val camel_jms = "org.apache.camel" % "camel-jms" % "2.3.0" % "compile"
+    val activemq_core = "org.apache.activemq" % "activemq-core" % "5.3.2" % "compile"
   }
 
   class AkkaSampleSecurityProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) {