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/06 12:53:57 UTC

camel git commit: [CAMEL-8448] Expose mina-2.0 instead of mina-1.1 through BOM

Repository: camel
Updated Branches:
  refs/heads/master 72c65431b -> e04efc9d6


[CAMEL-8448] Expose mina-2.0 instead of mina-1.1 through BOM


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

Branch: refs/heads/master
Commit: e04efc9d6294747d84200d4ad2e7458dc05dcfda
Parents: 72c6543
Author: Thomas Diesler <th...@jboss.com>
Authored: Fri Mar 6 10:43:22 2015 +0100
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Mar 6 19:28:28 2015 +0800

----------------------------------------------------------------------
 components/camel-ftp/pom.xml                | 1 -
 components/camel-hl7/pom.xml                | 1 -
 components/camel-jsch/pom.xml               | 1 -
 components/camel-ldap/pom.xml               | 1 -
 components/camel-mina/pom.xml               | 1 +
 components/camel-mina2/pom.xml              | 1 -
 components/camel-quickfix/pom.xml           | 1 +
 components/camel-ssh/pom.xml                | 1 -
 components/camel-xmpp/pom.xml               | 1 -
 examples/camel-example-ssh-security/pom.xml | 1 -
 examples/camel-example-ssh/pom.xml          | 1 -
 parent/pom.xml                              | 2 +-
 12 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ftp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 04cfe3b..8481361 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -126,7 +126,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina2-version}</version>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-hl7/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6153c55..a308fc3 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
-            <version>${mina2-version}</version>
             <optional>true</optional>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-jsch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index 22ddf24..0b40ecc 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -81,7 +81,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina2-version}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 6b46570..8a0951b 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -75,7 +75,6 @@
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
-            <version>${mina2-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-mina/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index 185e103..355ff9f 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -54,6 +54,7 @@
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
             </exclusions>
+            <version>${mina-version}</version>
         </dependency>
 
         <!-- testing -->

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-mina2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
index e564e3d..0770f9c 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina2/pom.xml
@@ -45,7 +45,6 @@
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
-            <version>${mina2-version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-quickfix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index cf2274e..b9c447a 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -60,6 +60,7 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
+      <version>${mina-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
index 8805b48..2118e6b 100644
--- a/components/camel-ssh/pom.xml
+++ b/components/camel-ssh/pom.xml
@@ -43,7 +43,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina2-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.sshd</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-xmpp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index e8ce810..ebf5414 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -88,7 +88,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina2-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/examples/camel-example-ssh-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-ssh-security/pom.xml b/examples/camel-example-ssh-security/pom.xml
index 0c9a450..7037ada 100644
--- a/examples/camel-example-ssh-security/pom.xml
+++ b/examples/camel-example-ssh-security/pom.xml
@@ -51,7 +51,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina2-version}</version>
     </dependency>
 
     <!-- Public Key dependencies -->

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/examples/camel-example-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-ssh/pom.xml b/examples/camel-example-ssh/pom.xml
index c974f51..4a147a4 100644
--- a/examples/camel-example-ssh/pom.xml
+++ b/examples/camel-example-ssh/pom.xml
@@ -50,7 +50,6 @@
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>${mina2-version}</version>
     </dependency>
 
     <!-- logging dependencies -->

http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e37fbaa..fefc5ef 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2155,7 +2155,7 @@
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
-        <version>${mina-version}</version>
+        <version>${mina2-version}</version>
       </dependency>
 
       <dependency>


Re: camel git commit: [CAMEL-8448] Expose mina-2.0 instead of mina-1.1 through BOM

Posted by Claus Ibsen <cl...@gmail.com>.
Hi

Okay I fixed this by upgrading camel-syslog to use camel-mina2 for testing.

On Fri, Mar 6, 2015 at 5:55 PM, Claus Ibsen <cl...@gmail.com> wrote:
> Hi
>
> I think this commit broke the mina related unit tests such as in
> camel-syslog etc.
>
> Test Result (10 failures / -20)
>
> org.apache.camel.component.disruptor.BasicDisruptorComponentTest.testMultipleConsumers
> org.apache.camel.component.hdfs.HdfsConsumerTest.testReadWithReadSuffix
> org.apache.camel.component.hdfs2.HdfsConsumerTest.testReadWithReadSuffix
> org.apache.camel.component.jms.JmsRequestReplyTempQueueMultipleConsumersTest.testTempQueueRefreshed
> org.apache.camel.component.mina.MinaClientModeTcpTextlineDelimiterTest.testMinaRoute
> org.apache.camel.component.netty4.NettyUdpConnectedSendTest.sendBodyWithoutReceiver
> org.apache.camel.component.syslog.AutomatedConversionTest.testSendingRawUDP
> org.apache.camel.component.syslog.MinaDataFormatTest.testSendingRawUDP
> org.apache.camel.component.syslog.MinaManyUDPMessagesTest.testSendingManyMessages
> org.apache.camel.component.syslog.SyslogSpringMinaTest.testSendingRawUDP
>
> On Fri, Mar 6, 2015 at 12:53 PM,  <ni...@apache.org> wrote:
>> Repository: camel
>> Updated Branches:
>>   refs/heads/master 72c65431b -> e04efc9d6
>>
>>
>> [CAMEL-8448] Expose mina-2.0 instead of mina-1.1 through BOM
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e04efc9d
>> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e04efc9d
>> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e04efc9d
>>
>> Branch: refs/heads/master
>> Commit: e04efc9d6294747d84200d4ad2e7458dc05dcfda
>> Parents: 72c6543
>> Author: Thomas Diesler <th...@jboss.com>
>> Authored: Fri Mar 6 10:43:22 2015 +0100
>> Committer: Willem Jiang <wi...@gmail.com>
>> Committed: Fri Mar 6 19:28:28 2015 +0800
>>
>> ----------------------------------------------------------------------
>>  components/camel-ftp/pom.xml                | 1 -
>>  components/camel-hl7/pom.xml                | 1 -
>>  components/camel-jsch/pom.xml               | 1 -
>>  components/camel-ldap/pom.xml               | 1 -
>>  components/camel-mina/pom.xml               | 1 +
>>  components/camel-mina2/pom.xml              | 1 -
>>  components/camel-quickfix/pom.xml           | 1 +
>>  components/camel-ssh/pom.xml                | 1 -
>>  components/camel-xmpp/pom.xml               | 1 -
>>  examples/camel-example-ssh-security/pom.xml | 1 -
>>  examples/camel-example-ssh/pom.xml          | 1 -
>>  parent/pom.xml                              | 2 +-
>>  12 files changed, 3 insertions(+), 10 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ftp/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
>> index 04cfe3b..8481361 100644
>> --- a/components/camel-ftp/pom.xml
>> +++ b/components/camel-ftp/pom.xml
>> @@ -126,7 +126,6 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> -      <version>${mina2-version}</version>
>>        <scope>test</scope>
>>      </dependency>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-hl7/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
>> index 6153c55..a308fc3 100644
>> --- a/components/camel-hl7/pom.xml
>> +++ b/components/camel-hl7/pom.xml
>> @@ -56,7 +56,6 @@
>>          <dependency>
>>              <groupId>org.apache.mina</groupId>
>>              <artifactId>mina-core</artifactId>
>> -            <version>${mina2-version}</version>
>>              <optional>true</optional>
>>          </dependency>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-jsch/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
>> index 22ddf24..0b40ecc 100644
>> --- a/components/camel-jsch/pom.xml
>> +++ b/components/camel-jsch/pom.xml
>> @@ -81,7 +81,6 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> -      <version>${mina2-version}</version>
>>      </dependency>
>>      <dependency>
>>        <groupId>org.bouncycastle</groupId>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ldap/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
>> index 6b46570..8a0951b 100644
>> --- a/components/camel-ldap/pom.xml
>> +++ b/components/camel-ldap/pom.xml
>> @@ -75,7 +75,6 @@
>>          <dependency>
>>              <groupId>org.apache.mina</groupId>
>>              <artifactId>mina-core</artifactId>
>> -            <version>${mina2-version}</version>
>>              <scope>test</scope>
>>          </dependency>
>>          <dependency>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-mina/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
>> index 185e103..355ff9f 100644
>> --- a/components/camel-mina/pom.xml
>> +++ b/components/camel-mina/pom.xml
>> @@ -54,6 +54,7 @@
>>                      <artifactId>slf4j-api</artifactId>
>>                  </exclusion>
>>              </exclusions>
>> +            <version>${mina-version}</version>
>>          </dependency>
>>
>>          <!-- testing -->
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-mina2/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
>> index e564e3d..0770f9c 100644
>> --- a/components/camel-mina2/pom.xml
>> +++ b/components/camel-mina2/pom.xml
>> @@ -45,7 +45,6 @@
>>          <dependency>
>>              <groupId>org.apache.mina</groupId>
>>              <artifactId>mina-core</artifactId>
>> -            <version>${mina2-version}</version>
>>              <exclusions>
>>                  <exclusion>
>>                      <groupId>org.slf4j</groupId>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-quickfix/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
>> index cf2274e..b9c447a 100644
>> --- a/components/camel-quickfix/pom.xml
>> +++ b/components/camel-quickfix/pom.xml
>> @@ -60,6 +60,7 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> +      <version>${mina-version}</version>
>>        <scope>test</scope>
>>      </dependency>
>>      <dependency>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ssh/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
>> index 8805b48..2118e6b 100644
>> --- a/components/camel-ssh/pom.xml
>> +++ b/components/camel-ssh/pom.xml
>> @@ -43,7 +43,6 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> -      <version>${mina2-version}</version>
>>      </dependency>
>>      <dependency>
>>        <groupId>org.apache.sshd</groupId>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-xmpp/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
>> index e8ce810..ebf5414 100644
>> --- a/components/camel-xmpp/pom.xml
>> +++ b/components/camel-xmpp/pom.xml
>> @@ -88,7 +88,6 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> -      <version>${mina2-version}</version>
>>        <scope>test</scope>
>>      </dependency>
>>    </dependencies>
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/examples/camel-example-ssh-security/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/examples/camel-example-ssh-security/pom.xml b/examples/camel-example-ssh-security/pom.xml
>> index 0c9a450..7037ada 100644
>> --- a/examples/camel-example-ssh-security/pom.xml
>> +++ b/examples/camel-example-ssh-security/pom.xml
>> @@ -51,7 +51,6 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> -      <version>${mina2-version}</version>
>>      </dependency>
>>
>>      <!-- Public Key dependencies -->
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/examples/camel-example-ssh/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/examples/camel-example-ssh/pom.xml b/examples/camel-example-ssh/pom.xml
>> index c974f51..4a147a4 100644
>> --- a/examples/camel-example-ssh/pom.xml
>> +++ b/examples/camel-example-ssh/pom.xml
>> @@ -50,7 +50,6 @@
>>      <dependency>
>>        <groupId>org.apache.mina</groupId>
>>        <artifactId>mina-core</artifactId>
>> -      <version>${mina2-version}</version>
>>      </dependency>
>>
>>      <!-- logging dependencies -->
>>
>> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/parent/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/parent/pom.xml b/parent/pom.xml
>> index e37fbaa..fefc5ef 100644
>> --- a/parent/pom.xml
>> +++ b/parent/pom.xml
>> @@ -2155,7 +2155,7 @@
>>        <dependency>
>>          <groupId>org.apache.mina</groupId>
>>          <artifactId>mina-core</artifactId>
>> -        <version>${mina-version}</version>
>> +        <version>${mina2-version}</version>
>>        </dependency>
>>
>>        <dependency>
>>
>
>
>
> --
> Claus Ibsen
> -----------------
> Red Hat, Inc.
> Email: cibsen@redhat.com
> Twitter: davsclaus
> Blog: http://davsclaus.com
> Author of Camel in Action: http://www.manning.com/ibsen
> hawtio: http://hawt.io/
> fabric8: http://fabric8.io/



-- 
Claus Ibsen
-----------------
Red Hat, Inc.
Email: cibsen@redhat.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen
hawtio: http://hawt.io/
fabric8: http://fabric8.io/

Re: camel git commit: [CAMEL-8448] Expose mina-2.0 instead of mina-1.1 through BOM

Posted by Claus Ibsen <cl...@gmail.com>.
Hi

I think this commit broke the mina related unit tests such as in
camel-syslog etc.

Test Result (10 failures / -20)

org.apache.camel.component.disruptor.BasicDisruptorComponentTest.testMultipleConsumers
org.apache.camel.component.hdfs.HdfsConsumerTest.testReadWithReadSuffix
org.apache.camel.component.hdfs2.HdfsConsumerTest.testReadWithReadSuffix
org.apache.camel.component.jms.JmsRequestReplyTempQueueMultipleConsumersTest.testTempQueueRefreshed
org.apache.camel.component.mina.MinaClientModeTcpTextlineDelimiterTest.testMinaRoute
org.apache.camel.component.netty4.NettyUdpConnectedSendTest.sendBodyWithoutReceiver
org.apache.camel.component.syslog.AutomatedConversionTest.testSendingRawUDP
org.apache.camel.component.syslog.MinaDataFormatTest.testSendingRawUDP
org.apache.camel.component.syslog.MinaManyUDPMessagesTest.testSendingManyMessages
org.apache.camel.component.syslog.SyslogSpringMinaTest.testSendingRawUDP

On Fri, Mar 6, 2015 at 12:53 PM,  <ni...@apache.org> wrote:
> Repository: camel
> Updated Branches:
>   refs/heads/master 72c65431b -> e04efc9d6
>
>
> [CAMEL-8448] Expose mina-2.0 instead of mina-1.1 through BOM
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e04efc9d
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e04efc9d
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e04efc9d
>
> Branch: refs/heads/master
> Commit: e04efc9d6294747d84200d4ad2e7458dc05dcfda
> Parents: 72c6543
> Author: Thomas Diesler <th...@jboss.com>
> Authored: Fri Mar 6 10:43:22 2015 +0100
> Committer: Willem Jiang <wi...@gmail.com>
> Committed: Fri Mar 6 19:28:28 2015 +0800
>
> ----------------------------------------------------------------------
>  components/camel-ftp/pom.xml                | 1 -
>  components/camel-hl7/pom.xml                | 1 -
>  components/camel-jsch/pom.xml               | 1 -
>  components/camel-ldap/pom.xml               | 1 -
>  components/camel-mina/pom.xml               | 1 +
>  components/camel-mina2/pom.xml              | 1 -
>  components/camel-quickfix/pom.xml           | 1 +
>  components/camel-ssh/pom.xml                | 1 -
>  components/camel-xmpp/pom.xml               | 1 -
>  examples/camel-example-ssh-security/pom.xml | 1 -
>  examples/camel-example-ssh/pom.xml          | 1 -
>  parent/pom.xml                              | 2 +-
>  12 files changed, 3 insertions(+), 10 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ftp/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
> index 04cfe3b..8481361 100644
> --- a/components/camel-ftp/pom.xml
> +++ b/components/camel-ftp/pom.xml
> @@ -126,7 +126,6 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> -      <version>${mina2-version}</version>
>        <scope>test</scope>
>      </dependency>
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-hl7/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
> index 6153c55..a308fc3 100644
> --- a/components/camel-hl7/pom.xml
> +++ b/components/camel-hl7/pom.xml
> @@ -56,7 +56,6 @@
>          <dependency>
>              <groupId>org.apache.mina</groupId>
>              <artifactId>mina-core</artifactId>
> -            <version>${mina2-version}</version>
>              <optional>true</optional>
>          </dependency>
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-jsch/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
> index 22ddf24..0b40ecc 100644
> --- a/components/camel-jsch/pom.xml
> +++ b/components/camel-jsch/pom.xml
> @@ -81,7 +81,6 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> -      <version>${mina2-version}</version>
>      </dependency>
>      <dependency>
>        <groupId>org.bouncycastle</groupId>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ldap/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
> index 6b46570..8a0951b 100644
> --- a/components/camel-ldap/pom.xml
> +++ b/components/camel-ldap/pom.xml
> @@ -75,7 +75,6 @@
>          <dependency>
>              <groupId>org.apache.mina</groupId>
>              <artifactId>mina-core</artifactId>
> -            <version>${mina2-version}</version>
>              <scope>test</scope>
>          </dependency>
>          <dependency>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-mina/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
> index 185e103..355ff9f 100644
> --- a/components/camel-mina/pom.xml
> +++ b/components/camel-mina/pom.xml
> @@ -54,6 +54,7 @@
>                      <artifactId>slf4j-api</artifactId>
>                  </exclusion>
>              </exclusions>
> +            <version>${mina-version}</version>
>          </dependency>
>
>          <!-- testing -->
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-mina2/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
> index e564e3d..0770f9c 100644
> --- a/components/camel-mina2/pom.xml
> +++ b/components/camel-mina2/pom.xml
> @@ -45,7 +45,6 @@
>          <dependency>
>              <groupId>org.apache.mina</groupId>
>              <artifactId>mina-core</artifactId>
> -            <version>${mina2-version}</version>
>              <exclusions>
>                  <exclusion>
>                      <groupId>org.slf4j</groupId>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-quickfix/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
> index cf2274e..b9c447a 100644
> --- a/components/camel-quickfix/pom.xml
> +++ b/components/camel-quickfix/pom.xml
> @@ -60,6 +60,7 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> +      <version>${mina-version}</version>
>        <scope>test</scope>
>      </dependency>
>      <dependency>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-ssh/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
> index 8805b48..2118e6b 100644
> --- a/components/camel-ssh/pom.xml
> +++ b/components/camel-ssh/pom.xml
> @@ -43,7 +43,6 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> -      <version>${mina2-version}</version>
>      </dependency>
>      <dependency>
>        <groupId>org.apache.sshd</groupId>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/components/camel-xmpp/pom.xml
> ----------------------------------------------------------------------
> diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
> index e8ce810..ebf5414 100644
> --- a/components/camel-xmpp/pom.xml
> +++ b/components/camel-xmpp/pom.xml
> @@ -88,7 +88,6 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> -      <version>${mina2-version}</version>
>        <scope>test</scope>
>      </dependency>
>    </dependencies>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/examples/camel-example-ssh-security/pom.xml
> ----------------------------------------------------------------------
> diff --git a/examples/camel-example-ssh-security/pom.xml b/examples/camel-example-ssh-security/pom.xml
> index 0c9a450..7037ada 100644
> --- a/examples/camel-example-ssh-security/pom.xml
> +++ b/examples/camel-example-ssh-security/pom.xml
> @@ -51,7 +51,6 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> -      <version>${mina2-version}</version>
>      </dependency>
>
>      <!-- Public Key dependencies -->
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/examples/camel-example-ssh/pom.xml
> ----------------------------------------------------------------------
> diff --git a/examples/camel-example-ssh/pom.xml b/examples/camel-example-ssh/pom.xml
> index c974f51..4a147a4 100644
> --- a/examples/camel-example-ssh/pom.xml
> +++ b/examples/camel-example-ssh/pom.xml
> @@ -50,7 +50,6 @@
>      <dependency>
>        <groupId>org.apache.mina</groupId>
>        <artifactId>mina-core</artifactId>
> -      <version>${mina2-version}</version>
>      </dependency>
>
>      <!-- logging dependencies -->
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/e04efc9d/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index e37fbaa..fefc5ef 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -2155,7 +2155,7 @@
>        <dependency>
>          <groupId>org.apache.mina</groupId>
>          <artifactId>mina-core</artifactId>
> -        <version>${mina-version}</version>
> +        <version>${mina2-version}</version>
>        </dependency>
>
>        <dependency>
>



-- 
Claus Ibsen
-----------------
Red Hat, Inc.
Email: cibsen@redhat.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen
hawtio: http://hawt.io/
fabric8: http://fabric8.io/