[gmaven/f19] switch to XMvn, disable gshell support RHBZ#914056
gil
gil at fedoraproject.org
Sun Jul 28 18:02:18 UTC 2013
commit d3c18998862640690fa62f652a28b93453a8f8d4
Author: gil <puntogil at libero.it>
Date: Sun Jul 28 20:01:56 2013 +0200
switch to XMvn, disable gshell support RHBZ#914056
gmaven-1.4-disable-gshell.patch | 69 +++++++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
---
diff --git a/gmaven-1.4-disable-gshell.patch b/gmaven-1.4-disable-gshell.patch
new file mode 100644
index 0000000..30493bf
--- /dev/null
+++ b/gmaven-1.4-disable-gshell.patch
@@ -0,0 +1,69 @@
+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 2013-07-28 15:10:07.821295461 +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.io.StreamSet;
+
+ import java.util.EventObject;
+
+@@ -61,7 +61,7 @@
+ public void execute(final ClassLoader classLoader) throws Exception {
+ assert classLoader != null;
+
+- final StreamSet streams = StreamSet.system();
++ //final StreamSet streams = StreamSet.system();
+
+ final SecurityManager sm = System.getSecurityManager();
+
+@@ -89,7 +89,7 @@
+ }
+ finally {
+ System.setSecurityManager(sm);
+- StreamSet.system(streams);
++ //StreamSet.system(streams);
+ }
+ }
+ }
+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 2013-07-28 15:11:32.992123184 +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.io.StreamSet;
+
+ /**
+ * Provides the command-line shell feature.
+@@ -65,10 +65,10 @@
+
+ boolean legacy = config().get(LEGACY, false);
+
+- final StreamSet streams = StreamSet.system();
++ //final StreamSet streams = StreamSet.system();
+
+ // Put a nice blank before and after we run the shell
+- streams.out.println();
++ //streams.out.println();
+
+ SecurityManager sm = System.getSecurityManager();
+ System.setSecurityManager(new NoExitSecurityManager());
+@@ -84,11 +84,11 @@
+ finally {
+ System.setSecurityManager(sm);
+
+- StreamSet.system(streams);
++ //StreamSet.system(streams);
+ }
+
+ // The blank after
+- streams.out.println();
++ //streams.out.println();
+ }
+ }
+
More information about the scm-commits
mailing list