camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r674148 - in /activemq/camel/trunk: ./ camel-core/ components/camel-amqp/ components/camel-atom/ components/camel-bam/ components/camel-csv/ components/camel-cxf/ components/camel-ftp/ components/camel-http/ components/camel-ibatis/ compone...
Date Sat, 05 Jul 2008 03:28:56 GMT
Author: ningjiang
Date: Fri Jul  4 20:28:54 2008
New Revision: 674148

URL: http://svn.apache.org/viewvc?rev=674148&view=rev
Log:
CAMEL-673 clean up the spring modules dependencies

Modified:
    activemq/camel/trunk/camel-core/pom.xml
    activemq/camel/trunk/components/camel-amqp/pom.xml
    activemq/camel/trunk/components/camel-atom/pom.xml
    activemq/camel/trunk/components/camel-bam/pom.xml
    activemq/camel/trunk/components/camel-csv/pom.xml
    activemq/camel/trunk/components/camel-cxf/pom.xml
    activemq/camel/trunk/components/camel-ftp/pom.xml
    activemq/camel/trunk/components/camel-http/pom.xml
    activemq/camel/trunk/components/camel-ibatis/pom.xml
    activemq/camel/trunk/components/camel-jcr/pom.xml
    activemq/camel/trunk/components/camel-jdbc/pom.xml
    activemq/camel/trunk/components/camel-jetty/pom.xml
    activemq/camel/trunk/components/camel-jhc/pom.xml
    activemq/camel/trunk/components/camel-jms/pom.xml
    activemq/camel/trunk/components/camel-josql/pom.xml
    activemq/camel/trunk/components/camel-jpa/pom.xml
    activemq/camel/trunk/components/camel-juel/pom.xml
    activemq/camel/trunk/components/camel-mail/pom.xml
    activemq/camel/trunk/components/camel-mina/pom.xml
    activemq/camel/trunk/components/camel-ognl/pom.xml
    activemq/camel/trunk/components/camel-osgi/pom.xml
    activemq/camel/trunk/components/camel-quartz/pom.xml
    activemq/camel/trunk/components/camel-rmi/pom.xml
    activemq/camel/trunk/components/camel-scala/pom.xml
    activemq/camel/trunk/components/camel-spring/pom.xml
    activemq/camel/trunk/components/camel-sql/pom.xml
    activemq/camel/trunk/components/camel-stream/pom.xml
    activemq/camel/trunk/components/camel-xmlbeans/pom.xml
    activemq/camel/trunk/components/camel-xmpp/pom.xml
    activemq/camel/trunk/components/camel-xstream/pom.xml
    activemq/camel/trunk/pom.xml
    activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml

Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Fri Jul  4 20:28:54 2008
@@ -61,7 +61,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>
@@ -90,7 +89,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: activemq/camel/trunk/components/camel-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-amqp/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-amqp/pom.xml (original)
+++ activemq/camel/trunk/components/camel-amqp/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,7 +57,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina-version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: activemq/camel/trunk/components/camel-atom/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/pom.xml (original)
+++ activemq/camel/trunk/components/camel-atom/pom.xml Fri Jul  4 20:28:54 2008
@@ -74,19 +74,17 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
   </dependencies>
-    
+
 </project>
 
 

Modified: activemq/camel/trunk/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/pom.xml (original)
+++ activemq/camel/trunk/components/camel-bam/pom.xml Fri Jul  4 20:28:54 2008
@@ -50,12 +50,10 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>javax.persistence</groupId>

Modified: activemq/camel/trunk/components/camel-csv/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-csv/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-csv/pom.xml (original)
+++ activemq/camel/trunk/components/camel-csv/pom.xml Fri Jul  4 20:28:54 2008
@@ -84,14 +84,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Fri Jul  4 20:28:54 2008
@@ -71,7 +71,6 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>${commons-io-version}</version>
     </dependency>
 
     <dependency>
@@ -224,7 +223,7 @@
 
   <build>
     <defaultGoal>install</defaultGoal>
-    
+
     <resources>
       <resource>
         <directory>src/main/resources</directory>

Modified: activemq/camel/trunk/components/camel-ftp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ftp/pom.xml Fri Jul  4 20:28:54 2008
@@ -100,14 +100,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-http/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/pom.xml (original)
+++ activemq/camel/trunk/components/camel-http/pom.xml Fri Jul  4 20:28:54 2008
@@ -58,7 +58,6 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>${commons-io-version}</version>
       <optional>false</optional>
     </dependency>
 
@@ -73,14 +72,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-ibatis/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ibatis/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ibatis/pom.xml Fri Jul  4 20:28:54 2008
@@ -50,7 +50,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ibatis</groupId>

Modified: activemq/camel/trunk/components/camel-jcr/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jcr/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jcr/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jcr/pom.xml Fri Jul  4 20:28:54 2008
@@ -6,9 +6,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,20 +64,17 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
     </dependency>
     <!-- to allow Spring annotations (jmx) to be tested -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jdbc/pom.xml Fri Jul  4 20:28:54 2008
@@ -54,7 +54,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>${spring-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -71,17 +70,15 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring-version}</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
 </project>

Modified: activemq/camel/trunk/components/camel-jetty/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jetty/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,14 +71,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-jhc/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jhc/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jhc/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,7 +71,6 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Fri Jul  4 20:28:54 2008
@@ -50,17 +50,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jms</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
-	  <version>${geronimo-spec-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
-	  <version>${geronimo-spec-version}</version>
     </dependency>
 
     <!-- testing -->
@@ -79,7 +76,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-	  <version>${spring-version}</version>
 	  <scope>test</scope>
     </dependency>
     <dependency>

Modified: activemq/camel/trunk/components/camel-josql/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-josql/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-josql/pom.xml (original)
+++ activemq/camel/trunk/components/camel-josql/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -72,14 +72,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jpa/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,12 +58,10 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
 
     <dependency>

Modified: activemq/camel/trunk/components/camel-juel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-juel/pom.xml (original)
+++ activemq/camel/trunk/components/camel-juel/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -70,14 +70,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
@@ -97,7 +95,7 @@
         <configuration>
           <childDelegation>false</childDelegation>
           <useFile>true</useFile>
-          <excludes>            
+          <excludes>
             <exclude>**/FooTest.*</exclude>
           </excludes>
         </configuration>

Modified: activemq/camel/trunk/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/pom.xml (original)
+++ activemq/camel/trunk/components/camel-mail/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
@@ -96,7 +95,7 @@
             <artifactId>commons-logging</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
     </dependencies>
 
 </project>

Modified: activemq/camel/trunk/components/camel-mina/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/pom.xml (original)
+++ activemq/camel/trunk/components/camel-mina/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
-            <version>${mina-version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -84,14 +83,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring-version}</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>

Modified: activemq/camel/trunk/components/camel-ognl/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ognl/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -70,14 +70,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,12 +50,10 @@
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
-	  <version>${spring-osgi-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix-osgi-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -115,7 +113,7 @@
         </includes>
         <filtering>true</filtering>
       </resource>
-    </resources>  
+    </resources>
     <plugins>
 
       <plugin>

Modified: activemq/camel/trunk/components/camel-quartz/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-quartz/pom.xml (original)
+++ activemq/camel/trunk/components/camel-quartz/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -75,14 +75,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-rmi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-rmi/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -55,14 +55,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-scala/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-scala/pom.xml (original)
+++ activemq/camel/trunk/components/camel-scala/pom.xml Fri Jul  4 20:28:54 2008
@@ -106,7 +106,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.4.3</version>
     </dependency>
   </dependencies>
 </project>

Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Fri Jul  4 20:28:54 2008
@@ -58,22 +58,18 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-	  <version>${spring-version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
     </dependency>
 
     <!-- for testing -->
@@ -106,7 +102,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>${spring-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: activemq/camel/trunk/components/camel-sql/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-sql/pom.xml (original)
+++ activemq/camel/trunk/components/camel-sql/pom.xml Fri Jul  4 20:28:54 2008
@@ -6,9 +6,9 @@
 	The ASF licenses this file to You under the Apache License, Version 2.0
 	(the "License"); you may not use this file except in compliance with
 	the License.  You may obtain a copy of the License at
-	
+
 	http://www.apache.org/licenses/LICENSE-2.0
-	
+
 	Unless required by applicable law or agreed to in writing, software
 	distributed under the License is distributed on an "AS IS" BASIS,
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>${spring-version}</version>
 		</dependency>
 		<!-- test dependencies -->
 		<dependency>
@@ -49,21 +48,19 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-                <!-- to allow Spring annotations (jmx) to be tested -->
-                <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                        <version>${spring-version}</version>
-                        <optional>true</optional>
-                        <scope>test</scope>
-                </dependency>
-                <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-aop</artifactId>
-                        <version>${spring-version}</version>
-                        <optional>true</optional>
-                        <scope>test</scope>
-                </dependency>
+		<!-- to allow Spring annotations (jmx) to be tested -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<optional>true</optional>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<optional>true</optional>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>

Modified: activemq/camel/trunk/components/camel-stream/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-stream/pom.xml (original)
+++ activemq/camel/trunk/components/camel-stream/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,14 +71,12 @@
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-context</artifactId>
-          <version>${spring-version}</version>
           <optional>true</optional>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-aop</artifactId>
-          <version>${spring-version}</version>
           <optional>true</optional>
           <scope>test</scope>
         </dependency>

Modified: activemq/camel/trunk/components/camel-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmlbeans/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xmlbeans/pom.xml (original)
+++ activemq/camel/trunk/components/camel-xmlbeans/pom.xml Fri Jul  4 20:28:54 2008
@@ -75,14 +75,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xmpp/pom.xml (original)
+++ activemq/camel/trunk/components/camel-xmpp/pom.xml Fri Jul  4 20:28:54 2008
@@ -7,9 +7,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,14 +63,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/components/camel-xstream/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/pom.xml (original)
+++ activemq/camel/trunk/components/camel-xstream/pom.xml Fri Jul  4 20:28:54 2008
@@ -87,14 +87,12 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring-version}</version>
       <optional>true</optional>
       <scope>test</scope>
     </dependency>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Jul  4 20:28:54 2008
@@ -621,6 +621,11 @@
         <version>${commons-dbcp-version}</version>
       </dependency>
       <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io-version}</version>
+      </dependency>
+      <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>${log4j-version}</version>
@@ -718,6 +723,42 @@
         <artifactId>spring-web</artifactId>
         <version>${spring-version}</version>       
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <version>${spring-version}</version>      
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <version>${spring-version}</version>         
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+	<version>${spring-version}</version>
+      </dependency>
+      <dependency>
+      	<groupId>org.springframework</groupId>
+      	<artifactId>spring-jms</artifactId>
+        <version>${spring-version}</version>	  
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context-support</artifactId>
+        <version>${spring-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <version>${spring-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework.osgi</groupId>
+        <artifactId>spring-osgi-core</artifactId>
+	<version>${spring-osgi-version}</version>
+      </dependency>
 
       <dependency>
         <groupId>javax.annotation</groupId>
@@ -727,6 +768,11 @@
 
       <!-- optional mina dependencies -->
       <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <version>${mina-version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
         <version>${slf4j-version}</version>

Modified: activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml?rev=674148&r1=674147&r2=674148&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-itest-spring-2.0/pom.xml Fri Jul  4 20:28:54 2008
@@ -74,23 +74,23 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-                        <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-core</artifactId>
 			<type>test-jar</type>
-                        <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-                        <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-                        <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 
 		<!-- specific Spring version to test -->
@@ -98,13 +98,13 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring</artifactId>
 			<version>2.0.8</version>
-                        <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-core</artifactId>
-                        <scope>test</scope>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>



Mime
View raw message