camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1391335 - in /camel/trunk: components/camel-ftp/pom.xml components/camel-jsch/pom.xml components/camel-ldap/pom.xml parent/pom.xml
Date Fri, 28 Sep 2012 07:07:04 GMT
Author: bvahdat
Date: Fri Sep 28 07:07:03 2012
New Revision: 1391335

URL: http://svn.apache.org/viewvc?rev=1391335&view=rev
Log:
Downgrade back to Mina 2.0.4 as 2.0.5 not being binary compatible (see DIRMINA-908). Also
fixed the usage of a hardcoded version of Mina 2.0.x. by camel-ftp & camel-ldap.

Modified:
    camel/trunk/components/camel-ftp/pom.xml
    camel/trunk/components/camel-jsch/pom.xml
    camel/trunk/components/camel-ldap/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-ftp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1391335&r1=1391334&r2=1391335&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/pom.xml (original)
+++ camel/trunk/components/camel-ftp/pom.xml Fri Sep 28 07:07:03 2012
@@ -104,11 +104,11 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- needed by sshd server, unfortunately the current ${mina2-version} which's 2.0.5
is not binary compatible anymore! -->
+    <!-- needed by sshd server -->
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>2.0.4</version>
+      <version>${mina2-version}</version>
       <scope>test</scope>
     </dependency>
 

Modified: camel/trunk/components/camel-jsch/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/pom.xml?rev=1391335&r1=1391334&r2=1391335&view=diff
==============================================================================
--- camel/trunk/components/camel-jsch/pom.xml (original)
+++ camel/trunk/components/camel-jsch/pom.xml Fri Sep 28 07:07:03 2012
@@ -82,11 +82,11 @@
       <version>${sshd-version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- needed by sshd server, unfortunately the current ${mina2-version} which's 2.0.5
is not binary compatible anymore! -->
+    <!-- needed by sshd server -->
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>2.0.4</version>
+      <version>${mina2-version}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>

Modified: camel/trunk/components/camel-ldap/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ldap/pom.xml?rev=1391335&r1=1391334&r2=1391335&view=diff
==============================================================================
--- camel/trunk/components/camel-ldap/pom.xml (original)
+++ camel/trunk/components/camel-ldap/pom.xml Fri Sep 28 07:07:03 2012
@@ -71,11 +71,10 @@
             <version>${apacheds-version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- Apache DS uses Mina 2.0.0 for testing -->
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
-            <version>2.0.0</version>
+            <version>${mina2-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1391335&r1=1391334&r2=1391335&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Sep 28 07:07:03 2012
@@ -205,7 +205,7 @@
     <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
     <mina-bundle-version>1.1.7_6</mina-bundle-version>
     <mina-version>1.1.7</mina-version>
-    <mina2-version>2.0.5</mina2-version>
+    <mina2-version>2.0.4</mina2-version>
     <mockito-version>1.9.0</mockito-version>
     <mongo-java-driver-version>2.7.3</mongo-java-driver-version>
     <mqtt-client-version>1.2</mqtt-client-version>



Mime
View raw message