diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2007-11-28 19:45:39 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2007-11-28 19:45:39 +0000 |
| commit | 003ba02e4e1d08f87f15e8cd616c263ccc776bff (patch) | |
| tree | 36c2773d885513b7a03f858e462f97d968675de1 /java | |
| parent | c2a5e2adaf93c23fb619a939a3aff8f600f4484d (diff) | |
| download | qpid-python-003ba02e4e1d08f87f15e8cd616c263ccc776bff.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/qpid@599116 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/common/pom.xml | 4 | ||||
| -rw-r--r-- | java/pom.xml | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/java/common/pom.xml b/java/common/pom.xml index d6a102c25e..a9ca3847f4 100644 --- a/java/common/pom.xml +++ b/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/java/pom.xml b/java/pom.xml index 6702a21623..f99b9ae488 100644 --- a/java/pom.xml +++ b/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> |