Return-Path: 
 <camel-commits-return-955-apmail-activemq-camel-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org
Received: (qmail 29716 invoked from network); 26 Sep 2007 12:00:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 26 Sep 2007 12:00:14 -0000
Received: (qmail 16108 invoked by uid 500); 26 Sep 2007 12:00:04 -0000
Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org
Received: (qmail 16087 invoked by uid 500); 26 Sep 2007 12:00:04 -0000
Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:camel-commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:camel-commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:camel-commits@activemq.apache.org>
List-Id: <camel-commits.activemq.apache.org>
Reply-To: camel-dev@activemq.apache.org
Delivered-To: mailing list camel-commits@activemq.apache.org
Received: (qmail 16072 invoked by uid 99); 26 Sep 2007 12:00:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2007 05:00:04 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2007 12:02:30 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 85D041A9838; Wed, 26 Sep 2007 04:59:51 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r579621 - in /activemq/camel/trunk:
 components/camel-cxf/pom.xml
 pom.xml
Date: Wed, 26 Sep 2007 11:59:50 -0000
To: camel-commits@activemq.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070926115951.85D041A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Wed Sep 26 04:59:50 2007
New Revision: 579621

URL: http://svn.apache.org/viewvc?rev=579621&view=rev
Log:
applied patch for https://issues.apache.org/activemq/browse/CAMEL-157

Modified:
    activemq/camel/trunk/components/camel-cxf/pom.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=579621&r1=579620&r2=579621&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Wed Sep 26 04:59:50 2007
@@ -163,21 +163,21 @@
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-core</artifactId>
-       <version>2.0.5</version>
+       <version>${spring-version}</version>
        <scope>test</scope>
     </dependency>
 
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-beans</artifactId>
-       <version>2.0.5</version>
+       <version>${spring-version}</version>
        <scope>test</scope>
      </dependency>
     
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-context</artifactId>
-       <version>2.0.5</version>
+       <version>${spring-version}</version>
        <scope>test</scope>
      </dependency>
 
@@ -185,7 +185,7 @@
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-web</artifactId>
-       <version>2.0.5</version>
+       <version>${spring-version}</version>
        <scope>test</scope>
      </dependency>
 

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=579621&r1=579620&r2=579621&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Wed Sep 26 04:59:50 2007
@@ -37,6 +37,7 @@
     <camel-version>1.1-SNAPSHOT</camel-version>
     <compiler.fork>false</compiler.fork>
     <cxf-version>2.0.1-incubator</cxf-version>
+    <spring-version>2.0.6</spring-version>
     <jetty-version>6.1.5</jetty-version>
     <m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
     <openjpa-version>0.9.6-incubating</openjpa-version>
@@ -512,7 +513,7 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
-        <version>2.0.5</version>
+        <version>${spring-version}</version>
         <exclusions>
           <exclusion>
             <groupId>javax.mail</groupId>
@@ -542,10 +543,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-remoting</artifactId>
           </exclusion>
-          <!--exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-          </exclusion-->
         </exclusions>
       </dependency>