You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/06/11 06:33:13 UTC

[1/5] incubator-groovy git commit: GROOVY-7423: Added access to Method parameter names at runtime.

Repository: incubator-groovy
Updated Branches:
  refs/heads/master e4fc41022 -> 54e56856c


GROOVY-7423: Added access to Method parameter names at runtime.


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/7c735bfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/7c735bfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/7c735bfc

Branch: refs/heads/master
Commit: 7c735bfc1807df4e8fa44f02958c7a000634b6de
Parents: e4fc410
Author: Nick Grealy <ni...@gmail.com>
Authored: Thu Jun 11 00:34:22 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jun 11 12:44:35 2015 +1000

----------------------------------------------------------------------
 src/main/groovy/ui/GroovyMain.java              |  2 +
 .../groovy/classgen/AsmClassGenerator.java      |  8 +++
 .../groovy/control/CompilerConfiguration.java   | 66 ++++++++++++++++++++
 .../groovy/tools/FileSystemCompiler.java        | 19 ++++--
 src/spec/doc/tools-groovy.adoc                  |  1 +
 src/spec/doc/tools-groovyc.adoc                 |  3 +
 .../java/org/codehaus/groovy/ant/Groovy.java    | 16 +++++
 .../java/org/codehaus/groovy/ant/Groovyc.java   | 33 ++++++++++
 .../src/spec/doc/groovy-ant-task.adoc           |  1 +
 .../src/main/groovy/groovy/ui/Console.groovy    | 49 ++++++++++++---
 .../main/resources/groovy/ui/Console.properties | 38 +++++++++++
 .../src/spec/doc/groovy-console.adoc            | 18 ++++++
 .../codehaus/groovy/tools/shell/Groovysh.groovy | 17 +++++
 .../groovy/tools/shell/Interpreter.groovy       |  8 +++
 .../org/codehaus/groovy/tools/shell/Main.groovy | 14 ++++-
 .../codehaus/groovy/tools/shell/Main.properties |  2 +
 .../groovy-groovysh/src/spec/doc/groovysh.adoc  |  2 +
 17 files changed, 283 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/src/main/groovy/ui/GroovyMain.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/ui/GroovyMain.java b/src/main/groovy/ui/GroovyMain.java
index 14269cd..4fc921b 100644
--- a/src/main/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/ui/GroovyMain.java
@@ -194,6 +194,7 @@ public class GroovyMain {
                 .addOption(builder("i").argName("extension").optionalArg(true).desc("modify files in place; create backup if extension is given (e.g. \'.bak\')").build())
                 .addOption(builder("n").hasArg(false).desc("process files line by line using implicit 'line' variable").build())
                 .addOption(builder("p").hasArg(false).desc("process files line by line and print result (see also -n)").build())
+                .addOption(builder("pa").hasArg(false).desc("Generate metadata for reflection on method parameter names (jdk8+ only)").longOpt("parameters").build())
                 .addOption(builder("l").argName("port").optionalArg(true).desc("listen on a port and process inbound lines (default: 1960)").build())
                 .addOption(builder("a").argName("splitPattern").optionalArg(true).desc("split lines using splitPattern (default '\\s') using implicit 'split' variable").longOpt("autosplit").build())
                 .addOption(builder().longOpt("indy").desc("enables compilation using invokedynamic").build())
@@ -245,6 +246,7 @@ public class GroovyMain {
         main.isScriptFile = !line.hasOption('e');
         main.debug = line.hasOption('d');
         main.conf.setDebug(main.debug);
+        main.conf.setParameters(line.hasOption("pa"));
         main.processFiles = line.hasOption('p') || line.hasOption('n');
         main.autoOutput = line.hasOption('p');
         main.editFiles = line.hasOption('i');

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 563a052..3104e81 100644
--- a/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -374,6 +374,14 @@ public class AsmClassGenerator extends ClassGenerator {
             visitParameterAnnotations(parameters[i], i, mv);
         }
 
+        // Add parameter names to the MethodVisitor (jdk8+ only)
+        if (getCompileUnit().getConfig().getParameters()) {
+            for (int i = 0; i < parameters.length; i++) {
+                // TODO handle ACC_SYNTHETIC for enum method parameters?
+                mv.visitParameter(parameters[i].getName(), 0);
+            }
+        }
+
         if (controller.getClassNode().isAnnotationDefinition() && !node.isStaticConstructor()) {
             visitAnnotationDefault(node, mv);
         } else if (!node.isAbstract()) {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
index a08a09b..de3efa8 100644
--- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -109,6 +109,11 @@ public class CompilerConfiguration {
     private boolean debug;
 
     /**
+     * If true, generates metadata for reflection on method parameters
+     */
+    private boolean parameters = false;
+
+    /**
      * The number of non-fatal errors to allow before bailing
      */
     private int tolerance;
@@ -179,10 +184,12 @@ public class CompilerConfiguration {
         setClasspath("");
         setVerbose(false);
         setDebug(false);
+        setParameters(safeGetSystemProperty("groovy.parameters") != null);
         setTolerance(10);
         setScriptBaseClass(null);
         setRecompileGroovySource(false);
         setMinimumRecompilationInterval(100);
+        // TODO change following try/catches to use #safeGetSystemProperty(...) ??
         // Target bytecode
         String targetByteCode = null;
         try {
@@ -254,6 +261,45 @@ public class CompilerConfiguration {
     }
 
     /**
+     * Retrieves a System property, or null if any of the following exceptions occur.
+     * <ul>
+     *     <li>SecurityException - if a security manager exists and its checkPropertyAccess method doesn't allow access to the specified system property.</li>
+     *     <li>NullPointerException - if key is null.</li>
+     *     <li>IllegalArgumentException - if key is empty.</li>
+     * </ul>
+     * @param key the name of the system property.
+     * @return
+     */
+    private String safeGetSystemProperty(String key){
+        return safeGetSystemProperty(key, null);
+    }
+
+    /**
+     * Retrieves a System property, or null if any of the following exceptions occur (Warning: Exception messages are
+     * suppressed).
+     * <ul>
+     *     <li>SecurityException - if a security manager exists and its checkPropertyAccess method doesn't allow access to the specified system property.</li>
+     *     <li>NullPointerException - if key is null.</li>
+     *     <li>IllegalArgumentException - if key is empty.</li>
+     * </ul>
+     * @param key the name of the system property.
+     * @param def a default value.
+     * @return
+     */
+    private String safeGetSystemProperty(String key, String def){
+        try {
+            return System.getProperty(key, def);
+        } catch (SecurityException t){
+            // suppress exception
+        } catch (NullPointerException t){
+            // suppress exception
+        } catch (IllegalArgumentException t){
+            // suppress exception
+        }
+        return def;
+    }
+
+    /**
      * Copy constructor.  Use this if you have a mostly correct configuration
      * for your compilation but you want to make a some changes programatically.
      * An important reason to prefer this approach is that your code will most
@@ -276,6 +322,7 @@ public class CompilerConfiguration {
         setClasspathList(new LinkedList<String>(configuration.getClasspath()));
         setVerbose(configuration.getVerbose());
         setDebug(configuration.getDebug());
+        setParameters(configuration.getParameters());
         setTolerance(configuration.getTolerance());
         setScriptBaseClass(configuration.getScriptBaseClass());
         setRecompileGroovySource(configuration.getRecompileGroovySource());
@@ -451,6 +498,11 @@ public class CompilerConfiguration {
         if (text != null && text.equalsIgnoreCase("true")) setDebug(true);
 
         //
+        // Parameters
+        //
+        setParameters(configuration.getProperty("groovy.parameters") != null);
+
+        //
         // Tolerance
         // 
         numeric = 10;
@@ -626,6 +678,13 @@ public class CompilerConfiguration {
     }
 
     /**
+     * Returns true if parameter metadata generation has been enabled.
+     */
+    public boolean getParameters() {
+        return this.parameters;
+    }
+
+    /**
      * Turns debugging operation on or off.
      */
     public void setDebug(boolean debug) {
@@ -633,6 +692,13 @@ public class CompilerConfiguration {
     }
 
     /**
+     * Turns parameter metadata generation on or off.
+     */
+    public void setParameters(boolean parameters) {
+        this.parameters = parameters;
+    }
+
+    /**
      * Returns the requested error tolerance.
      */
     public int getTolerance() {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
index 47761cc..253e48f 100644
--- a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
+++ b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Arrays;
 
 /**
  * Command-line compiler (aka. <tt>groovyc</tt>).
@@ -275,6 +276,8 @@ public class FileSystemCompiler {
             configuration.setTargetDirectory(cli.getOptionValue('d'));
         }
 
+        configuration.setParameters(cli.hasOption("pa"));
+
         if (cli.hasOption("encoding")) {
             configuration.setSourceEncoding(cli.getOptionValue("encoding"));
         }
@@ -287,11 +290,18 @@ public class FileSystemCompiler {
         if (cli.hasOption('j')) {
             Map<String, Object> compilerOptions = new HashMap<String, Object>();
 
-            String[] opts = cli.getOptionValues("J");
-            compilerOptions.put("namedValues", opts);
+            String[] namedValues = cli.getOptionValues("J");
+            compilerOptions.put("namedValues", namedValues);
 
-            opts = cli.getOptionValues("F");
-            compilerOptions.put("flags", opts);
+            String[] flags = cli.getOptionValues("F");
+            if (flags != null && cli.hasOption("pa")){
+                // convert to a list, so we can add a parameter...
+                List<String> tmp = new ArrayList<String>(Arrays.asList(flags));
+                tmp.add("parameters");
+                // convert back to an array...
+                flags = tmp.toArray(new String[tmp.size()]);
+            }
+            compilerOptions.put("flags", flags);
 
             configuration.setJointCompilationOptions(compilerOptions);
         }
@@ -336,6 +346,7 @@ public class FileSystemCompiler {
         options.addOption(Option.builder("h").longOpt("help").desc("Print a synopsis of standard options").build());
         options.addOption(Option.builder("v").longOpt("version").desc("Print the version").build());
         options.addOption(Option.builder("e").longOpt("exception").desc("Print stack trace on error").build());
+        options.addOption(Option.builder("pa").longOpt("parameters").desc("Generate metadata for reflection on method parameter names (jdk8+ only)").build());
         options.addOption(Option.builder("j").longOpt("jointCompilation").desc("Attach javac compiler to compile .java files").build());
         options.addOption(Option.builder("b").longOpt("basescript").hasArg().argName("class").desc("Base class name for scripts (must derive from Script)").build());
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/src/spec/doc/tools-groovy.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/tools-groovy.adoc b/src/spec/doc/tools-groovy.adoc
index e14d23a..c30fa79 100644
--- a/src/spec/doc/tools-groovy.adoc
+++ b/src/spec/doc/tools-groovy.adoc
@@ -46,4 +46,5 @@ int (disable any int based optimizations) |
 | -n | | process files line by line using implicit 'line' variable |
 | -p | | process files line by line and print result (see also -n) |
 | -v | --version | display the Groovy and JVM versions | groovy -v
+| -pa | --parameters | Generates metadata for reflection on method parameter names on JDK 8 and above. Defaults to false. | groovy --parameters Person.groovy
 |=======================================================================

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/src/spec/doc/tools-groovyc.adoc
----------------------------------------------------------------------
diff --git a/src/spec/doc/tools-groovyc.adoc b/src/spec/doc/tools-groovyc.adoc
index 153131f..138aa62 100644
--- a/src/spec/doc/tools-groovyc.adoc
+++ b/src/spec/doc/tools-groovyc.adoc
@@ -38,6 +38,7 @@ argument. | groovyc -cp lib/dep.jar MyClass.groovy
 | | --configscript | Advanced compiler configuration script | groovyc --configscript config/config.groovy src/Person.groovy
 | -Jproperty=value | | Properties to be passed to `javac` if joint compilation is enabled | groovyc -j -Jtarget=1.5 -Jsource=1.5 A.groovy B.java
 | -Fflag | | Flags to be passed to `javac` if joint compilation is enabled | groovyc -j -Fnowarn A.groovy B.java
+| -pa | --parameters | Generates metadata for reflection on method parameter names on JDK 8 and above. Defaults to false. | groovyc --parameters Person.groovy
 |=======================================================================
 
 *Notes:*
@@ -144,6 +145,8 @@ you need to set this flag to true. Defaults to false. |No
 
 |configscript |Set the configuration file used to customize the compilation configuration. |No
 
+|parameters |Generates metadata for reflection on method parameter names on JDK 8 and above. Defaults to false. |No
+
 |=======================================================================
 
 *Example:*

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index c32e40d..f2cc4d4 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -268,6 +268,22 @@ public class Groovy extends Java {
     }
 
     /**
+     * If true, generates metadata for reflection on method parameter names (jdk8+ only).  Defaults to false.
+     *
+     * @param parameters set to true to generate metadata.
+     */
+    public void setParameters(boolean parameters) {
+        configuration.setParameters(parameters);
+    }
+
+    /**
+     * Returns true if parameter metadata generation has been enabled.
+     */
+    public boolean getParameters() {
+        return configuration.getParameters();
+    }
+
+    /**
      * Load the file and then execute it
      */
     public void execute() throws BuildException {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
index e956c90..e77dfc5 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
@@ -117,6 +117,7 @@ import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit;
  * <li>keepStubs</li>
  * <li>forceLookupUnnamedFiles</li>
  * <li>configscript</li>
+ * <li>parameters</li>
  * </ul>
  * And these nested tasks:
  * <ul>
@@ -215,6 +216,12 @@ public class Groovyc extends MatchingTask {
 
     private Set<String> scriptExtensions = new LinkedHashSet<String>();
 
+
+    /**
+     * If true, generates metadata for reflection on method parameter names (jdk8+ only).  Defaults to false.
+     */
+    private boolean parameters = false;
+
     /**
      * Adds a path for source compilation.
      *
@@ -804,6 +811,22 @@ public class Groovyc extends MatchingTask {
     }
 
     /**
+     * If true, generates metadata for reflection on method parameter names (jdk8+ only).  Defaults to false.
+     *
+     * @param parameters set to true to generate metadata.
+     */
+    public void setParameters(boolean parameters) {
+        this.parameters = parameters;
+    }
+
+    /**
+     * Returns true if parameter metadata generation has been enabled.
+     */
+    public boolean getParameters() {
+        return this.parameters;
+    }
+
+    /**
      * Executes the task.
      *
      * @throws BuildException if an error occurs
@@ -1034,6 +1057,13 @@ public class Groovyc extends MatchingTask {
         }
     }
 
+    /**
+     * Add "groovyc" parameters to the commandLineList, based on the ant configuration.
+     *
+     * @param commandLineList
+     * @param jointOptions
+     * @param classpath
+     */
     private void doNormalCommandLineList(List<String> commandLineList, List<String> jointOptions, Path classpath) {
         commandLineList.add("--classpath");
         commandLineList.add(classpath.toString());
@@ -1052,6 +1082,9 @@ public class Groovyc extends MatchingTask {
         if (stacktrace) {
             commandLineList.add("-e");
         }
+        if (parameters) {
+            commandLineList.add("--parameters");
+        }
         if (useIndy) {
             commandLineList.add("--indy");
         }

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc b/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
index 0dc4f18..8f7d905 100644
--- a/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
+++ b/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
@@ -35,6 +35,7 @@ Assuming `groovy-all-VERSION.jar` is in `my.classpath` you will need to declare
 |fork|If enabled the script will be executed in another JVM (disabled by default).|No
 |scriptBaseClass|The name of the base class for scripts.|No
 |indy|If enabled the script will be executed with `invokedynamic` (disabled by default).|No
+|parameters |Generates metadata for reflection on method parameter names on JDK 8 and above. Defaults to false. |No
 |============================================
 
 == Parameters specified as nested elements

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
index ad9c0b8..7dbba16 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
@@ -23,6 +23,7 @@ import groovy.inspect.swingui.AstBrowser
 import groovy.swing.SwingBuilder
 import groovy.ui.text.FindReplaceUtility
 import org.codehaus.groovy.control.messages.SimpleMessage
+import org.codehaus.groovy.tools.shell.util.MessageSource
 
 import java.awt.Component
 import java.awt.EventQueue
@@ -174,6 +175,7 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
     File currentClasspathDir = new File(Preferences.userNodeForPackage(Console).get('currentClasspathDir', '.'))
 
     // Running scripts
+    CompilerConfiguration baseConfig
     CompilerConfiguration config
     GroovyShell shell
     int scriptNameCounter = 0
@@ -192,12 +194,30 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
     Action interruptAction
     
     static void main(args) {
-        if (args.length == 1 && args[0] == '--help') {
-            println '''usage: groovyConsole [options] [filename]
-options:
-  --help                               This Help message
-  -cp,-classpath,--classpath <path>    Specify classpath'''
-            return
+        CliBuilder cli = new CliBuilder(usage: 'groovyConsole [options] [filename]', stopAtNonOption: false)
+        MessageSource messages = new MessageSource(Console)
+        cli.with {
+            classpath(messages['cli.option.classpath.description'])
+            cp(longOpt: 'classpath', messages['cli.option.cp.description'])
+            h(longOpt: 'help', messages['cli.option.help.description'])
+            V(longOpt: 'version', messages['cli.option.version.description'])
+            pa(longOpt: 'parameters', messages['cli.option.parameters.description'])
+        }
+        OptionAccessor options = cli.parse(args)
+
+        if (options == null) {
+            // CliBuilder prints error, but does not exit
+            System.exit(22) // Invalid Args
+        }
+
+        if (options.h) {
+            cli.usage()
+            System.exit(0)
+        }
+
+        if (options.V) {
+            System.out.println(messages.format('cli.info.version', GroovySystem.version))
+            System.exit(0)
         }
 
         // full stack trace should not be logged to the output window - GROOVY-4663
@@ -206,10 +226,16 @@ options:
         //when starting via main set the look and feel to system
         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName())
 
-        def console = new Console(Console.class.classLoader?.getRootLoader())
+        def baseConfig = new CompilerConfiguration()
+        baseConfig.setParameters((boolean) options.hasOption("pa"))
+
+        def console = new Console(Console.class.classLoader?.getRootLoader(), new Binding(), baseConfig)
         console.useScriptClassLoaderForScriptExecution = true
         console.run()
-        if (args.length == 1) console.loadScriptFile(args[0] as File)
+        if (args.length > 0 && !args[-1].toString().startsWith("-")) {
+            console.loadScriptFile(args[-1] as File)
+        }
+
     }
 
     Console() {
@@ -225,6 +251,11 @@ options:
     }
 
     Console(ClassLoader parent, Binding binding) {
+        this(parent, binding, new CompilerConfiguration())
+    }
+
+    Console(ClassLoader parent, Binding binding, CompilerConfiguration baseConfig) {
+        this.baseConfig = baseConfig
         newScript(parent, binding);
         try {
             System.setProperty('groovy.full.stacktrace', System.getProperty('groovy.full.stacktrace',
@@ -247,7 +278,7 @@ options:
     }
 
     void newScript(ClassLoader parent, Binding binding) {
-        config = new CompilerConfiguration()
+        config = new CompilerConfiguration(baseConfig)
         if (threadInterrupt) config.addCompilationCustomizers(new ASTTransformationCustomizer(ThreadInterrupt))
 
         shell = new GroovyShell(parent, binding, config)

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties b/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
new file mode 100644
index 0000000..5884355
--- /dev/null
+++ b/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
@@ -0,0 +1,38 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+#
+# $Id$
+#
+
+#
+# CLI messages
+#
+
+cli.option.help.description=Display this help message
+
+cli.option.version.description=Display the version
+
+cli.option.cp.description=Aliases for '-classpath'
+
+cli.option.classpath.description=Specify where to find the class files - must be first argument
+
+cli.option.parameters.description=Generate metadata for reflection on method parameter names (jdk8+ only)
+
+cli.info.version=GroovyConsole {0}

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/spec/doc/groovy-console.adoc b/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
index 64ac62a..f1e7955 100644
--- a/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
+++ b/subprojects/groovy-console/src/spec/doc/groovy-console.adoc
@@ -32,6 +32,24 @@ the output area.
 [[GroovyConsole-Features]]
 == Features
 
+[[GroovyConsole-Command-lineOptionsandArguments]]
+=== Command-line Options and Arguments
+
+The Groovy Console supports several options to control classpath and other features.
+
+[source,groovy]
+-----------------------------------------------------------------
+./bin/groovyConsole --help
+usage: groovyConsole [options] [filename]
+ -classpath         Specify where to find the class files - must be first
+                    argument
+ -cp,--classpath    Aliases for '-classpath'
+ -h,--help          Display this help message
+ -pa,--parameters   Generate metadata for reflection on method parameter
+                    names (jdk8+ only)
+ -V,--version       Display the version
+-----------------------------------------------------------------
+
 [[GroovyConsole-RunningScripts]]
 === Running Scripts
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
index fc92cc2..c27f8e6 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
@@ -24,6 +24,7 @@ import jline.Terminal
 import jline.WindowsTerminal
 import jline.console.history.FileHistory
 import org.codehaus.groovy.control.CompilationFailedException
+import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.control.ErrorCollector
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 import org.codehaus.groovy.control.messages.Message
@@ -101,6 +102,17 @@ class Groovysh extends Shell {
         this.packageHelper = new PackageHelperImpl(classLoader)
     }
 
+    Groovysh(final ClassLoader classLoader, final Binding binding, final IO io, final Closure registrar, CompilerConfiguration configuration) {
+        super(io)
+        assert classLoader
+        assert binding
+        assert registrar
+        parser = new Parser()
+        interp = new Interpreter(classLoader, binding, configuration)
+        registrar.call(this)
+        this.packageHelper = new PackageHelperImpl(classLoader)
+    }
+
     private static Closure createDefaultRegistrar(final ClassLoader classLoader) {
 
         return {Groovysh shell ->
@@ -126,6 +138,11 @@ class Groovysh extends Shell {
         this(new Binding(), io)
     }
 
+    Groovysh(final IO io, CompilerConfiguration configuration) {
+        this(Thread.currentThread().contextClassLoader, new Binding(), io,
+                createDefaultRegistrar(Thread.currentThread().contextClassLoader), configuration)
+    }
+
     Groovysh() {
         this(new IO())
     }

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
index 81a9b7a..1eb28e2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
@@ -18,6 +18,7 @@
  */
 package org.codehaus.groovy.tools.shell
 
+import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.runtime.InvokerHelper
 import org.codehaus.groovy.tools.shell.util.Logger
 import org.codehaus.groovy.runtime.MethodClosure
@@ -44,6 +45,13 @@ class Interpreter implements Evaluator
         shell = new GroovyShell(classLoader, binding)
     }
 
+    Interpreter(final ClassLoader classLoader, final Binding binding, CompilerConfiguration configuration) {
+        assert classLoader
+        assert binding
+
+        shell = new GroovyShell(classLoader, binding, configuration)
+    }
+
     Binding getContext() {
         return shell.context
     }

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
index 8fbc6d5..e3c2230 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
@@ -22,6 +22,7 @@ import jline.TerminalFactory
 import jline.UnixTerminal
 import jline.UnsupportedTerminal
 import jline.WindowsTerminal
+import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.shell.util.HelpFormatter
 import org.codehaus.groovy.tools.shell.util.Logger
 import org.codehaus.groovy.tools.shell.util.MessageSource
@@ -58,6 +59,14 @@ class Main
         groovysh = new Groovysh(io)
     }
 
+    /**
+     * @param io: may just be new IO(), which is the default
+     */
+    Main(IO io, CompilerConfiguration configuration) {
+        Logger.io = io
+        groovysh = new Groovysh(io, configuration)
+    }
+
     Groovysh getGroovysh() {
         return groovysh
     }
@@ -81,6 +90,7 @@ class Main
             C(longOpt: 'color', args: 1, argName: 'FLAG', optionalArg: true, messages['cli.option.color.description'])
             D(longOpt: 'define', args: 1, argName: 'NAME=VALUE', messages['cli.option.define.description'])
             T(longOpt: 'terminal', args: 1, argName: 'TYPE', messages['cli.option.terminal.description'])
+            pa(longOpt: 'parameters', messages['cli.option.parameters.description'])
         }
         OptionAccessor options = cli.parse(args)
 
@@ -147,9 +157,11 @@ class Main
         if (options.e) {
             evalString = options.getOptionValue('e')
         }
+        def configuration = new CompilerConfiguration()
+        configuration.setParameters((boolean) options.hasOption("pa"))
 
         List<String> filenames = options.arguments()
-        Main main = new Main(io)
+        Main main = new Main(io, configuration)
         main.startGroovysh(evalString, filenames)
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
index 902ee16..ddbf5e3 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
@@ -47,4 +47,6 @@ cli.option.define.description=Define a system property
 
 cli.option.terminal.description=Specify the terminal TYPE to use
 
+cli.option.parameters.description=Generate metadata for reflection on method parameter names (jdk8+ only)
+
 cli.info.version=@|green Groovy Shell|@ {0}

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/7c735bfc/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
index fafc6fd..a8eb306 100644
--- a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
+++ b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
@@ -46,6 +46,8 @@ usage: groovysh [options] [...]
   -e, --evaluate=arg         Evaluate option fist when starting
                              interactive session
   -h, --help                 Display this help message
+  -pa, --parameters          Generate metadata for reflection on method
+                             parameter names (jdk8+ only)
   -q, --quiet                Suppress superfluous output
   -v, --verbose              Enable verbose output
 -----------------------------------------------------------------


[2/5] incubator-groovy git commit: GROOVY-7423: Added access to Method parameter names at runtime.

Posted by pa...@apache.org.
GROOVY-7423: Added access to Method parameter names at runtime.


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/4a249604
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/4a249604
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/4a249604

Branch: refs/heads/master
Commit: 4a2496048f40a06660d4fc730514bae4293d162e
Parents: 7c735bf
Author: Nick Grealy <ni...@gmail.com>
Authored: Thu Jun 11 00:34:22 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jun 11 12:47:58 2015 +1000

----------------------------------------------------------------------
 .../org/codehaus/groovy/control/CompilerConfigurationTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/4a249604/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index cb93092..636008a 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -122,6 +122,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
 
         init.setWarningLevel(WarningMessage.POSSIBLE_ERRORS);
         init.setDebug(true);
+        init.setParameters(true);
         init.setVerbose(false);
         init.setTolerance(720);
         init.setMinimumRecompilationInterval(234);
@@ -147,6 +148,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
 
         assertEquals(WarningMessage.POSSIBLE_ERRORS, init.getWarningLevel());
         assertEquals(true, init.getDebug());
+        assertEquals(true, init.getParameters());
         assertEquals(false, init.getVerbose());
         assertEquals(720, init.getTolerance());
         assertEquals(234, init.getMinimumRecompilationInterval());
@@ -194,6 +196,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
 
         init.setWarningLevel(WarningMessage.POSSIBLE_ERRORS);
         init.setDebug(false);
+        init.setParameters(false);
         init.setVerbose(true);
         init.setTolerance(55);
         init.setMinimumRecompilationInterval(975);
@@ -211,6 +214,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
 
         assertEquals(WarningMessage.POSSIBLE_ERRORS, init.getWarningLevel());
         assertEquals(false, init.getDebug());
+        assertEquals(false, init.getParameters());
         assertEquals(true, init.getVerbose());
         assertEquals(55, init.getTolerance());
         assertEquals(975, init.getMinimumRecompilationInterval());
@@ -244,4 +248,4 @@ public class CompilerConfigurationTest extends GroovyTestCase {
         assertEquals(initOut, config.getOutput());
         assertEquals(initTDFile, config.getTargetDirectory());
     }
-}
\ No newline at end of file
+}


[5/5] incubator-groovy git commit: GROOVY-7423: minor refactor (closes #38)

Posted by pa...@apache.org.
GROOVY-7423: minor refactor (closes #38)


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/54e56856
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/54e56856
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/54e56856

Branch: refs/heads/master
Commit: 54e56856cddd428daac4ebc9841d0c9c10fd9d71
Parents: ab4f07a
Author: Paul King <pa...@asert.com.au>
Authored: Thu Jun 11 14:32:54 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jun 11 14:32:54 2015 +1000

----------------------------------------------------------------------
 gradle/pomconfigurer.gradle                     |  3 ++
 .../groovy/control/CompilerConfiguration.java   | 50 +++-----------------
 .../groovy/tools/FileSystemCompiler.java        |  7 +--
 .../main/resources/groovy/ui/Console.properties |  9 ----
 4 files changed, 12 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/gradle/pomconfigurer.gradle
----------------------------------------------------------------------
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 9729d1b..43e2f56 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -561,6 +561,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
             contributor {
                 name 'Yu Kobayashi'
             }
+            contributor {
+                name 'Nick Grealy'
+            }
         }
         mailingLists {
             mailingList {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
index de3efa8..90e5f4b 100644
--- a/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -189,44 +189,12 @@ public class CompilerConfiguration {
         setScriptBaseClass(null);
         setRecompileGroovySource(false);
         setMinimumRecompilationInterval(100);
-        // TODO change following try/catches to use #safeGetSystemProperty(...) ??
-        // Target bytecode
-        String targetByteCode = null;
-        try {
-            targetByteCode = System.getProperty("groovy.target.bytecode", targetByteCode);
-        } catch (Exception e) {
-            // IGNORE
-        }
-        if(targetByteCode != null) {
-            setTargetBytecode(targetByteCode);
-        } else {
-            setTargetBytecode(getVMVersion());
-        }
-        String tmpDefaultScriptExtension = null;
-        try {
-            tmpDefaultScriptExtension = System.getProperty("groovy.default.scriptExtension");
-        } catch (Exception e) {
-            // IGNORE
-        }
-        if(tmpDefaultScriptExtension != null) {
-            setDefaultScriptExtension(tmpDefaultScriptExtension);
-        } else {
-            setDefaultScriptExtension(".groovy");
-        }
+        setTargetBytecode(safeGetSystemProperty("groovy.target.bytecode", getVMVersion()));
+        setDefaultScriptExtension(safeGetSystemProperty("groovy.default.scriptExtension", ".groovy"));
 
-        //
         // Source file encoding
-        String encoding = null;
-        try {
-            encoding = System.getProperty("file.encoding", "US-ASCII");
-        } catch (Exception e) {
-            // IGNORE
-        }
-        try {
-            encoding = System.getProperty("groovy.source.encoding", encoding);
-        } catch (Exception e) {
-            // IGNORE
-        }
+        String encoding = safeGetSystemProperty("file.encoding", "US-ASCII");
+        encoding = safeGetSystemProperty("groovy.source.encoding", encoding);
         setSourceEncoding(encoding);
 
         try {
@@ -235,13 +203,9 @@ public class CompilerConfiguration {
             // IGNORE
         }
 
-        try {
-            String target = System.getProperty("groovy.target.directory");
-            if (target != null) {
-                setTargetDirectory(target);
-            }
-        } catch (Exception e) {
-            // IGNORE
+        String target = safeGetSystemProperty("groovy.target.directory");
+        if (target != null) {
+            setTargetDirectory(target);
         }
 
         boolean indy = false;

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
index 253e48f..177d480 100644
--- a/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
+++ b/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
@@ -295,11 +295,8 @@ public class FileSystemCompiler {
 
             String[] flags = cli.getOptionValues("F");
             if (flags != null && cli.hasOption("pa")){
-                // convert to a list, so we can add a parameter...
-                List<String> tmp = new ArrayList<String>(Arrays.asList(flags));
-                tmp.add("parameters");
-                // convert back to an array...
-                flags = tmp.toArray(new String[tmp.size()]);
+                flags = Arrays.copyOf(flags, flags.length + 1);
+                flags[flags.length - 1] = "parameters";
             }
             compilerOptions.put("flags", flags);
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/54e56856/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties b/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
index 5884355..a9a94ee 100644
--- a/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
+++ b/subprojects/groovy-console/src/main/resources/groovy/ui/Console.properties
@@ -16,15 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
-#
-# CLI messages
-#
-
 cli.option.help.description=Display this help message
 
 cli.option.version.description=Display the version


[3/5] incubator-groovy git commit: cleanup

Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
index 15d9997..a0fff83 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Uber foo, muck & fluff
 command.usage=
 command.help=Uber foo, muck & fluff.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
index e85873b..0ae1d76 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Show variables, classes or imports
 command.usage=[<variables|classes|imports|preferences|all>]
 command.help=Show variables, classes, imports or preferences.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties b/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
index 1cfe826..9603d71 100644
--- a/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
+++ b/subprojects/groovy-groovysh/src/test/resources/org/codehaus/groovy/tools/shell/util/MessageSourceTest.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 a=1
 
 b=2


[4/5] incubator-groovy git commit: cleanup

Posted by pa...@apache.org.
cleanup


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

Branch: refs/heads/master
Commit: ab4f07aa22e9d03d9742fcaafef8084bab619461
Parents: 4a24960
Author: Paul King <pa...@asert.com.au>
Authored: Thu Jun 11 12:59:55 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jun 11 12:59:56 2015 +1000

----------------------------------------------------------------------
 src/bin/groovysh                                                | 5 -----
 .../org/codehaus/groovy/control/CompilationFailedException.java | 1 -
 .../org/codehaus/groovy/control/ConfigurationException.java     | 2 --
 src/main/org/codehaus/groovy/control/ErrorCollector.java        | 1 -
 src/main/org/codehaus/groovy/control/HasCleanup.java            | 2 --
 src/main/org/codehaus/groovy/control/Janitor.java               | 2 --
 src/main/org/codehaus/groovy/control/Phases.java                | 2 --
 src/main/org/codehaus/groovy/control/ProcessingUnit.java        | 1 -
 src/main/org/codehaus/groovy/control/SourceUnit.java            | 1 -
 .../org/codehaus/groovy/control/io/AbstractReaderSource.java    | 1 -
 src/main/org/codehaus/groovy/control/io/FileReaderSource.java   | 1 -
 .../org/codehaus/groovy/control/io/InputStreamReaderSource.java | 1 -
 src/main/org/codehaus/groovy/control/io/NullWriter.java         | 2 --
 src/main/org/codehaus/groovy/control/io/ReaderSource.java       | 2 --
 src/main/org/codehaus/groovy/control/io/StringReaderSource.java | 2 --
 src/main/org/codehaus/groovy/control/io/URLReaderSource.java    | 2 --
 .../org/codehaus/groovy/control/messages/ExceptionMessage.java  | 2 --
 .../org/codehaus/groovy/control/messages/LocatedMessage.java    | 2 --
 src/main/org/codehaus/groovy/control/messages/Message.java      | 2 --
 .../org/codehaus/groovy/control/messages/SimpleMessage.java     | 2 --
 .../codehaus/groovy/control/messages/SyntaxErrorMessage.java    | 1 -
 .../org/codehaus/groovy/control/messages/WarningMessage.java    | 2 --
 src/main/org/codehaus/groovy/syntax/CSTNode.java                | 2 --
 src/main/org/codehaus/groovy/syntax/Numbers.java                | 2 --
 src/main/org/codehaus/groovy/syntax/Reduction.java              | 2 --
 src/main/org/codehaus/groovy/syntax/SyntaxException.java        | 2 --
 src/main/org/codehaus/groovy/syntax/Token.java                  | 2 --
 src/main/org/codehaus/groovy/syntax/Types.java                  | 2 --
 src/main/org/codehaus/groovy/tools/Compiler.java                | 2 --
 src/main/org/codehaus/groovy/tools/shell/IO.java                | 1 -
 src/main/org/codehaus/groovy/tools/shell/util/Logger.java       | 1 -
 .../org/codehaus/groovy/tools/shell/util/MessageSource.java     | 1 -
 src/main/org/codehaus/groovy/tools/shell/util/Preferences.java  | 1 -
 .../main/java/org/codehaus/groovy/ant/CompileTaskSupport.java   | 1 -
 .../main/java/org/codehaus/groovy/ant/GenerateStubsTask.java    | 1 -
 .../src/main/java/org/codehaus/groovy/ant/GroovycTask.java      | 1 -
 .../src/main/java/org/codehaus/groovy/ant/Groovydoc.java        | 2 --
 .../src/main/java/org/codehaus/groovy/ant/UberCompileTask.java  | 1 -
 .../src/main/groovy/groovy/ui/SystemOutputInterceptor.java      | 2 --
 .../src/main/resources/groovy/ui/InteractiveShell.properties    | 4 ----
 .../groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy | 1 -
 .../main/groovy/org/codehaus/groovy/tools/shell/Command.groovy  | 1 -
 .../groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy  | 1 -
 .../org/codehaus/groovy/tools/shell/CommandException.groovy     | 1 -
 .../org/codehaus/groovy/tools/shell/CommandRegistry.groovy      | 1 -
 .../org/codehaus/groovy/tools/shell/CommandSupport.groovy       | 1 -
 .../org/codehaus/groovy/tools/shell/ExitNotification.groovy     | 1 -
 .../codehaus/groovy/tools/shell/InteractiveShellRunner.groovy   | 2 --
 .../groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy   | 1 -
 .../src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy | 1 -
 .../main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy    | 1 -
 .../groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy   | 1 -
 .../codehaus/groovy/tools/shell/commands/AliasCommand.groovy    | 1 -
 .../codehaus/groovy/tools/shell/commands/ClearCommand.groovy    | 1 -
 .../codehaus/groovy/tools/shell/commands/DisplayCommand.groovy  | 1 -
 .../org/codehaus/groovy/tools/shell/commands/EditCommand.groovy | 1 -
 .../org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy | 1 -
 .../codehaus/groovy/tools/shell/commands/HistoryCommand.groovy  | 1 -
 .../codehaus/groovy/tools/shell/commands/InspectCommand.groovy  | 2 --
 .../org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy | 1 -
 .../codehaus/groovy/tools/shell/commands/PurgeCommand.groovy    | 1 -
 .../codehaus/groovy/tools/shell/commands/RecordCommand.groovy   | 1 -
 .../codehaus/groovy/tools/shell/commands/RegisterCommand.groovy | 1 -
 .../org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy | 1 -
 .../org/codehaus/groovy/tools/shell/commands/SetCommand.groovy  | 1 -
 .../codehaus/groovy/tools/shell/commands/ShadowCommand.groovy   | 1 -
 .../org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy | 1 -
 .../groovy/tools/shell/completion/CommandNameCompleter.groovy   | 1 -
 .../main/groovy/org/codehaus/groovy/tools/shell/package.html    | 2 --
 .../groovy/tools/shell/util/DefaultCommandsRegistrar.groovy     | 1 -
 .../org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy   | 1 -
 .../org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy | 1 -
 .../codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy | 1 -
 .../org/codehaus/groovy/tools/shell/CommandAlias.properties     | 4 ----
 .../org/codehaus/groovy/tools/shell/CommandSupport.properties   | 4 ----
 .../org/codehaus/groovy/tools/shell/Groovysh.properties         | 4 ----
 .../resources/org/codehaus/groovy/tools/shell/Main.properties   | 4 ----
 .../groovy/tools/shell/commands/AliasCommand.properties         | 5 -----
 .../groovy/tools/shell/commands/ClearCommand.properties         | 5 -----
 .../groovy/tools/shell/commands/DisplayCommand.properties       | 5 -----
 .../codehaus/groovy/tools/shell/commands/DocCommand.properties  | 5 -----
 .../codehaus/groovy/tools/shell/commands/EditCommand.properties | 5 -----
 .../codehaus/groovy/tools/shell/commands/ExitCommand.properties | 5 -----
 .../codehaus/groovy/tools/shell/commands/HelpCommand.properties | 5 -----
 .../groovy/tools/shell/commands/HistoryCommand.properties       | 5 -----
 .../groovy/tools/shell/commands/ImportCommand.properties        | 5 -----
 .../groovy/tools/shell/commands/InspectCommand.properties       | 5 -----
 .../codehaus/groovy/tools/shell/commands/LoadCommand.properties | 5 -----
 .../groovy/tools/shell/commands/PurgeCommand.properties         | 5 -----
 .../groovy/tools/shell/commands/RecordCommand.properties        | 5 -----
 .../groovy/tools/shell/commands/RegisterCommand.properties      | 5 -----
 .../codehaus/groovy/tools/shell/commands/SaveCommand.properties | 5 -----
 .../codehaus/groovy/tools/shell/commands/SetCommand.properties  | 5 -----
 .../groovy/tools/shell/commands/ShadowCommand.properties        | 5 -----
 .../codehaus/groovy/tools/shell/commands/ShowCommand.properties | 5 -----
 .../groovy/tools/shell/util/MessageSourceTest.properties        | 5 -----
 96 files changed, 216 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/bin/groovysh
----------------------------------------------------------------------
diff --git a/src/bin/groovysh b/src/bin/groovysh
index 2494f66..00df774 100644
--- a/src/bin/groovysh
+++ b/src/bin/groovysh
@@ -24,11 +24,6 @@
 ##                                                                          ##
 ##############################################################################
 
-##
-## $Revision$
-## $Id$
-##
-
 GROOVY_APP_NAME=GroovyShell
 
 # resolve links - $0 may be a soft-link

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/CompilationFailedException.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/CompilationFailedException.java b/src/main/org/codehaus/groovy/control/CompilationFailedException.java
index d22aafb..741b647 100644
--- a/src/main/org/codehaus/groovy/control/CompilationFailedException.java
+++ b/src/main/org/codehaus/groovy/control/CompilationFailedException.java
@@ -25,7 +25,6 @@ import groovy.lang.GroovyRuntimeException;
  * Thrown when compilation fails from source errors.
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @version $Id$
  */
 
 public class CompilationFailedException extends GroovyRuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/ConfigurationException.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ConfigurationException.java b/src/main/org/codehaus/groovy/control/ConfigurationException.java
index 7aee9ef..3d0658a 100644
--- a/src/main/org/codehaus/groovy/control/ConfigurationException.java
+++ b/src/main/org/codehaus/groovy/control/ConfigurationException.java
@@ -27,8 +27,6 @@ import org.codehaus.groovy.GroovyExceptionInterface;
  *  Thrown when configuration data is invalid.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class ConfigurationException extends RuntimeException implements GroovyExceptionInterface

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/ErrorCollector.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ErrorCollector.java b/src/main/org/codehaus/groovy/control/ErrorCollector.java
index 9c084f1..8a682d6 100644
--- a/src/main/org/codehaus/groovy/control/ErrorCollector.java
+++ b/src/main/org/codehaus/groovy/control/ErrorCollector.java
@@ -38,7 +38,6 @@ import org.codehaus.groovy.syntax.SyntaxException;
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
  * @author <a href="mailto:blackdrag@gmx.org">Jochen Theodorou</a>
- * @version $Id$
  */
 public class ErrorCollector {
     

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/HasCleanup.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/HasCleanup.java b/src/main/org/codehaus/groovy/control/HasCleanup.java
index a81bd6d..e7f2365 100644
--- a/src/main/org/codehaus/groovy/control/HasCleanup.java
+++ b/src/main/org/codehaus/groovy/control/HasCleanup.java
@@ -23,8 +23,6 @@ package org.codehaus.groovy.control;
  *  operations complete.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public interface HasCleanup 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/Janitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/Janitor.java b/src/main/org/codehaus/groovy/control/Janitor.java
index 3df49bd..8d08ebd 100644
--- a/src/main/org/codehaus/groovy/control/Janitor.java
+++ b/src/main/org/codehaus/groovy/control/Janitor.java
@@ -27,8 +27,6 @@ import java.util.Set;
  *  a later time.  Users much implement the HasCleanup interface.  
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Janitor implements HasCleanup

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/Phases.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/Phases.java b/src/main/org/codehaus/groovy/control/Phases.java
index ee65165..f43376d 100644
--- a/src/main/org/codehaus/groovy/control/Phases.java
+++ b/src/main/org/codehaus/groovy/control/Phases.java
@@ -25,8 +25,6 @@ package org.codehaus.groovy.control;
  *  Compilation phase identifiers.  
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Phases

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/ProcessingUnit.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/ProcessingUnit.java b/src/main/org/codehaus/groovy/control/ProcessingUnit.java
index 63e9c0c..2861479 100644
--- a/src/main/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/org/codehaus/groovy/control/ProcessingUnit.java
@@ -25,7 +25,6 @@ import groovy.lang.GroovyClassLoader;
  * during processing.
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @version $Id$
  */
 
 public abstract class ProcessingUnit {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/SourceUnit.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/SourceUnit.java b/src/main/org/codehaus/groovy/control/SourceUnit.java
index 9738e18..c548584 100644
--- a/src/main/org/codehaus/groovy/control/SourceUnit.java
+++ b/src/main/org/codehaus/groovy/control/SourceUnit.java
@@ -53,7 +53,6 @@ import java.security.PrivilegedAction;
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
  * @author <a href="mailto:b55r@sina.com">Bing Ran</a>
- * @version $Id$
  */
 
 public class SourceUnit extends ProcessingUnit {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java b/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
index 0190e9c..706ae0b 100644
--- a/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
+++ b/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java
@@ -29,7 +29,6 @@ import org.codehaus.groovy.control.Janitor;
  * provides common functionality.
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @version $Id$
  */
 
 public abstract class AbstractReaderSource implements ReaderSource {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/FileReaderSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/FileReaderSource.java b/src/main/org/codehaus/groovy/control/io/FileReaderSource.java
index f98035c..162dfe4 100644
--- a/src/main/org/codehaus/groovy/control/io/FileReaderSource.java
+++ b/src/main/org/codehaus/groovy/control/io/FileReaderSource.java
@@ -28,7 +28,6 @@ import org.codehaus.groovy.control.CompilerConfiguration;
  *  A ReaderSource for source files.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *  @version $Id$
  */
 public class FileReaderSource extends AbstractReaderSource {
     private File file;  // The File from which we produce Readers.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java b/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
index b79de80..499b07c 100644
--- a/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
+++ b/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java
@@ -30,7 +30,6 @@ import org.codehaus.groovy.control.CompilerConfiguration;
  * A ReaderSource for source strings.
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @version $Id$
  */
 public class InputStreamReaderSource extends AbstractReaderSource {
     private InputStream stream;  // The InputStream from which we produce a Reader.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/NullWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/NullWriter.java b/src/main/org/codehaus/groovy/control/io/NullWriter.java
index 8fe94fd..c783249 100644
--- a/src/main/org/codehaus/groovy/control/io/NullWriter.java
+++ b/src/main/org/codehaus/groovy/control/io/NullWriter.java
@@ -24,8 +24,6 @@ import java.io.Writer;
  *  An Writer than eats its input.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 public class NullWriter extends Writer {
     public static final NullWriter DEFAULT = new NullWriter();

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/ReaderSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/ReaderSource.java b/src/main/org/codehaus/groovy/control/io/ReaderSource.java
index c1a1c23..c73ffc1 100644
--- a/src/main/org/codehaus/groovy/control/io/ReaderSource.java
+++ b/src/main/org/codehaus/groovy/control/io/ReaderSource.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.control.Janitor;
  *  on a source stream.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 public interface ReaderSource extends HasCleanup {
    /**

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/StringReaderSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/StringReaderSource.java b/src/main/org/codehaus/groovy/control/io/StringReaderSource.java
index adaf42e..fe5e125 100644
--- a/src/main/org/codehaus/groovy/control/io/StringReaderSource.java
+++ b/src/main/org/codehaus/groovy/control/io/StringReaderSource.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.control.CompilerConfiguration;
  *  A ReaderSource for source strings.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class StringReaderSource extends AbstractReaderSource {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/io/URLReaderSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/io/URLReaderSource.java b/src/main/org/codehaus/groovy/control/io/URLReaderSource.java
index 554971d..f5602e8 100644
--- a/src/main/org/codehaus/groovy/control/io/URLReaderSource.java
+++ b/src/main/org/codehaus/groovy/control/io/URLReaderSource.java
@@ -32,8 +32,6 @@ import org.codehaus.groovy.control.CompilerConfiguration;
  *  A ReaderSource for source files hosted at a URL.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 public class URLReaderSource extends AbstractReaderSource {
     private URL url;  // The URL from which we produce Readers.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java b/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
index b8db7c0..34a0ee4 100644
--- a/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
+++ b/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java
@@ -29,8 +29,6 @@ import org.codehaus.groovy.control.ProcessingUnit;
  *  A class for error messages produced by the parser system.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class ExceptionMessage extends Message

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java b/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
index 6918f00..b616131 100644
--- a/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
+++ b/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.syntax.CSTNode;
  *  A base class for compilation messages.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class LocatedMessage extends SimpleMessage

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/messages/Message.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/messages/Message.java b/src/main/org/codehaus/groovy/control/messages/Message.java
index 91a2c25..cc0c023 100644
--- a/src/main/org/codehaus/groovy/control/messages/Message.java
+++ b/src/main/org/codehaus/groovy/control/messages/Message.java
@@ -31,8 +31,6 @@ import org.codehaus.groovy.syntax.SyntaxException;
  *  A base class for compilation messages.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public abstract class Message

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java b/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
index c3b5da7..fadae7c 100644
--- a/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
+++ b/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.control.SourceUnit;
  *  A base class for compilation messages.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class SimpleMessage extends Message

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java b/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
index b68ba32..759e3e6 100644
--- a/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
+++ b/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java
@@ -28,7 +28,6 @@ import org.codehaus.groovy.syntax.SyntaxException;
  * A class for error messages produced by the parser system.
  *
  * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @version $Id$
  */
 
 public class SyntaxErrorMessage extends Message {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/control/messages/WarningMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/messages/WarningMessage.java b/src/main/org/codehaus/groovy/control/messages/WarningMessage.java
index af05a23..62c6069 100644
--- a/src/main/org/codehaus/groovy/control/messages/WarningMessage.java
+++ b/src/main/org/codehaus/groovy/control/messages/WarningMessage.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.syntax.CSTNode;
  *  A class for warning messages.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class WarningMessage extends LocatedMessage

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/syntax/CSTNode.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/CSTNode.java b/src/main/org/codehaus/groovy/syntax/CSTNode.java
index d3be480..10a11a0 100644
--- a/src/main/org/codehaus/groovy/syntax/CSTNode.java
+++ b/src/main/org/codehaus/groovy/syntax/CSTNode.java
@@ -36,8 +36,6 @@ import java.io.PrintWriter;
  *
  *  @author <a href="mailto:bob@werken.com">bob mcwhirter</a>
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public abstract class CSTNode

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/syntax/Numbers.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/Numbers.java b/src/main/org/codehaus/groovy/syntax/Numbers.java
index c3f0546..652ec97 100644
--- a/src/main/org/codehaus/groovy/syntax/Numbers.java
+++ b/src/main/org/codehaus/groovy/syntax/Numbers.java
@@ -29,8 +29,6 @@ import java.math.BigDecimal;
  *
  *  @author Brian Larson
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Numbers

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/syntax/Reduction.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/Reduction.java b/src/main/org/codehaus/groovy/syntax/Reduction.java
index 3fbd392..9658d4c 100644
--- a/src/main/org/codehaus/groovy/syntax/Reduction.java
+++ b/src/main/org/codehaus/groovy/syntax/Reduction.java
@@ -35,8 +35,6 @@ import java.util.Collections;
  *
  *  @author <a href="mailto:bob@werken.com">bob mcwhirter</a>
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Reduction extends CSTNode

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/syntax/SyntaxException.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/SyntaxException.java b/src/main/org/codehaus/groovy/syntax/SyntaxException.java
index 32be2ec..0348e8c 100644
--- a/src/main/org/codehaus/groovy/syntax/SyntaxException.java
+++ b/src/main/org/codehaus/groovy/syntax/SyntaxException.java
@@ -23,8 +23,6 @@ import org.codehaus.groovy.GroovyException;
 /** Base exception indicating a syntax error.
  *
  *  @author <a href="bob@werken.com">bob mcwhirter</a>
- *
- *  @version $Id$
  */
 public class SyntaxException extends GroovyException {
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/syntax/Token.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/Token.java b/src/main/org/codehaus/groovy/syntax/Token.java
index 663c371..6646c7b 100644
--- a/src/main/org/codehaus/groovy/syntax/Token.java
+++ b/src/main/org/codehaus/groovy/syntax/Token.java
@@ -31,8 +31,6 @@ import org.codehaus.groovy.GroovyBugError;
  *
  *  @author <a href="mailto:bob@werken.com">bob mcwhirter</a>
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Token extends CSTNode

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/syntax/Types.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/syntax/Types.java b/src/main/org/codehaus/groovy/syntax/Types.java
index 61c6b0b..5fa6c2c 100644
--- a/src/main/org/codehaus/groovy/syntax/Types.java
+++ b/src/main/org/codehaus/groovy/syntax/Types.java
@@ -35,8 +35,6 @@ import org.codehaus.groovy.GroovyBugError;
  *
  *  @author <a href="mailto:bob@werken.com">bob mcwhirter</a>
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Types

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/tools/Compiler.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/Compiler.java b/src/main/org/codehaus/groovy/tools/Compiler.java
index 9af2c3f..59045d9 100644
--- a/src/main/org/codehaus/groovy/tools/Compiler.java
+++ b/src/main/org/codehaus/groovy/tools/Compiler.java
@@ -30,8 +30,6 @@ import org.codehaus.groovy.control.SourceUnit;
  *  All compile() routines generate classes to the filesystem.
  *
  *  @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- *
- *  @version $Id$
  */
 
 public class Compiler {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/tools/shell/IO.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/shell/IO.java b/src/main/org/codehaus/groovy/tools/shell/IO.java
index 9a7b4d2..e1c24de 100644
--- a/src/main/org/codehaus/groovy/tools/shell/IO.java
+++ b/src/main/org/codehaus/groovy/tools/shell/IO.java
@@ -32,7 +32,6 @@ import org.fusesource.jansi.AnsiRenderWriter;
 /**
  * Container for input/output handles.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class IO implements Closeable

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/tools/shell/util/Logger.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/shell/util/Logger.java b/src/main/org/codehaus/groovy/tools/shell/util/Logger.java
index a45e0ac..0c457fb 100644
--- a/src/main/org/codehaus/groovy/tools/shell/util/Logger.java
+++ b/src/main/org/codehaus/groovy/tools/shell/util/Logger.java
@@ -30,7 +30,6 @@ import static org.fusesource.jansi.Ansi.Attribute.*;
 /**
  * Provides a very, very basic logging API.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public final class Logger {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java b/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
index c4be8b0..2350082 100644
--- a/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
+++ b/src/main/org/codehaus/groovy/tools/shell/util/MessageSource.java
@@ -29,7 +29,6 @@ import groovy.lang.GroovyObjectSupport;
  * Message source backed up by one or more {@link java.util.ResourceBundle}
  * instances for simple i18n support.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class MessageSource

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java b/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
index fb66be7..bfaac49 100644
--- a/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
+++ b/src/main/org/codehaus/groovy/tools/shell/util/Preferences.java
@@ -27,7 +27,6 @@ import org.codehaus.groovy.tools.shell.IO;
 /**
  * Container for shell preferences.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class Preferences

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
index 8db91aa..0c9d90b 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java
@@ -35,7 +35,6 @@ import java.io.PrintWriter;
 /**
  * Support for compilation related tasks.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public abstract class CompileTaskSupport

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
index 95119a3..28964d3 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java
@@ -30,7 +30,6 @@ import java.io.File;
 /**
  * Generates Java stubs from Groovy sources.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class GenerateStubsTask

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
index 7ea5ca2..6c8fccd 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java
@@ -33,7 +33,6 @@ import java.io.File;
 /**
  * Compiles Groovy source files.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class GroovycTask

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
index 504dc90..b8edf24 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
@@ -38,8 +38,6 @@ import java.util.*;
 
 /**
  * Access to the GroovyDoc tool from Ant.
- *
- * @version $Id$
  */
 public class Groovydoc extends Task {
     private final LoggingHelper log = new LoggingHelper(this);

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
index 5936c31..25d9873 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/UberCompileTask.java
@@ -38,7 +38,6 @@ import java.io.IOException;
  * such as the source dir and classpath is picked up from this tasks
  * configuration.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 public class UberCompileTask

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
index 8eafc9f..0df242b 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java
@@ -26,8 +26,6 @@ import java.io.PrintStream;
 
 /**
  * Intercepts System.out/System.err. Implementation helper for Console.groovy.
- *
- * @version $Id$
  */
 public class SystemOutputInterceptor extends FilterOutputStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties b/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
index e54493e..a97923c 100644
--- a/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
+++ b/subprojects/groovy-console/src/main/resources/groovy/ui/InteractiveShell.properties
@@ -18,10 +18,6 @@
 #
 
 #
-# $Id$
-#
-
-#
 # CLI messages
 #
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
index 45db80f..097376c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
@@ -23,7 +23,6 @@ import org.codehaus.groovy.tools.shell.util.Logger
 /**
  * Manages the shells buffers.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class BufferManager

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
index 885c839..0d3c4be 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
@@ -24,7 +24,6 @@ import jline.console.completer.Completer
 /**
  * Provides the interface required for command extensions.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 @CompileStatic

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
index 3417290..f65d538 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
@@ -24,7 +24,6 @@ import jline.console.completer.Completer
 /**
  * Provides simple command aliasing.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class CommandAlias

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
index 687dc3d..cc8a317 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
@@ -23,7 +23,6 @@ import groovy.transform.CompileStatic
 /**
  * Thrown to indicate a problem with command execution.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 @CompileStatic

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
index c44284a..9cb08b3 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
@@ -23,7 +23,6 @@ import org.codehaus.groovy.tools.shell.util.Logger
 /**
  * A registry of shell {@link Command} instances which may be executed.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class CommandRegistry

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
index db08e17..4c6017d 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
@@ -29,7 +29,6 @@ import org.codehaus.groovy.tools.shell.util.MessageSource
 /**
  * Support for {@link Command} instances.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 abstract class CommandSupport

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
index 285ee69..6b1ed7f 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
@@ -21,7 +21,6 @@ package org.codehaus.groovy.tools.shell
 /**
  * Notification to signal the shell to exit.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class ExitNotification

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
index 0d1b2da..c94ea82 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
@@ -29,7 +29,6 @@ import org.codehaus.groovy.tools.shell.util.WrappedInputStream
 /**
  * Support for running a {@link Shell} interactively using the JLine library.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class InteractiveShellRunner
@@ -147,7 +146,6 @@ class InteractiveShellRunner
 /**
  * Completer for interactive shells.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class CommandsMultiCompleter

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
index 1eb28e2..4a045b2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
@@ -27,7 +27,6 @@ import java.lang.reflect.Method
 /**
  * Helper to interpret a source buffer.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class Interpreter implements Evaluator

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
index e3c2230..2993e04 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
@@ -44,7 +44,6 @@ import org.fusesource.jansi.AnsiConsole
  *
  * Main CLI entry-point for <tt>groovysh</tt>.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class Main

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
index 5535c07..d84fb98 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
@@ -28,7 +28,6 @@ import static org.fusesource.jansi.Ansi.ansi
 /**
  * A simple shell for invoking commands from a command-line.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class Shell

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
index e83a390..7147149 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
@@ -23,7 +23,6 @@ import org.codehaus.groovy.tools.shell.util.Logger
 /**
  * Support for running a {@link Shell}.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 abstract class ShellRunner

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
index f83f9ad..b1b5f67 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
@@ -27,7 +27,6 @@ import org.codehaus.groovy.tools.shell.completion.CommandNameCompleter
 /**
  * The 'alias' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class AliasCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
index 498c40f..9721407 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
@@ -24,7 +24,6 @@ import org.codehaus.groovy.tools.shell.Groovysh
 /**
  * The 'clear' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class ClearCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
index aa44315..b0e228d 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
@@ -24,7 +24,6 @@ import org.codehaus.groovy.tools.shell.Groovysh
 /**
  * The 'display' command. Displays the current buffer (e.g. while method declaration was not finished).
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class DisplayCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
index c58bacd..6b37a12 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
@@ -25,7 +25,6 @@ import org.codehaus.groovy.tools.shell.util.Preferences
 /**
  * The 'edit' command. Opens Editor to write into the current Buffer.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class EditCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
index 6b02801..4cd8bb6 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
@@ -25,7 +25,6 @@ import org.codehaus.groovy.tools.shell.ExitNotification
 /**
  * The 'exit' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class ExitCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
index 9ce25f1..b7b2b89 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
@@ -26,7 +26,6 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
 /**
  * The 'history' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class HistoryCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
index df7f816..5ce2a92 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
@@ -31,7 +31,6 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
 /**
  * The 'inspect' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class InspectCommand
@@ -108,7 +107,6 @@ class InspectCommand
 /**
  * Completor for the 'inspect' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class InspectCommandCompletor

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
index 99f96bd..2383438 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
@@ -26,7 +26,6 @@ import org.codehaus.groovy.tools.shell.completion.FileNameCompleter
 /**
  * The 'load' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class LoadCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
index 485d16b..ab61069 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
@@ -25,7 +25,6 @@ import org.codehaus.groovy.tools.shell.util.Preferences
 /**
  * The 'purge' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class PurgeCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
index fa28708..dd79022 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
@@ -25,7 +25,6 @@ import org.codehaus.groovy.tools.shell.Groovysh
 /**
  * The 'record' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class RecordCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
index e989751..784ae74 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
@@ -27,7 +27,6 @@ import org.codehaus.groovy.tools.shell.Command
  * Registers a class as a new groovysh command.
  * Requires the command to have matching constructors (shell) or (shell, name, alias).
  *
- * @version $Id$
  * @author <a href="mailto:chris@wensel.net">Chris K Wensel</a>
  */
 class RegisterCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
index f283a28..f9fe271 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
@@ -26,7 +26,6 @@ import org.codehaus.groovy.tools.shell.Groovysh
 /**
  * The 'save' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class SaveCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
index 3f1ebf5..1a07584 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
@@ -28,7 +28,6 @@ import org.codehaus.groovy.tools.shell.util.Preferences
 /**
  * The 'set' command, used to set preferences.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class SetCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
index d30272a..4244551 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
@@ -26,7 +26,6 @@ import org.codehaus.groovy.tools.shell.util.Preferences
 /**
  * The 'shadow' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class ShadowCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
index d537077..711d9bb 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
@@ -28,7 +28,6 @@ import org.codehaus.groovy.tools.shell.util.Preferences
 /**
  * The 'show' command.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class ShowCommand

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
index f5323bf..c609445 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
@@ -25,7 +25,6 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
 /**
  * Completor for the command.names
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class CommandNameCompleter extends SimpleCompletor {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
index 5a1f2e4..7ab22a2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
@@ -18,8 +18,6 @@
      under the License.
 
 -->
-<!-- $Id$ -->
-
 <html>
     <body>
         <p>

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
index 06185f9..0494568 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
@@ -45,7 +45,6 @@ import org.codehaus.groovy.tools.shell.commands.ShowCommand
  * ...
  * </commands>
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class DefaultCommandsRegistrar

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
index e62c73f..d4e14b9 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/HelpFormatter.groovy
@@ -31,7 +31,6 @@ import org.apache.commons.cli.Options
 /**
  * Custom CLI help formatter to render things correctly.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class HelpFormatter

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
index 6f63285..70dcb9a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
@@ -24,7 +24,6 @@ import org.codehaus.groovy.runtime.InvokerHelper
 /**
  * Support for simple completors.
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class SimpleCompletor implements Completer {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
index 691ea1d..0b8fedf 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
@@ -51,7 +51,6 @@ import org.codehaus.groovy.tools.shell.Command
  * }
  * <pre>
  *
- * @version $Id$
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
 class XmlCommandRegistrar

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
index 0304ac3..78fe41e 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
@@ -17,9 +17,5 @@
 #  under the License.
 #
 
-#
-# $Id$
-#
-
 info.alias_to=Alias to: @|bold {0}|@
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
index 556e387..07e9336 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
@@ -17,9 +17,5 @@
 #  under the License.
 #
 
-#
-# $Id$
-#
-
 error.unexpected_args=Unexpected arguments: {0}
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
index 0cacc97..c180c70 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
@@ -18,10 +18,6 @@
 #
 
 #
-# $Id$
-#
-
-#
 # Informational and error messages
 #
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
index ddbf5e3..ca7c49c 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
@@ -18,10 +18,6 @@
 #
 
 #
-# $Id$
-#
-
-#
 # CLI messages
 #
 

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
index 59afabd..e220a89 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Create an alias
 command.usage=
 command.help=Create an alias.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
index 88bcdbb..9fe2603 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Clear the buffer and reset the prompt counter.
 command.usage=
 command.help=Clears the current buffer, resetting the prompt counter to 000. Can be used to recover from compilation errors.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
index fbd8fac..ec14e1f 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Display the current buffer
 command.usage=
 command.help=Display the contents of the current buffer.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
index 7a07069..d4be4a3 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Opens a browser window displaying the doc for the argument
 command.usage=[<class>]
 command.help=Opens a browser window displaying the doc for the argument.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
index f426266..8cac109 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Edit the current buffer
 command.usage=
 command.help=Edit the current buffer.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
index 301e3d5..9f80a0b 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Exit the shell
 command.usage=
 command.help=Exit the shell.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
index 76eb8d3..1fd1bc9 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Display this help message
 command.usage=[<command>]
 command.help=Display the list of commands or the help text for @|BOLD command|@.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
index 2e0e6f3..404d892 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Display, manage and recall edit-line history
 command.usage=[show|clear|flush|recall <id>]
 command.help=Display, manage and recall edit-line history.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
index 7e5f449..cfc9d5d 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Import a class into the namespace
 command.usage=[static] <classname> [as <name>]
 command.help=Add a custom import which will be included for all shell evaluations.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
index 02bd872..73437e7 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Inspect a variable or the last result with the GUI object browser
 command.usage=[<variable>]
 command.help=Opens the GUI object browser to inspect a variable or the result of the last evaluation.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
index 5d4cae7..3192f14 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Load a file or URL into the buffer
 command.usage=(<file|url>)+
 command.help=Load one or more files (or urls) into the buffer.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
index b303dfe..2a8317a 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Purge variables, classes, imports or preferences
 command.usage=(<variables|classes|imports|preferences|all>)+
 command.help=Purges objects from the shell.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
index c628484..3377ff3 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Record the current session to a file
 command.usage=[start [<file>]|stop|status]
 command.help=Record the current session to a file.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
index 0c3d1ec..3d88bd8 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Registers a new command with the shell
 command.usage=<classname> [<name>] [alias]
 command.help=Registers the given @|BOLD classname|@ as a new command.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
index d8cd450..8839f18 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Save the current buffer to a file
 command.usage=<file>
 command.help=Saves the buffer's contents to @|BOLD file|@.

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/ab4f07aa/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
index 130bd29..5872d49 100644
--- a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
+++ b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
@@ -16,11 +16,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-
-#
-# $Id$
-#
-
 command.description=Set (or list) preferences
 command.usage=[<name> [<value>]]
 command.help=Set or list preferences.