From 5282b0991a97203fcd3debcf62fe97cedb1ddc70 Mon Sep 17 00:00:00 2001
From: Martin Krasser <krasserm@googlemail.com>
Date: Thu, 14 Oct 2010 14:22:08 +0200
Subject: [PATCH] Upgrade to Camel 2.5-SNAPSHOT, Jetty 7.1.6.v20100715 and
 ActiveMQ 5.4.1

---
 project/build/AkkaProject.scala | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 87bbf0f3e9..dc87078172 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -88,12 +88,17 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val voldemortModuleConfig   = ModuleConfiguration("voldemort", ClojarsRepo)
   lazy val embeddedRepo            = EmbeddedRepo // This is the only exception, because the embedded repo is fast!
 
+  // -------------------------------------
+  //  TEMPORARY
+  // -------------------------------------
+  lazy val apacheSnapshots = MavenRepository("apache-snapshots", "https://repository.apache.org/content/repositories/snapshots/")
+
   // -------------------------------------------------------------------------------------------------------------------
   // Versions
   // -------------------------------------------------------------------------------------------------------------------
 
   lazy val ATMO_VERSION          = "0.6.2"
-  lazy val CAMEL_VERSION         = "2.4.0"
+  lazy val CAMEL_VERSION         = "2.5-SNAPSHOT"
   lazy val CASSANDRA_VERSION     = "0.6.1"
   lazy val DISPATCH_VERSION      = "0.7.4"
   lazy val HAWT_DISPATCH_VERSION = "1.0"
@@ -103,9 +108,9 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val SCALATEST_VERSION     = "1.2"
   lazy val LOGBACK_VERSION       = "0.9.24"
   lazy val SLF4J_VERSION         = "1.6.0"
-  lazy val SPRING_VERSION        = "3.0.3.RELEASE"
+  lazy val SPRING_VERSION        = "3.0.4.RELEASE"
   lazy val ASPECTWERKZ_VERSION   = "2.2.2"
-  lazy val JETTY_VERSION         = "7.1.4.v20100610"
+  lazy val JETTY_VERSION         = "7.1.6.v20100715"
 
   // -------------------------------------------------------------------------------------------------------------------
   // Dependencies
@@ -773,12 +778,12 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
         </dependency>
         <dependency org="org.apache.geronimo.specs" name="geronimo-servlet_2.5_spec" rev="1.1.1">
         </dependency>
-        <dependency org="org.apache.camel" name="camel-jetty" rev="2.4.0.1">
+        <dependency org="org.apache.camel" name="camel-jetty" rev={CAMEL_VERSION}>
           <exclude module="geronimo-servlet_2.4_spec"/>
         </dependency>
         <dependency org="org.apache.camel" name="camel-jms" rev={CAMEL_VERSION}>
         </dependency>
-        <dependency org="org.apache.activemq" name="activemq-core" rev="5.3.2">
+        <dependency org="org.apache.activemq" name="activemq-core" rev="5.4.1">
         </dependency>
       </dependencies>