You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/05 13:19:16 UTC

[2/2] camel git commit: CAMEL-8441 Fixed the build error of camel-mina

CAMEL-8441 Fixed the build error of camel-mina


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f13ed8e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f13ed8e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f13ed8e9

Branch: refs/heads/master
Commit: f13ed8e9b9f94794eaeaabc55ee54e5bc4030b7a
Parents: d21dff2
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Mar 5 20:18:48 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Mar 5 20:18:48 2015 +0800

----------------------------------------------------------------------
 parent/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f13ed8e9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b07bfe..c2224ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1792,7 +1792,7 @@
         <artifactId>abdera-core</artifactId>
         <version>${abdera-version}</version>
       </dependency>
-    
+
       <!-- cxf dependencies -->
       <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -1834,7 +1834,7 @@
         <artifactId>cxf-services-ws-discovery-api</artifactId>
         <version>${cxf-version}</version>
       </dependency>
-      
+
       <!-- API -->
       <dependency>
         <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
@@ -1881,7 +1881,7 @@
         <artifactId>bsh</artifactId>
         <version>${bsh-version}</version>
       </dependency>
-      
+
       <!-- logging -->
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -1964,7 +1964,7 @@
         <artifactId>activemq-all</artifactId>
         <version>${activemq-version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
@@ -2115,7 +2115,7 @@
           <artifactId>hapi-structures-v25</artifactId>
           <version>${hapi-version}</version>
       </dependency>
-        
+
       <!-- optional disruptor dependencies -->
       <dependency>
         <groupId>com.lmax</groupId>
@@ -2153,14 +2153,14 @@
         <artifactId>lucene-queryparser</artifactId>
         <version>${lucene-version}</version>
       </dependency>
-      
+
       <!-- optional mina dependencies -->
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
-        <version>${mina2-version}</version>
+        <version>${mina-version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>