Updated Branches: refs/heads/trunk e31b515f3 -> 220885fbe
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/mina into trunk Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/220885fb Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/220885fb Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/220885fb Branch: refs/heads/trunk Commit: 220885fbe22a7f5e0562447b5f4629cf2122a25a Parents: 6aa1544 e31b515 Author: jvermillard <jvermill...@apache.org> Authored: Mon Jan 28 20:46:36 2013 +0100 Committer: jvermillard <jvermill...@apache.org> Committed: Mon Jan 28 20:46:36 2013 +0100 ---------------------------------------------------------------------- .../org/apache/mina/core/BenchmarkBinaryTest.java | 2 +- ...ina3ClientVsMina3ServerBenchmarkBinaryTest.java | 2 +- ...MinaClientVsNettyServerBenchmarkBinaryTest.java | 2 +- .../org/apache/mina/core/NettyBenchmarkServer.java | 14 +++- ...NettyClientVsMinaServerBenchmarkBinaryTest.java | 2 +- ...ettyClientVsNettyServerBenchmarkBinaryTest.java | 2 +- core/pom.xml | 11 ++- .../org/apache/mina/session/AbstractIoSession.java | 2 + .../transport/tcp/NioTcpClientReleaseTest.java | 82 +++++++++++++++ pom.xml | 19 +++- 10 files changed, 127 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/220885fb/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index 7e75056,3530b59..0039e65 --- a/core/pom.xml +++ b/core/pom.xml @@@ -37,16 -37,18 +37,25 @@@ </properties> <dependencies> + <!-- put Junit in fromt because it seems Maven does not resolve correctly + hamcrest version which cause link errors since Junit 4.11 + --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mina-codec</artifactId> + <version>${project.version}</version> + <type>bundle</type> + </dependency> + + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mina/blob/220885fb/pom.xml ----------------------------------------------------------------------