geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1503881 - in /geronimo/server/branches/3.0: framework/configs/karaf-framework/pom.xml framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java pom.xml
Date Tue, 16 Jul 2013 20:55:49 GMT
Author: gawor
Date: Tue Jul 16 20:55:49 2013
New Revision: 1503881

URL: http://svn.apache.org/r1503881
Log:
GERONIMO-6481: Upgrade to Karaf 2.2.11. Based on patch from Andy McCright

Modified:
    geronimo/server/branches/3.0/framework/configs/karaf-framework/pom.xml
    geronimo/server/branches/3.0/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
    geronimo/server/branches/3.0/pom.xml

Modified: geronimo/server/branches/3.0/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/configs/karaf-framework/pom.xml?rev=1503881&r1=1503880&r2=1503881&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/branches/3.0/framework/configs/karaf-framework/pom.xml Tue Jul 16 20:55:49
2013
@@ -47,10 +47,10 @@
         <junit.version>4.7_1</junit.version>
         <log4j.version>1.2.16</log4j.version>
         <maven.version>2.0.9</maven.version>
-        <mina.version>2.0.0-RC1</mina.version>
+        <mina.version>2.0.5</mina.version>
         <pax.exam.version>1.2.2</pax.exam.version>
         <pax.runner.version>1.5.0</pax.runner.version>        
-        <sshd.version>0.5.0</sshd.version>
+        <sshd.version>0.8.0</sshd.version>
     </properties>
     
     <dependencyManagement>

Modified: geronimo/server/branches/3.0/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java?rev=1503881&r1=1503880&r2=1503881&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
(original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
Tue Jul 16 20:55:49 2013
@@ -46,10 +46,6 @@ public class StreamConsoleReader impleme
     private boolean jlineConsoleEnabled = true;
 
     public StreamConsoleReader(InputStream in, PrintStream out) {
-        this(in, new PrintWriter(out, true));
-    }
-
-    public StreamConsoleReader(InputStream in, PrintWriter out) {
         try {
             if ("jline.UnsupportedTerminal".equals(System.getProperty("jline.terminal")))
{
                 jlineConsoleReader = new jline.console.ConsoleReader(in, out, new UnsupportedTerminal());
@@ -63,7 +59,7 @@ public class StreamConsoleReader impleme
             }
             jlineConsoleEnabled = false;
             keyboard = new BufferedReader(new InputStreamReader(in));
-            console = out;
+            console = new PrintWriter(out, true);
         }
     }
 

Modified: geronimo/server/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/pom.xml?rev=1503881&r1=1503880&r2=1503881&view=diff
==============================================================================
--- geronimo/server/branches/3.0/pom.xml (original)
+++ geronimo/server/branches/3.0/pom.xml Tue Jul 16 20:55:49 2013
@@ -151,8 +151,8 @@
         <!-- OSGI properties -->
         <equinox.version>3.7.1.R37x_v20110808_1106</equinox.version>    
         <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
-        <karaf.version>2.2.1</karaf.version>
-        <karaf.osgi.version>2.2.1</karaf.osgi.version>
+        <karaf.version>2.2.11</karaf.version>
+        <karaf.osgi.version>2.2.11</karaf.osgi.version>
         <aries.blueprint.version>0.3.0.1</aries.blueprint.version>
         <aries.jmx.version>0.3</aries.jmx.version>
         <aries.util.version>0.3</aries.util.version>
@@ -1587,18 +1587,6 @@
                 <version>1.4.5</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.mina</groupId>
-                <artifactId>mina-core</artifactId>
-                <version>1.1.6</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.mina</groupId>
-                <artifactId>mina-filter-ssl</artifactId>
-                <version>1.1.7</version>
-            </dependency>
-
             <!-- archive support -->
             <!-- archiver version matches maven 2.0.7.  Upgrading maven may require upgrading
this version -->
             <dependency>
@@ -1755,7 +1743,7 @@ only found in cxf
                         <artifactId>org.apache.felix.gogo.runtime</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.sonatype.jline</groupId>
+                        <groupId>jline</groupId>
                         <artifactId>jline</artifactId>
                     </exclusion>
                     <exclusion>



Mime
View raw message