geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r631843 - in /geronimo/gshell/trunk: gshell-remote/pom.xml gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java pom.xml
Date Thu, 28 Feb 2008 04:39:13 GMT
Author: jdillon
Date: Wed Feb 27 20:39:12 2008
New Revision: 631843

URL: http://svn.apache.org/viewvc?rev=631843&view=rev
Log:
(GSHELL-102) Upgrade to Mina 1.1.6

Modified:
    geronimo/gshell/trunk/gshell-remote/pom.xml
    geronimo/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/pom.xml?rev=631843&r1=631842&r2=631843&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/pom.xml Wed Feb 27 20:39:12 2008
@@ -39,22 +39,6 @@
         Support for remote access in GShell.
     </description>
     
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.mina</groupId>
-                <artifactId>mina-core</artifactId>
-                <version>1.1.2</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.mina</groupId>
-                <artifactId>mina-filter-ssl</artifactId>
-                <version>1.1.2</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>

Modified: geronimo/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java?rev=631843&r1=631842&r2=631843&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
(original)
+++ geronimo/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
Wed Feb 27 20:39:12 2008
@@ -129,6 +129,10 @@
             return delegate.getSession();
         }
 
+        public Object getLock() {
+            return delegate.getLock();
+        }
+
         public void join() {
             delegate.join();
         }

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=631843&r1=631842&r2=631843&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Wed Feb 27 20:39:12 2008
@@ -163,13 +163,13 @@
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
-                <version>1.1.4</version>
+                <version>1.1.6</version>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-filter-ssl</artifactId>
-                <version>1.1.4</version>
+                <version>1.1.6</version>
             </dependency>
             
             <dependency>



Mime
View raw message