You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2007/11/28 20:45:40 UTC

svn commit: r599116 - in /incubator/qpid/trunk/qpid/java: common/pom.xml pom.xml

Author: rajith
Date: Wed Nov 28 11:45:39 2007
New Revision: 599116

URL: http://svn.apache.org/viewvc?rev=599116&view=rev
Log:
Changed the MINA version to 1.1.5.
Now the Broker module does not compile as it seem to depend on an obselete package.
So I haev commented the broker module in the build. We can move the broker code to work with the new MINA version during the f2f.

Modified:
    incubator/qpid/trunk/qpid/java/common/pom.xml
    incubator/qpid/trunk/qpid/java/pom.xml

Modified: incubator/qpid/trunk/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/pom.xml?rev=599116&r1=599115&r2=599116&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/pom.xml Wed Nov 28 11:45:39 2007
@@ -162,12 +162,12 @@
             <version>1.4.0</version>
             <scope>test</scope>
         </dependency>
-
+<!--
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-java5</artifactId>
         </dependency>
-
+-->
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-filter-ssl</artifactId>

Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?rev=599116&r1=599115&r2=599116&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Wed Nov 28 11:45:39 2007
@@ -149,7 +149,7 @@
     <modules>
         <module>plugins</module>
         <module>common</module>
-        <module>broker</module>
+     <!--   <module>broker</module> -->
         <module>client</module>
         <module>cluster</module>
         <module>systests</module>
@@ -503,18 +503,20 @@
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-filter-ssl</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.5</version>
             </dependency>
+       <!--     
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-java5</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.5</version>
             </dependency>
+       -->  
             <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>