You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/06/06 14:13:46 UTC

[1/2] git commit: Bumped up the dependencies

Updated Branches:
  refs/heads/trunk f5613e6db -> cad66261d


Bumped up the dependencies


Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/d51e1b48
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/d51e1b48
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/d51e1b48

Branch: refs/heads/trunk
Commit: d51e1b48ec79c044f6067195631513a2084de05d
Parents: 0d07aad
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 6 14:10:36 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 6 14:10:36 2013 +0200

----------------------------------------------------------------------
 pom.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/d51e1b48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 77461a8..1dc8544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,11 +85,11 @@
 
   <properties>
     <!-- Dependencies versions ========================================== -->
-    <version.guava>10.0.1</version.guava>
+    <version.guava>14.0.1</version.guava>
     <version.junit>4.11</version.junit>
     <version.log4j>2.0-beta2</version.log4j>
     <version.mockito-core>1.9.5</version.mockito-core>
-    <version.slf4j.api>1.6.4</version.slf4j.api>
+    <version.slf4j.api>1.7.5</version.slf4j.api>
 
     <!-- Plugins versions =============================================== -->
     <version.findbugs.maven.plugin>2.3.2</version.findbugs.maven.plugin>

[2/2] git commit: Merge branches 'trunk' and 'trunk' of http://git-wip-us.apache.org/repos/asf/mina into trunk

Posted by el...@apache.org.
Merge branches 'trunk' and 'trunk' of http://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/cad66261
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/cad66261
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/cad66261

Branch: refs/heads/trunk
Commit: cad66261dbc8cccddba01a4b149f82750e0be12c
Parents: d51e1b4 f5613e6
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 6 14:13:33 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 6 14:13:33 2013 +0200

----------------------------------------------------------------------
 ldap/pom.xml                                       |   91 --------
 .../main/java/org/apache/mina/ldap/LdapCodec.java  |  125 -----------
 .../org/apache/mina/ldap/LdapProtocolDecoder.java  |  173 ---------------
 .../org/apache/mina/ldap/LdapProtocolEncoder.java  |   72 ------
 4 files changed, 0 insertions(+), 461 deletions(-)
----------------------------------------------------------------------