summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2007-11-28 19:45:39 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2007-11-28 19:45:39 +0000
commit051732dce020995e984323559b6d210025a1529b (patch)
tree905524681f3e4b48224f907e8825c3fc5fb563a0 /qpid/java
parent948598e7f87cebae06e55ce240ee5437a24765e1 (diff)
downloadqpid-python-051732dce020995e984323559b6d210025a1529b.tar.gz
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. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@599116 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/common/pom.xml4
-rw-r--r--qpid/java/pom.xml10
2 files changed, 8 insertions, 6 deletions
diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml
index d6a102c25e..a9ca3847f4 100644
--- a/qpid/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
@@ -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>
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index 6702a21623..f99b9ae488 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -149,7 +149,7 @@ under the License.
<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 @@ under the License.
<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>