diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ConsoleFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ConsoleFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ConsoleFeature.java	2009-11-26 11:15:40.000000000 +0100
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ConsoleFeature.java	2012-07-15 15:39:56.750630615 +0200
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 import java.util.EventObject;
 
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ShellFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ShellFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ShellFeature.java	2011-09-26 04:39:28.000000000 +0200
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.5/src/main/java/org/codehaus/gmaven/runtime/v1_5/ShellFeature.java	2012-07-15 15:40:12.788833499 +0200
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ConsoleFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ConsoleFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ConsoleFeature.java	2009-11-26 11:15:40.000000000 +0100
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ConsoleFeature.java	2012-07-15 15:39:17.436582896 +0200
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 import java.util.EventObject;
 
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ShellFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ShellFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ShellFeature.java	2011-09-26 04:39:28.000000000 +0200
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.6/src/main/java/org/codehaus/gmaven/runtime/v1_6/ShellFeature.java	2012-07-15 15:39:25.187198191 +0200
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ConsoleFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ConsoleFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ConsoleFeature.java	2009-11-26 11:15:40.000000000 +0100
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ConsoleFeature.java	2012-07-15 15:38:40.830398513 +0200
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 import java.util.EventObject;
 
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ShellFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ShellFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ShellFeature.java	2011-09-26 04:39:28.000000000 +0200
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.7/src/main/java/org/codehaus/gmaven/runtime/v1_7/ShellFeature.java	2012-07-15 15:38:49.949946413 +0200
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ConsoleFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ConsoleFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ConsoleFeature.java	2011-09-23 05:47:35.000000000 +0200
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ConsoleFeature.java	2012-07-15 15:38:15.025676905 +0200
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 import java.util.EventObject;
 
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ShellFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ShellFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ShellFeature.java	2011-09-26 04:39:28.000000000 +0200
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-1.8/src/main/java/org/codehaus/gmaven/runtime/v1_8/ShellFeature.java	2012-07-15 15:37:56.860576046 +0200
@@ -28,7 +28,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ConsoleFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ConsoleFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ConsoleFeature.java	2011-12-13 06:21:47.000000000 +0100
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ConsoleFeature.java	2012-07-15 15:37:17.466523317 +0200
@@ -22,7 +22,7 @@
 import org.codehaus.gmaven.feature.support.FeatureSupport;
 import org.codehaus.gmaven.runtime.Console;
 import org.codehaus.gmaven.runtime.support.util.NoExitSecurityManager;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 import java.util.EventObject;
 
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ShellFeature.java gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ShellFeature.java
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ShellFeature.java	2011-12-13 06:21:47.000000000 +0100
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-2.0/src/main/java/org/codehaus/gmaven/runtime/v2_0/ShellFeature.java	2012-07-15 15:36:58.304469115 +0200
@@ -27,7 +27,7 @@
 import org.codehaus.groovy.tools.shell.IO;
 import org.codehaus.groovy.tools.shell.Main;
 import org.codehaus.groovy.tools.shell.util.Logger;
-import org.sonatype.gshell.io.StreamSet;
+import org.sonatype.gshell.util.io.StreamSet;
 
 /**
  * Provides the command-line shell feature.
diff -Nru gmaven-1.4/gmaven-runtime/gmaven-runtime-support/pom.xml gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-support/pom.xml
--- gmaven-1.4/gmaven-runtime/gmaven-runtime-support/pom.xml	2012-01-06 03:15:21.000000000 +0100
+++ gmaven-1.4-gil/gmaven-runtime/gmaven-runtime-support/pom.xml	2012-07-15 15:36:22.362240323 +0200
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.sonatype.gshell</groupId>
-            <artifactId>gshell-io</artifactId>
+            <artifactId>gshell-util</artifactId>
         </dependency>
 
         <dependency>
diff -Nru gmaven-1.4/pom.xml gmaven-1.4-gil/pom.xml
--- gmaven-1.4/pom.xml	2012-01-06 03:15:21.000000000 +0100
+++ gmaven-1.4-gil/pom.xml	2012-07-15 15:35:33.892622223 +0200
@@ -302,7 +302,7 @@
 
             <dependency>
                 <groupId>org.sonatype.gshell</groupId>
-                <artifactId>gshell-io</artifactId>
+                <artifactId>gshell-util</artifactId>
                 <version>2.4</version>
                 <exclusions>
                     <exclusion>