This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new d9b7f73  cleanup/remove @author tags as per Apache recommended 
practices for groovy-bsf, groovy-jmx, groovy-json, groovy-jsr223
d9b7f73 is described below

commit d9b7f733f450cfe9285906adb87e74f14946d885
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Dec 28 22:09:24 2018 +1000

    cleanup/remove @author tags as per Apache recommended practices for 
groovy-bsf, groovy-jmx, groovy-json, groovy-jsr223
---
 gradle/pomconfigurer.gradle                        |   9 ++
 .../codehaus/groovy/bsf/CachingGroovyEngine.java   |   2 -
 .../java/org/codehaus/groovy/bsf/GroovyEngine.java |   7 +-
 .../test/java/org/codehaus/groovy/bsf/BSFTest.java |   5 +-
 .../java/org/codehaus/groovy/bsf/CacheBSFTest.java |   2 -
 .../jmx/builder/JmxAttributeInfoManager.groovy     |   8 +-
 .../groovy/jmx/builder/JmxBeanExportFactory.groovy |  10 +-
 .../groovy/jmx/builder/JmxBeanFactory.groovy       |  16 ++-
 .../groovy/jmx/builder/JmxBeanInfoManager.groovy   |   8 +-
 .../groovy/jmx/builder/JmxBeansFactory.groovy      |  21 ++--
 .../groovy/groovy/jmx/builder/JmxBuilder.groovy    |  24 ++--
 .../groovy/jmx/builder/JmxBuilderTools.groovy      | 135 ++++++++++----------
 .../jmx/builder/JmxClientConnectorFactory.groovy   |   7 +-
 .../groovy/jmx/builder/JmxEmitterFactory.groovy    |  14 +--
 .../groovy/jmx/builder/JmxListenerFactory.groovy   |  29 +++--
 .../groovy/jmx/builder/JmxMetaMapBuilder.groovy    | 136 ++++++++++-----------
 .../jmx/builder/JmxOperationInfoManager.groovy     |  17 ++-
 .../jmx/builder/JmxServerConnectorFactory.groovy   |  19 ++-
 .../groovy/jmx/builder/JmxBuilderException.java    |   2 -
 .../groovy/jmx/builder/JmxBuilderModelMBean.java   |   3 -
 .../java/groovy/jmx/builder/JmxEventEmitter.java   |   1 -
 .../groovy/jmx/builder/JmxEventEmitterMBean.java   |   1 -
 .../java/groovy/jmx/builder/JmxEventListener.java  |   1 -
 .../src/main/java/groovy/util/GroovyMBean.java     |   4 -
 .../groovy/jmx/builder/JmxBeansFactoryTest.groovy  |   4 -
 .../src/test/java/groovy/util/MBeanTest.java       |   2 -
 .../src/main/java/groovy/json/JsonBuilder.java     |   2 -
 .../src/main/java/groovy/json/JsonDelegate.java    |   2 -
 .../src/main/java/groovy/json/JsonException.java   |   1 -
 .../src/main/java/groovy/json/JsonLexer.java       |   1 -
 .../src/main/java/groovy/json/JsonOutput.java      |   6 -
 .../src/main/java/groovy/json/JsonParser.java      |   2 +-
 .../src/main/java/groovy/json/JsonParserType.java  |   1 -
 .../src/main/java/groovy/json/JsonSlurper.java     |   3 -
 .../main/java/groovy/json/JsonSlurperClassic.java  |   1 -
 .../src/main/java/groovy/json/JsonToken.java       |   1 -
 .../src/main/java/groovy/json/JsonTokenType.java   |   1 -
 .../java/groovy/json/StreamingJsonBuilder.java     |   4 -
 .../apache/groovy/json/internal/ArrayUtils.java    |   3 -
 .../groovy/json/internal/BaseJsonParser.java       |   2 -
 .../apache/groovy/json/internal/ByteScanner.java   |   3 -
 .../org/apache/groovy/json/internal/Cache.java     |   1 -
 .../org/apache/groovy/json/internal/CacheType.java |   3 -
 .../org/apache/groovy/json/internal/CharBuf.java   |   3 -
 .../apache/groovy/json/internal/CharScanner.java   |   3 -
 .../groovy/json/internal/CharSequenceValue.java    |   3 -
 .../groovy/json/internal/CharacterSource.java      |   3 -
 .../java/org/apache/groovy/json/internal/Chr.java  |   3 -
 .../org/apache/groovy/json/internal/Dates.java     |   3 -
 .../apache/groovy/json/internal/Exceptions.java    |   3 -
 .../java/org/apache/groovy/json/internal/IO.java   |   3 -
 .../groovy/json/internal/JsonFastParser.java       |   2 -
 .../groovy/json/internal/JsonParserCharArray.java  |   6 +-
 .../apache/groovy/json/internal/JsonParserLax.java |   3 -
 .../internal/JsonParserUsingCharacterSource.java   |   3 -
 .../groovy/json/internal/JsonStringDecoder.java    |   3 -
 .../org/apache/groovy/json/internal/LazyMap.java   |   2 -
 .../apache/groovy/json/internal/LazyValueMap.java  |   2 -
 .../apache/groovy/json/internal/MapItemValue.java  |   2 -
 .../apache/groovy/json/internal/NumberValue.java   |   3 -
 .../json/internal/ReaderCharacterSource.java       |   3 -
 .../apache/groovy/json/internal/SimpleCache.java   |   3 -
 .../java/org/apache/groovy/json/internal/Type.java |   3 -
 .../org/apache/groovy/json/internal/Value.java     |   3 -
 .../groovy/json/internal/ValueContainer.java       |   3 -
 .../org/apache/groovy/json/internal/ValueList.java |   3 -
 .../org/apache/groovy/json/internal/ValueMap.java  |   3 -
 .../apache/groovy/json/internal/ValueMapImpl.java  |   2 -
 .../src/test/groovy/groovy/json/CharBufTest.groovy |   3 -
 .../src/test/groovy/groovy/json/IOTest.groovy      |   2 -
 .../test/groovy/groovy/json/JsonBuilderTest.groovy |   3 -
 .../test/groovy/groovy/json/JsonLexerTest.groovy   |   3 -
 .../test/groovy/groovy/json/JsonOutputTest.groovy  |   4 -
 .../test/groovy/groovy/json/JsonSlurperTest.groovy |   3 -
 .../groovy/groovy/json/JsonTokenTypeTest.groovy    |   4 -
 .../groovy/groovy/json/JsonTokenValueTest.groovy   |   3 -
 .../groovy/groovy/json/RealJsonPayloadsTest.groovy |   3 -
 .../groovy/json/StreamingJsonBuilderTest.groovy    |   4 -
 .../groovy/jsr223/GroovyCompiledScript.java        |   3 +-
 .../groovy/jsr223/GroovyScriptEngineFactory.java   |   5 +-
 .../groovy/jsr223/GroovyScriptEngineImpl.java      |   6 +-
 .../org/codehaus/groovy/jsr223/JSR223Test.groovy   |   3 -
 .../codehaus/groovy/jsr223/JSR223SecurityTest.java |   2 -
 83 files changed, 225 insertions(+), 423 deletions(-)

diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index d98454a..828d408 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -501,6 +501,12 @@ project.ext.pomConfigureClosureWithoutTweaks = {
                 name 'Philip Milne'
             }
             contributor {
+                name 'Tiago Fernandez'
+            }
+            contributor {
+                name 'Steve Button'
+            }
+            contributor {
                 name 'Joachim Baumann'
             }
             contributor {
@@ -690,6 +696,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
                 name 'Martin Ghados'
             }
             contributor {
+                name 'Martin Stockhammer'
+            }
+            contributor {
                 name 'Alberto Mijares'
             }
             contributor {
diff --git 
a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
 
b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
index aa5b078..9d49673 100644
--- 
a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
+++ 
b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/CachingGroovyEngine.java
@@ -39,8 +39,6 @@ import java.util.logging.Logger;
 
 /**
  * A Caching implementation of the GroovyEngine
- *
- * @author James Birchfield
  */
 public class CachingGroovyEngine extends GroovyEngine {
     private static final Logger LOG = 
Logger.getLogger(CachingGroovyEngine.class.getName());
diff --git 
a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
 
b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
index 1c524fe..5722d4a 100644
--- 
a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
+++ 
b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
@@ -30,12 +30,9 @@ import org.codehaus.groovy.runtime.InvokerHelper;
 import java.util.Vector;
 
 /**
- * A BSF Engine for the <a href="http://groovy-lang.org/";>Groovy</a>
- * scripting language.
+ * A BSF Engine for the <a href="http://groovy-lang.org/";>Groovy</a> scripting 
language.
  * <p>
- * It's derived from the Jython / JPython engine
- *
- * @author James Strachan
+ * It's inspired from the Jython engine
  */
 public class GroovyEngine extends BSFEngineImpl {
     protected GroovyShell shell;
diff --git 
a/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java 
b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java
index 1c1d384..44bb433 100644
--- a/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java
+++ b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/BSFTest.java
@@ -29,10 +29,7 @@ import java.util.List;
 import java.util.Vector;
 
 /**
- * Tests the BSF integration
- *
- * @author <a href="mailto:ja...@coredevelopers.net";>James Strachan</a>
- * @author Paul King
+ * Tests the BSF integration.
  */
 public class BSFTest extends TestCase {
     private static final Class ENGINE = GroovyEngine.class;
diff --git 
a/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
 
b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
index b8ef811..4a09ebe 100644
--- 
a/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
+++ 
b/subprojects/groovy-bsf/src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java
@@ -28,8 +28,6 @@ import java.util.Vector;
 
 /**
  * Tests the Caching BSF integration
- *
- * @author James Birchfield
  */
 public class CacheBSFTest extends TestCase {
 
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
index 8c03110..d4345f3 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxAttributeInfoManager.groovy
@@ -26,8 +26,6 @@ import javax.management.modelmbean.ModelMBeanAttributeInfo
  * It cycles through the meta map from the Node and generate JMX Info objects 
used to
  * expose information in the MBeanServer.
  *
- * @author Vladimir Vivien 
- *
  * @see groovy.jmx.builder.JmxMetaMapBuilder
  */
 class JmxAttributeInfoManager {
@@ -36,11 +34,11 @@ class JmxAttributeInfoManager {
      * @param metaMap list of meta data maps
      * @return ModelMBeanAttributeInfo
      */
-    public static List<ModelMBeanAttributeInfo> getAttributeInfosFromMap(Map 
metaMap) {
+    static List<ModelMBeanAttributeInfo> getAttributeInfosFromMap(Map metaMap) 
{
         if (!metaMap) return null
 
         def attribs = []
-        metaMap.each {attribName, map ->
+        metaMap.each { attribName, map ->
             map.name = attribName
             ModelMBeanAttributeInfo info = getAttributeInfoFromMap(map)
             attribs << info
@@ -54,7 +52,7 @@ class JmxAttributeInfoManager {
      * @param map the map object containing the meta data
      * @return the generated ModelMBeanAttribute Info object.
      */
-    public static ModelMBeanAttributeInfo getAttributeInfoFromMap(Map map) {
+    static ModelMBeanAttributeInfo getAttributeInfoFromMap(Map map) {
         if (!map) return null
 
         MetaProperty prop = map.remove("property")
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
index 70d9736..68348cd 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanExportFactory.groovy
@@ -34,23 +34,21 @@ package groovy.jmx.builder
  * "replace" - replaces existing bean,  <br>
  * "ignore" - ignores the registration request if bean already exists.<br>
  * "error" - throws error if bean is already registered.
- *
- * @author vladimir vivien 
  */
 class JmxBeanExportFactory extends AbstractFactory {
     // def server
     def registrationPolicy
 
-    public Object newInstance(FactoryBuilderSupport builder, Object nodeName, 
Object nodeArgs, Map nodeAttribs) {
+    Object newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeArgs, Map nodeAttribs) {
         registrationPolicy = nodeAttribs?.remove("policy") ?: 
nodeAttribs?.remove("regPolicy") ?: "replace"
         return []
     }
 
-    public boolean onHandleNodeAttributes(FactoryBuilderSupport builder, 
Object node, Map nodeAttribs) {
-        return true;
+    boolean onHandleNodeAttributes(FactoryBuilderSupport builder, Object node, 
Map nodeAttribs) {
+        return true
     }
 
-    public boolean isLeaf() {
+    boolean isLeaf() {
         return false
     }
 }
\ No newline at end of file
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
index 443fc56..f6dc4ca 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanFactory.groovy
@@ -75,7 +75,7 @@ import javax.management.MBeanServer
  *         "opName3":[
  *             onCall:{event->
  *                 // onCall event callback code here.
- *             }]
+ *}]
  *         ],
  *
  *     listeners:[
@@ -83,15 +83,13 @@ import javax.management.MBeanServer
  *             event: "eventType", from:"object name"|ObjectName(),
  *             call:{event->
  *                 // handler code for event
- *             }],
+ *}],
  *     ]
  * )
  * </code></pre>
- *
- * @author Vladimir Vivien
  */
 class JmxBeanFactory extends AbstractFactory {
-    public Object newInstance(FactoryBuilderSupport builder, Object nodeName, 
Object nodeParam, Map nodeAttributes) {
+    Object newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeParam, Map nodeAttributes) {
 
         JmxBuilder fsb = (JmxBuilder) builder
         MBeanServer server = (MBeanServer) fsb.getMBeanServer()
@@ -118,11 +116,11 @@ class JmxBeanFactory extends AbstractFactory {
         return metaMap
     }
 
-    public boolean onHandleNodeAttributes(FactoryBuilderSupport builder, 
Object node, Map nodeAttribs) {
-        return false;
+    boolean onHandleNodeAttributes(FactoryBuilderSupport builder, Object node, 
Map nodeAttribs) {
+        return false
     }
 
-    public void onNodeCompleted(FactoryBuilderSupport builder, Object 
parentNode, Object thisNode) {
+    void onNodeCompleted(FactoryBuilderSupport builder, Object parentNode, 
Object thisNode) {
         JmxBuilder fsb = (JmxBuilder) builder
         MBeanServer server = (MBeanServer) fsb.getMBeanServer()
         def metaMap = thisNode
@@ -147,7 +145,7 @@ class JmxBeanFactory extends AbstractFactory {
         }
     }
 
-    public boolean isLeaf() {
+    boolean isLeaf() {
         return false
     }
 
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
index 4c14696..2e8637d 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeanInfoManager.groovy
@@ -30,8 +30,6 @@ import javax.management.modelmbean.ModelMBeanOperationInfo
 /**
  * The JmxBeanInfoManager creates fully-described model mbean info object 
using the underlying meta map.
  * The MBeanInfo object is used to provide description about the actual 
exported MBean instance.
- *
- * @author Vladimir Vivien
  */
 class JmxBeanInfoManager {
     /**
@@ -39,7 +37,7 @@ class JmxBeanInfoManager {
      * @param object used for name
      * @return an instance of ObjectName
      */
-    public static ObjectName buildDefaultObjectName(String defaultDomain, 
String defaultType, def object) {
+    static ObjectName buildDefaultObjectName(String defaultDomain, String 
defaultType, def object) {
         def name = 
"${defaultDomain}:type=${defaultType},name=${object.class.canonicalName}@${object.hashCode()}"
         return new ObjectName(name)
     }
@@ -49,7 +47,7 @@ class JmxBeanInfoManager {
      * @param map map of object
      * @return ModelMBeanInfo built from map
      */
-    public static ModelMBeanInfo getModelMBeanInfoFromMap(Map map) {
+    static ModelMBeanInfo getModelMBeanInfoFromMap(Map map) {
         if (!map) {
             throw new JmxBuilderException("Unable to create default 
ModelMBeanInfo, missing meta map.")
         }
@@ -62,7 +60,7 @@ class JmxBeanInfoManager {
         def operations = 
JmxOperationInfoManager.getOperationInfosFromMap(map.operations) ?: []
 
         //generate setters/getters operations for found attribs
-        attributes.each {info ->
+        attributes.each { info ->
             MetaProperty prop = 
object.metaClass.getMetaProperty(JmxBuilderTools.uncapitalize(info.name))
             if (prop && info.isReadable()) {
                 operations << 
JmxOperationInfoManager.createGetterOperationInfoFromProperty(prop)
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
index 0cb46f3..deb3c82 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBeansFactory.groovy
@@ -20,12 +20,8 @@ package groovy.jmx.builder
 
 import javax.management.MBeanServer
 
-/**
- *
- * @author vladimir
- */
 class JmxBeansFactory extends AbstractFactory {
-    public Object newInstance(FactoryBuilderSupport builder, Object nodeName, 
Object nodeParam, Map nodeAttribs) {
+    Object newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeParam, Map nodeAttribs) {
         if (!nodeParam || !(nodeParam instanceof List)) {
             throw new JmxBuilderException("Node '${nodeName}' requires a list 
of object to be exported.")
         }
@@ -35,10 +31,9 @@ class JmxBeansFactory extends AbstractFactory {
 
         def metaMaps = []
         def targets = nodeParam
-        def map
 
         // prepare metaMap for each object
-        targets.each {target ->
+        targets.each { target ->
             def metaMap = JmxMetaMapBuilder.buildObjectMapFrom(target)
             metaMap.server = metaMap.server ?: server
             metaMap.isMBean = JmxBuilderTools.isClassMBean(target.getClass())
@@ -47,22 +42,22 @@ class JmxBeansFactory extends AbstractFactory {
         return metaMaps
     }
 
-    public boolean onHandleNodeAttributes(FactoryBuilderSupport builder, 
Object node, Map nodeAttribs) {
-        return false;
+    boolean onHandleNodeAttributes(FactoryBuilderSupport builder, Object node, 
Map nodeAttribs) {
+        return false
     }
 
-    public boolean isLeaf() {
-        return true;
+    boolean isLeaf() {
+        return true
     }
 
-    public void onNodeCompleted(FactoryBuilderSupport builder, Object 
parentNode, Object thisNode) {
+    void onNodeCompleted(FactoryBuilderSupport builder, Object parentNode, 
Object thisNode) {
         JmxBuilder fsb = (JmxBuilder) builder
         MBeanServer server = (MBeanServer) fsb.getMBeanServer()
         def metaMaps = thisNode
 
         def regPolicy = fsb.parentFactory?.registrationPolicy ?: "replace"
 
-        metaMaps.each {metaMap ->
+        metaMaps.each { metaMap ->
             def registeredBean = 
JmxBuilderTools.registerMBeanFromMap(regPolicy, metaMap)
 
             // if replace, remove from parent node and re add.
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy
index 50f890d..b3e4ad0 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilder.groovy
@@ -23,8 +23,6 @@ import javax.management.MBeanServerConnection
 /** *
  * This is JmxBuilder's factory builder class.  It is the parent node to all 
other children nodes supported
  * by JmxBuilder.
- *
- * @author Vladimir Vivien
  */
 class JmxBuilder extends FactoryBuilderSupport {
     private MBeanServerConnection server
@@ -32,11 +30,11 @@ class JmxBuilder extends FactoryBuilderSupport {
     private String defaultNameType = JmxBuilderTools.DEFAULT_NAME_TYPE
     private String mode = "markup"
 
-    public JmxBuilder() {
+    JmxBuilder() {
         registerFactories()
     }
 
-    public JmxBuilder(MBeanServerConnection svrConnection) {
+    JmxBuilder(MBeanServerConnection svrConnection) {
         this()
         server = svrConnection
     }
@@ -54,45 +52,45 @@ class JmxBuilder extends FactoryBuilderSupport {
         registerFactory "connectorServer", svrFactory
         registerFactory "serverConnector", svrFactory
 
-        def newClientFactory = {new JmxClientConnectorFactory()}
+        def newClientFactory = { new JmxClientConnectorFactory() }
         registerFactory "client", newClientFactory()
         registerFactory "connector", newClientFactory()
         registerFactory "clientConnector", newClientFactory()
         registerFactory "connectorClient", newClientFactory()
     }
 
-    public MBeanServerConnection getMBeanServer() {
+    MBeanServerConnection getMBeanServer() {
         if (!server) {
             server = JmxBuilderTools.getMBeanServer()
         }
         return server
     }
 
-    public void setDefaultJmxNameDomain(String domain) {
+    void setDefaultJmxNameDomain(String domain) {
         this.defaultNameDomain = domain
     }
 
-    public String getDefaultJmxNameDomain() {
+    String getDefaultJmxNameDomain() {
         return this.defaultNameDomain
     }
 
-    public void setDefaultJmxNameType(String type) {
+    void setDefaultJmxNameType(String type) {
         this.defaultNameType = type
     }
 
-    public String getDefaultJmxNameType() {
+    String getDefaultJmxNameType() {
         return this.defaultNameType
     }
 
-    public void setMBeanServer(MBeanServerConnection svr) {
+    void setMBeanServer(MBeanServerConnection svr) {
         server = svr
     }
 
-    public void setMode(String mode) {
+    void setMode(String mode) {
         this.mode = mode
     }
 
-    public String getMode() {
+    String getMode() {
         return mode
     }
 
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
index 85906dc..3e6fb64 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
@@ -26,8 +26,6 @@ import java.lang.management.ManagementFactory
 
 /**
  * This is a utility class used as a helper for JmxBuilder.
- *
- * @author Vladimir Vivien
  */
 class JmxBuilderTools {
     static String DEFAULT_DOMAIN = "jmx.builder"
@@ -93,72 +91,71 @@ class JmxBuilderTools {
     static String EVENT_KEY_TARGETS = "eventListeners"
 
 
-
     static Map PRIMITIVE_TYPES = [
-            "char": java.lang.Integer.TYPE,
-            "byte": java.lang.Byte.TYPE,
-            "short": java.lang.Short.TYPE,
-            "int": java.lang.Integer.TYPE,
-            "long": java.lang.Long.TYPE,
-            "float": java.lang.Float.TYPE,
-            "double": java.lang.Double.TYPE,
+            "char"   : java.lang.Integer.TYPE,
+            "byte"   : java.lang.Byte.TYPE,
+            "short"  : java.lang.Short.TYPE,
+            "int"    : java.lang.Integer.TYPE,
+            "long"   : java.lang.Long.TYPE,
+            "float"  : java.lang.Float.TYPE,
+            "double" : java.lang.Double.TYPE,
             "boolean": java.lang.Boolean.TYPE
     ]
     static Map TYPE_MAP = [
-            "object": java.lang.Object.class,
-            "Object": java.lang.Object.class,
-            "java.lang.Object": java.lang.Object.class,
-
-            "string": java.lang.String.class,
-            "String": java.lang.String.class,
-            "java.lang.String": java.lang.String.class,
-
-            "char": char.class,
-            "character": java.lang.Character.class,
-            "Character": java.lang.Character.class,
-            "java.lang.Character": java.lang.Character.class,
-
-            "byte": byte.class,
-            "Byte": java.lang.Byte.class,
-            "java.lang.Byte": java.lang.Byte.class,
-
-            "short": short.class,
-            "Short": java.lang.Short.class,
-            "java.lang.Short": java.lang.Short.class,
-
-            "int": int.class,
-            "integer": java.lang.Integer.class,
-            "Integer": java.lang.Integer.class,
-            "java.lang.Integer": java.lang.Integer.class,
-
-            "long": long.class,
-            "Long": java.lang.Long.class,
-            "java.lang.Long": java.lang.Long.class,
-
-            "float": float.class,
-            "Float": java.lang.Float.class,
-            "java.lang.Float": java.lang.Float.class,
-
-            "double": double.class,
-            "Double": java.lang.Double.class,
-            "java.lang.Double": java.lang.Double.class,
-
-            "boolean": boolean.class,
-            "Boolean": java.lang.Boolean.class,
-            "java.lang.Boolean": java.lang.Boolean.class,
-
-            "bigDec": java.math.BigDecimal.class,
-            "bigDecimal": java.math.BigDecimal.class,
-            "BigDecimal": java.math.BigDecimal.class,
+            "object"              : java.lang.Object.class,
+            "Object"              : java.lang.Object.class,
+            "java.lang.Object"    : java.lang.Object.class,
+
+            "string"              : java.lang.String.class,
+            "String"              : java.lang.String.class,
+            "java.lang.String"    : java.lang.String.class,
+
+            "char"                : char.class,
+            "character"           : java.lang.Character.class,
+            "Character"           : java.lang.Character.class,
+            "java.lang.Character" : java.lang.Character.class,
+
+            "byte"                : byte.class,
+            "Byte"                : java.lang.Byte.class,
+            "java.lang.Byte"      : java.lang.Byte.class,
+
+            "short"               : short.class,
+            "Short"               : java.lang.Short.class,
+            "java.lang.Short"     : java.lang.Short.class,
+
+            "int"                 : int.class,
+            "integer"             : java.lang.Integer.class,
+            "Integer"             : java.lang.Integer.class,
+            "java.lang.Integer"   : java.lang.Integer.class,
+
+            "long"                : long.class,
+            "Long"                : java.lang.Long.class,
+            "java.lang.Long"      : java.lang.Long.class,
+
+            "float"               : float.class,
+            "Float"               : java.lang.Float.class,
+            "java.lang.Float"     : java.lang.Float.class,
+
+            "double"              : double.class,
+            "Double"              : java.lang.Double.class,
+            "java.lang.Double"    : java.lang.Double.class,
+
+            "boolean"             : boolean.class,
+            "Boolean"             : java.lang.Boolean.class,
+            "java.lang.Boolean"   : java.lang.Boolean.class,
+
+            "bigDec"              : java.math.BigDecimal.class,
+            "bigDecimal"          : java.math.BigDecimal.class,
+            "BigDecimal"          : java.math.BigDecimal.class,
             "java.math.BigDecimal": java.math.BigDecimal.class,
 
-            "bigInt": java.math.BigInteger.class,
-            "bigInteger": java.math.BigInteger.class,
-            "BigInteger": java.math.BigInteger.class,
+            "bigInt"              : java.math.BigInteger.class,
+            "bigInteger"          : java.math.BigInteger.class,
+            "BigInteger"          : java.math.BigInteger.class,
             "java.math.BigInteger": java.math.BigInteger.class,
 
-            "date": java.util.Date.class,
-            "java.util.Date": java.util.Date.class
+            "date"                : java.util.Date.class,
+            "java.util.Date"      : java.util.Date.class
     ]
 
     /**
@@ -166,7 +163,7 @@ class JmxBuilderTools {
      * @param value - string to capitalize.
      * @return - a capitalized string.
      */
-    public static String capitalize(String value) {
+    static String capitalize(String value) {
         if (!value) return null
         if (value.length() == 1) return value.toUpperCase()
         return (value.length() > 1) ? value[0].toUpperCase() + value[1..-1] : 
value.toUpperCase()
@@ -177,7 +174,7 @@ class JmxBuilderTools {
      * @param value - string to uncap.
      * @return uncap'ed string.
      */
-    public static String uncapitalize(String value) {
+    static String uncapitalize(String value) {
         if (!value) return null
         if (value.length() == 1) return value.toLowerCase()
         return (value.length() > 1) ? value[0].toLowerCase() + value[1..-1] : 
value.toLowerCase()
@@ -188,7 +185,7 @@ class JmxBuilderTools {
      * @param obj - the backing pojo/pogo
      * @return the generated ObjectName() instance.
      */
-    public static ObjectName getDefaultObjectName(def obj) {
+    static ObjectName getDefaultObjectName(def obj) {
         String name = DEFAULT_DOMAIN + 
":name=${obj.getClass().getName()},hashCode=${obj.hashCode()}"
         try {
             return new ObjectName(name)
@@ -201,7 +198,7 @@ class JmxBuilderTools {
      * Returns an MBeanServerConnection instance.  It searches for declared 
MBeanServers
      * from the MBeanServerFactory.  If none is found, the default Platform 
MBeanServer is returned.
      */
-    public static MBeanServerConnection getMBeanServer() {
+    static MBeanServerConnection getMBeanServer() {
         def servers = MBeanServerFactory.findMBeanServer(null);
         def server = servers.size() > 0 ? servers[0] : 
ManagementFactory.getPlatformMBeanServer()
         return server
@@ -212,10 +209,10 @@ class JmxBuilderTools {
      * @param params - the map with parameter info.
      * @return Class[] that represent the method signature.
      */
-    public static Class[] getSignatureFromParamInfo(def params) {
+    static Class[] getSignatureFromParamInfo(def params) {
         if (params == null || params.size() == 0) return null
         Object[] result = new Object[params.size()]
-        params.eachWithIndex {param, i ->
+        params.eachWithIndex { param, i ->
             def type = TYPE_MAP.get(param.getType()) ?: 
Class.forName(param.getType()) ?: null
             result.putAt i, type
         }
@@ -228,7 +225,7 @@ class JmxBuilderTools {
      * @param type - the type name to normalize
      * @return the normalized type name.
      */
-    public static String getNormalizedType(String type) {
+    static String getNormalizedType(String type) {
         if (typeIsPrimitive(type))
             return PRIMITIVE_TYPES[type].name
         return TYPE_MAP[type]?.name ?: Class.forName(type)?.name ?: null
@@ -257,7 +254,7 @@ class JmxBuilderTools {
      * @param cls - class to test
      * @return true = if class implements DynamicMBean or interface name that 
ends in MBean or MXBean.
      */
-    public static boolean isClassMBean(Class cls) {
+    static boolean isClassMBean(Class cls) {
         boolean result = false
         if (cls == null) result = false
         if (DynamicMBean.class.isAssignableFrom(cls)) {
@@ -275,7 +272,7 @@ class JmxBuilderTools {
         return result
     }
 
-    public static GroovyMBean registerMBeanFromMap(String regPolicy, Map 
metaMap) {
+    static GroovyMBean registerMBeanFromMap(String regPolicy, Map metaMap) {
         // get modelmbean info from meta map
         def info = JmxBeanInfoManager.getModelMBeanInfoFromMap(metaMap)
 
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
index 054143f..4aa34c8 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxClientConnectorFactory.groovy
@@ -24,7 +24,7 @@ import javax.management.remote.JMXServiceURL
 
 /**
  * This is the factory for node JmxBuilder.connectorClient.
- * A call to this node returns an insatnce of the JMXConnector interface.
+ * A call to this node returns an instance of the JMXConnector interface.
  *
  * <pre>
  * JmxBuilder.clientConnector (
@@ -35,14 +35,13 @@ import javax.management.remote.JMXServiceURL
  * )
  * </pre>
  *
- * @author Vladimir Vivien
  * @see <a 
href="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/remote/JMXConnector.html";>JMXConnector</a>
  */
 class JmxClientConnectorFactory extends AbstractFactory {
 
     private static final List SUPPORTED_PROTOCOLS = ["rmi", "jrmp", "iiop", 
"jmxmp"]
 
-    public Object newInstance(FactoryBuilderSupport builder, Object nodeName, 
Object nodeArgs, Map nodeAttribs) {
+    Object newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeArgs, Map nodeAttribs) {
         if (nodeArgs) {
             throw new JmxBuilderException("Node '${nodeName}' only supports 
named attributes.")
         }
@@ -61,7 +60,7 @@ class JmxClientConnectorFactory extends AbstractFactory {
         }
 
         JMXServiceURL serviceUrl = (url) ? new JMXServiceURL(url) : 
generateServiceUrl(protocol, host, port)
-        JMXConnector connector = 
JMXConnectorFactory.newJMXConnector(serviceUrl, props);
+        JMXConnector connector = 
JMXConnectorFactory.newJMXConnector(serviceUrl, props)
 
         return connector
     }
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
index 08ca426..5d26fd8 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
@@ -34,8 +34,6 @@ import javax.management.ObjectName
  * ...
  * jmx.emitter.send(object)
  * </pre>
- *
- * @author Vladimir Vivien
  */
 class JmxEmitterFactory extends AbstractFactory {
     def newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeParam, Map nodeAttribs) {
@@ -71,7 +69,7 @@ class JmxEmitterFactory extends AbstractFactory {
             throw new JmxBuilderException("Listeners must be provided as a 
list [listener1,...,listenerN]")
         }
 
-        listeners.each {l ->
+        listeners.each { l ->
             def listener = l
             try {
                 if (listener instanceof String) {
@@ -97,15 +95,15 @@ class JmxEmitterFactory extends AbstractFactory {
         if (!name) return new 
ObjectName("${fsb.getDefaultJmxNameDomain()}:type=Emitter,name=Emitter@${emitter.hashCode()}")
     }
 
-    public boolean onHandleNodeAttributes(FactoryBuilderSupport builder, 
Object node, Map nodeAttribs) {
-        return false;
+    boolean onHandleNodeAttributes(FactoryBuilderSupport builder, Object node, 
Map nodeAttribs) {
+        return false
     }
 
-    public boolean isLeaf() {
-        return true;
+    boolean isLeaf() {
+        return true
     }
 
-    public void onNodeCompleted(FactoryBuilderSupport builder, Object 
parentNode, Object thisNode) {
+    void onNodeCompleted(FactoryBuilderSupport builder, Object parentNode, 
Object thisNode) {
         if (parentNode != null) {
             parentNode.add(thisNode)
         }
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
index 3c767c8..6a9adbd 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxListenerFactory.groovy
@@ -30,50 +30,49 @@ import javax.management.NotificationFilterSupport
  * <pre>
  * JmxBuilder.listener(event:"event type", from:"Object Name"|ObjectName(), 
call:{event->
  *   // event handling code here.
- * })
+ *})
  * </pre>
  *
- * @author Vladimir Vivien
  * @see groovy.jmx.builder.JmxEventListener
  */
 class JmxListenerFactory extends AbstractFactory {
-    public Object newInstance(FactoryBuilderSupport builder, Object nodeName, 
Object nodeParam, Map nodeAttribs) {
+    Object newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeParam, Map nodeAttribs) {
         if (nodeParam) {
             throw new JmxBuilderException("Node '${nodeName}' only supports 
named attributes.")
         }
         JmxBuilder fsb = (JmxBuilder) builder
         def server = fsb.getMBeanServer()
-        def map = JmxMetaMapBuilder.createListenerMap(nodeAttribs);
+        def map = JmxMetaMapBuilder.createListenerMap(nodeAttribs)
 
-        def broadcaster = map.get("from");
+        def broadcaster = map.get("from")
         try {
             def eventType = (String) map.get("event");
             if (!server.isRegistered(broadcaster)) {
                 throw new JmxBuilderException("MBean 
'${broadcaster.toString()}' is not registered in server.")
             }
             if (eventType) {
-                NotificationFilterSupport filter = new 
NotificationFilterSupport();
-                filter.enableType(eventType);
-                server.addNotificationListener(broadcaster, 
JmxEventListener.getListener(), filter, map);
+                NotificationFilterSupport filter = new 
NotificationFilterSupport()
+                filter.enableType(eventType)
+                server.addNotificationListener(broadcaster, 
JmxEventListener.getListener(), filter, map)
             } else {
-                server.addNotificationListener(broadcaster, 
JmxEventListener.getListener(), null, map);
+                server.addNotificationListener(broadcaster, 
JmxEventListener.getListener(), null, map)
             }
         } catch (InstanceNotFoundException e) {
-            throw new JmxBuilderException(e);
+            throw new JmxBuilderException(e)
         }
 
         map
     }
 
-    public boolean onHandleNodeAttributes(FactoryBuilderSupport builder, 
Object node, Map nodeAttribs) {
-        return false;
+    boolean onHandleNodeAttributes(FactoryBuilderSupport builder, Object node, 
Map nodeAttribs) {
+        return false
     }
 
-    public boolean isLeaf() {
-        return true;
+    boolean isLeaf() {
+        return true
     }
 
-    public void onNodeCompleted(FactoryBuilderSupport builder, Object 
parentNode, Object thisNode) {
+    void onNodeCompleted(FactoryBuilderSupport builder, Object parentNode, 
Object thisNode) {
         if (parentNode != null) {
             parentNode.add(thisNode)
         }
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
index 0886f64..2aa5db3 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
@@ -24,8 +24,6 @@ import java.lang.reflect.Constructor
 /**
  * The JmxMetaMapBuilder class is used to collect meta data passed in 
JmxBuilder nodes.  Once collected,
  * the data is then normalized to be represented uniformly regardless of the 
resource where it was obtained.
- *
- * @author Vladimir Vivien
  */
 class JmxMetaMapBuilder {
 
@@ -52,7 +50,7 @@ class JmxMetaMapBuilder {
      * @see #buildConstructorMapFrom(Object)
      * @see #buildOperationMapFrom(Object)
      */
-    public static Map buildObjectMapFrom(def object) {
+    static Map buildObjectMapFrom(def object) {
         if (!object) {
             throw new JmxBuilderException("Unable to create MBean, missing 
target object.")
         }
@@ -68,35 +66,35 @@ class JmxMetaMapBuilder {
             // if only the jmx name is provided fill in the rest.
             if (descriptor.size() == 1 && descriptor.name) {
                 map = [
-                        target: object,
-                        name: object.getClass().name,
-                        jmxName: getObjectName(descriptor),
-                        displayName: "JMX Managed Object 
${object.class.canonicalName}".toString(),
-                        attributes: buildAttributeMapFrom(object),
+                        target      : object,
+                        name        : object.getClass().name,
+                        jmxName     : getObjectName(descriptor),
+                        displayName : "JMX Managed Object 
${object.class.canonicalName}".toString(),
+                        attributes  : buildAttributeMapFrom(object),
                         constructors: buildConstructorMapFrom(object),
-                        operations: buildOperationMapFrom(object)
+                        operations  : buildOperationMapFrom(object)
                 ]
 
             }
             // else, build description from descriptor
             else {
                 map = [
-                        target: object,
-                        name: object.getClass().name,
-                        displayName: descriptor.desc ?: descriptor.desc,
-                        attributes: buildAttributeMapFrom(object, 
descriptor.attributes ?: descriptor.attribs),
+                        target      : object,
+                        name        : object.getClass().name,
+                        displayName : descriptor.desc ?: descriptor.desc,
+                        attributes  : buildAttributeMapFrom(object, 
descriptor.attributes ?: descriptor.attribs),
                         constructors: buildConstructorMapFrom(object, 
descriptor.constructors ?: descriptor.ctors),
-                        operations: buildOperationMapFrom(object, 
descriptor.operations ?: descriptor.ops),
-                        listeners: buildListenerMapFrom(descriptor.listeners),
-                        mbeanServer: descriptor.server ?: 
descriptor.mbeanServer
+                        operations  : buildOperationMapFrom(object, 
descriptor.operations ?: descriptor.ops),
+                        listeners   : 
buildListenerMapFrom(descriptor.listeners),
+                        mbeanServer : descriptor.server ?: 
descriptor.mbeanServer
                 ]
 
                 // validate object Name
                 map.jmxName = getObjectName(descriptor) ?:
-                    JmxBeanInfoManager.buildDefaultObjectName(
-                            JmxBuilderTools.DEFAULT_DOMAIN,
-                            JmxBuilderTools.DEFAULT_NAME_TYPE,
-                            object)
+                        JmxBeanInfoManager.buildDefaultObjectName(
+                                JmxBuilderTools.DEFAULT_DOMAIN,
+                                JmxBuilderTools.DEFAULT_NAME_TYPE,
+                                object)
             }
 
 
@@ -104,16 +102,16 @@ class JmxMetaMapBuilder {
         // build meta map with default info if no descriptor is provided.
         else {
             map = [
-                    target: object,
-                    name: object.getClass().name,
-                    jmxName: JmxBeanInfoManager.buildDefaultObjectName(
+                    target      : object,
+                    name        : object.getClass().name,
+                    jmxName     : JmxBeanInfoManager.buildDefaultObjectName(
                             JmxBuilderTools.DEFAULT_DOMAIN,
                             JmxBuilderTools.DEFAULT_NAME_TYPE,
                             object),
-                    displayName: "JMX Managed Object 
${object.class.canonicalName}".toString(),
-                    attributes: buildAttributeMapFrom(object),
+                    displayName : "JMX Managed Object 
${object.class.canonicalName}".toString(),
+                    attributes  : buildAttributeMapFrom(object),
                     constructors: buildConstructorMapFrom(object),
-                    operations: buildOperationMapFrom(object)
+                    operations  : buildOperationMapFrom(object)
             ]
         }
 
@@ -129,7 +127,7 @@ class JmxMetaMapBuilder {
      * @see #buildConstructorMapFrom(Object, Map)
      * @see #buildOperationMapFrom(Object, Map)
      */
-    public static Map buildObjectMapFrom(def object, def descriptor) {
+    static Map buildObjectMapFrom(def object, def descriptor) {
         if (!object) {
             throw new JmxBuilderException("Unable to create MBean, missing 
target object.")
         }
@@ -137,13 +135,13 @@ class JmxMetaMapBuilder {
         // if only the name & target is specified, fill in rest with defaults
         if (descriptor.size() == 2 && (descriptor.name && descriptor.target)) {
             map = [
-                    target: object,
-                    jmxName: getObjectName(descriptor),
-                    name: object.getClass().name,
-                    displayName: "JMX Managed Object 
${object.class.canonicalName}".toString(),
-                    attributes: buildAttributeMapFrom(object),
+                    target      : object,
+                    jmxName     : getObjectName(descriptor),
+                    name        : object.getClass().name,
+                    displayName : "JMX Managed Object 
${object.class.canonicalName}".toString(),
+                    attributes  : buildAttributeMapFrom(object),
                     constructors: buildConstructorMapFrom(object),
-                    operations: buildOperationMapFrom(object)
+                    operations  : buildOperationMapFrom(object)
             ]
 
         }
@@ -151,21 +149,21 @@ class JmxMetaMapBuilder {
         else {
 
             map = [
-                    target: object,
-                    name: object.getClass().name,
-                    displayName: descriptor.desc ?: descriptor.desc,
-                    attributes: buildAttributeMapFrom(object, 
descriptor.attributes ?: descriptor.attribs),
+                    target      : object,
+                    name        : object.getClass().name,
+                    displayName : descriptor.desc ?: descriptor.desc,
+                    attributes  : buildAttributeMapFrom(object, 
descriptor.attributes ?: descriptor.attribs),
                     constructors: buildConstructorMapFrom(object, 
descriptor.constructors ?: descriptor.ctors),
-                    operations: buildOperationMapFrom(object, 
descriptor.operations ?: descriptor.ops),
-                    listeners: buildListenerMapFrom(descriptor.listeners),
-                    mbeanServer: descriptor.server ?: descriptor.mbeanServer
+                    operations  : buildOperationMapFrom(object, 
descriptor.operations ?: descriptor.ops),
+                    listeners   : buildListenerMapFrom(descriptor.listeners),
+                    mbeanServer : descriptor.server ?: descriptor.mbeanServer
             ]
 
             map.jmxName = getObjectName(descriptor) ?:
-                JmxBeanInfoManager.buildDefaultObjectName(
-                        JmxBuilderTools.DEFAULT_DOMAIN,
-                        JmxBuilderTools.DEFAULT_NAME_TYPE,
-                        object)
+                    JmxBeanInfoManager.buildDefaultObjectName(
+                            JmxBuilderTools.DEFAULT_DOMAIN,
+                            JmxBuilderTools.DEFAULT_NAME_TYPE,
+                            object)
         }
 
         map
@@ -187,11 +185,11 @@ class JmxMetaMapBuilder {
      * @param the object from which attribute info will be retrieved
      * @return the meta map for the attribute
      */
-    public static Map buildAttributeMapFrom(def object) {
+    static Map buildAttributeMapFrom(def object) {
         def properties = object.metaClass.getProperties()
 
         def attribs = [:]
-        properties.each {MetaProperty prop ->
+        properties.each { MetaProperty prop ->
             if (!ATTRIB_EXCEPTION_LIST.contains(prop.name)) {
                 def attrib = [:]
                 def getterPrefix = (prop.type.name == "java.lang.Boolean" || 
prop.type.name == "boolean") ? "is" : "get"
@@ -218,7 +216,7 @@ class JmxMetaMapBuilder {
      * @param descriptor collection: either a map or a list
      * @return a Map of meta information about the object.
      */
-    public static Map buildAttributeMapFrom(def object, def descCollection) {
+    static Map buildAttributeMapFrom(def object, def descCollection) {
         def map = [:]
 
         // attribs:"*"
@@ -227,7 +225,7 @@ class JmxMetaMapBuilder {
         }
         // attribs:["attrName1",attrName2",...,"attrNameN"]
         if (descCollection && descCollection instanceof List) {
-            descCollection.each {attrib ->
+            descCollection.each { attrib ->
                 MetaProperty prop = 
object.metaClass.getMetaProperty(JmxBuilderTools.uncapitalize(attrib))
                 if (prop) {
                     map.put(JmxBuilderTools.capitalize(attrib), 
createAttributeMap(prop, attrib, "*"))
@@ -236,7 +234,7 @@ class JmxMetaMapBuilder {
         }
         //attribs:[desc:..., readable:..., writable:...]
         if (descCollection && descCollection instanceof Map) {
-            descCollection.each {attrib, attrDescriptor ->
+            descCollection.each { attrib, attrDescriptor ->
                 MetaProperty prop = 
object.metaClass.getMetaProperty(JmxBuilderTools.uncapitalize(attrib))
                 if (prop) {
                     map.put(JmxBuilderTools.capitalize(attrib), 
createAttributeMap(prop, attrib, attrDescriptor))
@@ -294,7 +292,7 @@ class JmxMetaMapBuilder {
      * @param object to profile
      * @return The meta map generated.
      */
-    public static Map buildConstructorMapFrom(def object) {
+    static Map buildConstructorMapFrom(def object) {
         def methods = object.getClass().getDeclaredConstructors()
         def ctors = [:]
         def cntr = 0
@@ -316,7 +314,7 @@ class JmxMetaMapBuilder {
      * @param the meta map that will be normalized
      * @return a normalized meta map for the constructor
      */
-    public static Map buildConstructorMapFrom(def object, def descCollection) {
+    static Map buildConstructorMapFrom(def object, def descCollection) {
         def map = [:]
 
         // ctors:"*"
@@ -326,7 +324,7 @@ class JmxMetaMapBuilder {
 
         // ctor:[ctorName:...]
         if (descCollection && descCollection instanceof Map) {
-            descCollection.each {ctorKey, descriptor ->
+            descCollection.each { ctorKey, descriptor ->
                 def params
 
                 // ctorName:[]
@@ -336,7 +334,7 @@ class JmxMetaMapBuilder {
                 // ctorName:["paramType1","paramType2"..."paramTypeN"]
                 if (descriptor && (descriptor instanceof List && 
descriptor.size() > 0)) {
                     params = []
-                    descriptor.each {param ->
+                    descriptor.each { param ->
                         params << 
JmxBuilderTools.TYPE_MAP[JmxBuilderTools.getNormalizedType(param)]
                     }
                 }
@@ -350,7 +348,7 @@ class JmxMetaMapBuilder {
                     }
 
                     params = []
-                    paramTypes.each {p ->
+                    paramTypes.each { p ->
                         params << 
JmxBuilderTools.TYPE_MAP[JmxBuilderTools.getNormalizedType(p)]
                     }
                 }
@@ -394,18 +392,18 @@ class JmxMetaMapBuilder {
      * @param object to profile
      * @return The meta map generated.
      */
-    public static Map buildOperationMapFrom(def object) {
+    static Map buildOperationMapFrom(def object) {
         def methods = object.metaClass.getMethods()
         def ops = [:]
 
         def declaredMethods = object.getClass().getDeclaredMethods()*.name
 
-        methods.each {method ->
+        methods.each { method ->
             // avoid picking up extra methods from parents
             if ((declaredMethods.contains(method.name) && 
!OPS_EXCEPTION_LIST.contains(method.name)) || 
(!OPS_EXCEPTION_LIST.contains(method.name))) {
                 String mName = method.name
                 MetaProperty prop = (mName.startsWith("get") || 
mName.startsWith("set")) ?
-                    
object.metaClass.getMetaProperty(JmxBuilderTools.uncapitalize(mName[3..-1])) : 
null
+                        
object.metaClass.getMetaProperty(JmxBuilderTools.uncapitalize(mName[3..-1])) : 
null
                 // skip exporting getters/setters to avoid dbl exposure.  They 
are exported differently.
                 if (!prop) {
                     def map = [:]
@@ -421,7 +419,7 @@ class JmxMetaMapBuilder {
         return ops
     }
 
-    public static Map buildOperationMapFrom(object, descCollection) {
+    static Map buildOperationMapFrom(object, descCollection) {
         def map = [:]
 
         // operations:"*"
@@ -431,7 +429,7 @@ class JmxMetaMapBuilder {
 
         // operations:["opName1","opName2",..., "opNameN"]
         if (descCollection && descCollection instanceof List) {
-            descCollection.each {opName ->
+            descCollection.each { opName ->
                 // find the first method that matches the name
                 def method
                 for (m in object.metaClass.getMethods()) {
@@ -449,7 +447,7 @@ class JmxMetaMapBuilder {
 
         // operations:[foo1:[:], foo2[:], foo3:[:]...]
         if (descCollection && descCollection instanceof Map) {
-            descCollection.each {opName, descriptor ->
+            descCollection.each { opName, descriptor ->
                 def params
                 def method
 
@@ -477,7 +475,7 @@ class JmxMetaMapBuilder {
                     // gather clas array Class[]
                     if (params) {
                         def paramTypes = []
-                        params?.each {key ->
+                        params?.each { key ->
                             paramTypes << 
JmxBuilderTools.TYPE_MAP[JmxBuilderTools.getNormalizedType(key)]
                         }
                         params = paramTypes ?: null
@@ -536,12 +534,12 @@ class JmxMetaMapBuilder {
      * @param the method with parameters to normalized
      * @return the normalized map
      */
-    public static Map buildParameterMapFrom(def method) {
+    static Map buildParameterMapFrom(def method) {
         def map = [:]
         if (!method) return map
         def params = method.getParameterTypes()
         if (params) {
-            params.each {def param ->
+            params.each { def param ->
                 map.put(param.name, createParameterMap(method, param, "*"))
             }
         }
@@ -554,19 +552,19 @@ class JmxMetaMapBuilder {
      * @param a given meta map which will be normalized
      * @return the normalized map
      */
-    public static Map buildParameterMapFrom(method, descCollection) {
+    static Map buildParameterMapFrom(method, descCollection) {
         def map = [:]
         if (!method) return map
 
         if (descCollection && descCollection instanceof Map) {
-            descCollection.each {param, paramMap ->
+            descCollection.each { param, paramMap ->
                 def type = getParamTypeByName(method, 
JmxBuilderTools.getNormalizedType(param))
                 if (type) {
                     map.put(type.name, createParameterMap(method, type, 
paramMap))
                 }
             }
         } else if (descCollection && descCollection instanceof List) {
-            descCollection.each {param ->
+            descCollection.each { param ->
                 def type = getParamTypeByName(method, 
JmxBuilderTools.getNormalizedType(param))
                 if (type) {
                     map.put(type.name, createParameterMap(method, type, "*"))
@@ -612,10 +610,10 @@ class JmxMetaMapBuilder {
      * @param - collection of descriptors to normalize
      * @see JmxMetaMapBuilder#createListenerMap(Object)
      */
-    public static buildListenerMapFrom(descCollection) {
+    static buildListenerMapFrom(descCollection) {
         def map = [:]
         if (descCollection && descCollection instanceof Map) {
-            descCollection.each {name, listenerMap ->
+            descCollection.each { name, listenerMap ->
                 map.put(name, createListenerMap(listenerMap))
             }
         }
@@ -628,7 +626,7 @@ class JmxMetaMapBuilder {
      * @param descriptor - descriptive data collected from JmxBuilder listener 
nodes.
      * @return - fully normalized meta map of listener data.
      */
-    public static Map createListenerMap(descriptor) {
+    static Map createListenerMap(descriptor) {
         def map = [:]
         map.type = "eventListener"
         map.event = descriptor.event
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
index 12a49e5..46f9b09 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxOperationInfoManager.groovy
@@ -29,10 +29,7 @@ import javax.management.modelmbean.ModelMBeanOperationInfo
  * It cycles through the provided meta map from the bean() node and generate 
JMX Info objects used to
  * expose information in the MBeanServer.
  *
- * @author Vladimir Vivien
- *
  * @see groovy.jmx.builder.JmxMetaMapBuilder
- *
  */
 class JmxOperationInfoManager {
     /** *
@@ -40,7 +37,7 @@ class JmxOperationInfoManager {
      * @param list of meta maps
      * @return array of ModelMBeanConstructorInfo
      */
-    public static List<ModelMBeanConstructorInfo> 
getConstructorInfosFromMap(Map metaMap) {
+    static List<ModelMBeanConstructorInfo> getConstructorInfosFromMap(Map 
metaMap) {
         if (!metaMap) return null
         def ctors = []
         metaMap.each {ctorName, map ->
@@ -56,7 +53,7 @@ class JmxOperationInfoManager {
      * @param meta map containing descriptor information
      * @return the fully realized ModelMBeanConstructorInfo for the provided 
constructor reference.
      */
-    public static ModelMBeanConstructorInfo getConstructorInfoFromMap(Map map) 
{
+    static ModelMBeanConstructorInfo getConstructorInfoFromMap(Map map) {
         if (!map) return null
 
         def ctor = map.remove("constructor")
@@ -92,7 +89,7 @@ class JmxOperationInfoManager {
      * @param list of meta maps
      * @return array of ModelMBeanOperationInfo
      */
-    public static List<ModelMBeanOperationInfo> getOperationInfosFromMap(Map 
metaMap) {
+    static List<ModelMBeanOperationInfo> getOperationInfosFromMap(Map metaMap) 
{
         if (!metaMap) return null
         def ops = []
         metaMap.each {opNames, map ->
@@ -107,7 +104,7 @@ class JmxOperationInfoManager {
      * @param the meta map for the method
      * @return the generated ModelMBeanOperationInfo
      */
-    public static ModelMBeanOperationInfo getOperationInfoFromMap(Map map) {
+    static ModelMBeanOperationInfo getOperationInfoFromMap(Map map) {
         if (!map) return null
 
         MetaMethod method = map.remove("method")
@@ -141,7 +138,7 @@ class JmxOperationInfoManager {
      * @param the meta map containing the param info
      * @return an array of JMX MBeanParameterInfo
      */
-    public static List<MBeanParameterInfo> buildParamInfosFromMaps(Map 
metaMap) {
+    static List<MBeanParameterInfo> buildParamInfosFromMaps(Map metaMap) {
         if (!metaMap || metaMap.size() == 0) return null
         List<MBeanParameterInfo> result = new 
ArrayList<MBeanParameterInfo>(metaMap.size())
 
@@ -160,7 +157,7 @@ class JmxOperationInfoManager {
      * @param prop - the property object on the POGO/POJO that represents a 
getter
      * @return a ModelMBeanOperation info built 
      */
-    public static ModelMBeanOperationInfo 
createGetterOperationInfoFromProperty(MetaProperty prop) {
+    static ModelMBeanOperationInfo 
createGetterOperationInfoFromProperty(MetaProperty prop) {
         if (prop == null) return null
 
         Descriptor desc = new DescriptorSupport()
@@ -190,7 +187,7 @@ class JmxOperationInfoManager {
      * @param prop - the property object on the POGO/POJO that represents a 
setter
      * @return a ModelMBeanOperation info built
      */
-    public static ModelMBeanOperationInfo 
createSetterOperationInfoFromProperty(MetaProperty prop) {
+    static ModelMBeanOperationInfo 
createSetterOperationInfoFromProperty(MetaProperty prop) {
 
         Descriptor desc = new DescriptorSupport()
         String name = "set" + JmxBuilderTools.capitalize(prop.name)
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
index 53b3c07..9da7a45 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxServerConnectorFactory.groovy
@@ -47,14 +47,13 @@ import javax.rmi.ssl.SslRMIServerSocketFactory
  *     )
  * </pre>
  *
- * @author Vladimir Vivien
  * @see <a 
href="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/remote/JMXConnector.html";>JMXConnector</a>
  */
 class JmxServerConnectorFactory extends AbstractFactory {
 
     private static final List SUPPORTED_PROTOCOLS = ["rmi", "jrmp", "iiop", 
"jmxmp"]
 
-    public Object newInstance(FactoryBuilderSupport builder, Object nodeName, 
Object nodeArgs, Map nodeAttribs) {
+    Object newInstance(FactoryBuilderSupport builder, Object nodeName, Object 
nodeArgs, Map nodeAttribs) {
         if (nodeArgs) {
             throw new JmxBuilderException("Node '${nodeName}' only supports 
named attributes.")
         }
@@ -79,7 +78,7 @@ class JmxServerConnectorFactory extends AbstractFactory {
 
         MBeanServer server = (MBeanServer) fsb.getMBeanServer()
         JMXServiceURL serviceUrl = (url) ? new JMXServiceURL(url) : 
generateServiceUrl(protocol, host, port)
-        JMXConnectorServer connector = 
JMXConnectorServerFactory.newJMXConnectorServer(serviceUrl, env, server);
+        JMXConnectorServer connector = 
JMXConnectorServerFactory.newJMXConnectorServer(serviceUrl, env, server)
 
 
 
@@ -87,15 +86,15 @@ class JmxServerConnectorFactory extends AbstractFactory {
     }
 
 
-    public boolean onHandleNodeAttributes(FactoryBuilderSupport builder, 
Object node, Map nodeAttribs) {
-        return true;
+    boolean onHandleNodeAttributes(FactoryBuilderSupport builder, Object node, 
Map nodeAttribs) {
+        return true
     }
 
-    public boolean isLeaf() {
+    boolean isLeaf() {
         return false
     }
 
-    public void onNodeCompleted(FactoryBuilderSupport builder, Object 
parentNode, Object thisNode) {
+    void onNodeCompleted(FactoryBuilderSupport builder, Object parentNode, 
Object thisNode) {
         //
     }
 
@@ -120,12 +119,12 @@ class JmxServerConnectorFactory extends AbstractFactory {
             if (ssl) {
                 def csf = 
props.remove(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE) ?: new 
SslRMIClientSocketFactory()
                 def ssf = 
props.remove(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE) ?: new 
SslRMIServerSocketFactory()
-                
env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, csf);
-                
env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, ssf);
+                
env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, csf)
+                
env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, ssf)
             }
         }
 
-        props.each {key, value ->
+        props.each { key, value ->
             env.put(key, value)
         }
 
diff --git 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
index 15c9866..1d8cd6c 100644
--- 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
+++ 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderException.java
@@ -20,8 +20,6 @@ package groovy.jmx.builder;
 
 /**
  * Runtime exception used by JmxBuilder.
- *
- * @author Vladimir Vivien
  */
 public class JmxBuilderException extends RuntimeException {
     /**
diff --git 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
index 656012e..e47c1ed 100644
--- 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
+++ 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
@@ -43,8 +43,6 @@ import java.util.concurrent.atomic.AtomicLong;
  * The JmxBuilderModelMBean is the MBean class that proxies exported POGO/POJO 
inside the MBeanServer.
  * When JmxBuilder exports an object instance, an instance of this class is 
created and exported inside the
  * MBeanServer.
- *
- * @author Vladimir Vivien
  */
 public class JmxBuilderModelMBean extends RequiredModelMBean implements 
NotificationListener {
     private final List<String> methodListeners = new ArrayList<String>(0);
@@ -173,7 +171,6 @@ public class JmxBuilderModelMBean extends 
RequiredModelMBean implements Notifica
      * Internal class AttributeChangedListener provides hooks to handle 
attribute-change events
      * that occurs on registered MBeans.
      *
-     * @author Vladimir Vivien
      * @see groovy.jmx.builder.JmxBuilderModelMBean
      */
     private static final class AttributeChangedListener implements 
NotificationListener {
diff --git 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java
index 9122b9f..dd12885 100644
--- 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java
+++ 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitter.java
@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicLong;
  * jmx.emitter.send(object)
  * </pre>
  *
- * @author Vladimir Vivien
  * @see groovy.jmx.builder.JmxEmitterFactory
  */
 public class JmxEventEmitter extends NotificationBroadcasterSupport implements 
JmxEventEmitterMBean {
diff --git 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
index df9b0a7..ad65ba0 100644
--- 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
+++ 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventEmitterMBean.java
@@ -22,7 +22,6 @@ package groovy.jmx.builder;
  * This is the management interface for JmxEventEmitter.  This MBean is used 
internally by
  * JmxBuilder to broadcast events to registered listeners of the underlying 
MBeanServer.
  *
- * @author Vladimir Vivien
  * @see groovy.jmx.builder.JmxEventEmitter
  */
 public interface JmxEventEmitterMBean {
diff --git 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java
index 5a8bea0..d1b1688 100644
--- 
a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java
+++ 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxEventListener.java
@@ -29,7 +29,6 @@ import java.util.Map;
  * The JmxEventListener class is used by the builder to listen to events on 
the event bus.  It is used internally
  * by JmxBuilder to handle attribute-change and operation-invoke events on the 
bean() node.
  *
- * @author Vladimir Vivien
  * @see groovy.jmx.builder.JmxBeanFactory
  */
 public class JmxEventListener implements NotificationListener {
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java 
b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
index 2be091f..8f48699 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
@@ -43,10 +43,6 @@ import java.util.Map;
  * an underlying JMX MBean.
  * Properties and normal method invocations
  * delegate to the MBeanServer to the actual MBean.
- *
- * @author <a href="mailto:ja...@coredevelopers.net";>James Strachan</a>
- * @author Steve Button
- * @author Paul King
  */
 public class GroovyMBean extends GroovyObjectSupport {
     private final MBeanServerConnection server;
diff --git 
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
 
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
index 5146dd1..0340419 100644
--- 
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
+++ 
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeansFactoryTest.groovy
@@ -18,10 +18,6 @@
  */
 package groovy.jmx.builder
 
-/**
- *
- * @author vladimir
- */
 class JmxBeansFactoryTest extends GroovyTestCase {
     def builder
 
diff --git a/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java 
b/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
index 0552ccb..c71f017 100644
--- a/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
+++ b/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
@@ -28,8 +28,6 @@ import static 
org.codehaus.groovy.runtime.DefaultGroovyMethods.sort;
 /**
  * Tests using the GroovyObject API from Java to access MBeans via
  * the normal properties API (to simulate normal Groovy property access)
- *
- * @author <a href="mailto:ja...@coredevelopers.net";>James Strachan</a>
  */
 public class MBeanTest extends GroovyTestCase {
 
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
index 89cee15..999d53a 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
@@ -66,8 +66,6 @@ import java.util.Map;
  *       assert builder.toString() == 
'{"people":{"person":{"firstName":"Guillame","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
  * </code></pre>
  *
- * @author Guillaume Laforge
- * @author Andrey Bloshetsov
  * @since 1.8.0
  */
 public class JsonBuilder extends GroovyObjectSupport implements Writable {
diff --git 
a/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
index 58d16b3..94657ad 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
@@ -31,8 +31,6 @@ import java.util.Map;
 /**
  * Utility class used as delegate of closures representing JSON objects.
  *
- * @author Guillaume Laforge
- * @author Andrey Bloschetsov
  * @since 1.8.0
  */
 public class JsonDelegate extends GroovyObjectSupport {
diff --git 
a/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java
index 6f08222..c023493 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonException.java
@@ -22,7 +22,6 @@ package groovy.json;
  * <code>JsonException</code> is the exception thrown by the JSON builder and 
slurper classes,
  * whenever a problem occurs when creating or parsing JSON data structures.
  *
- * @author Guillaume Laforge
  * @since 1.8.0
  */
 public class JsonException extends RuntimeException {
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
index 19df178..7c5756a 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
@@ -33,7 +33,6 @@ import static groovy.json.JsonTokenType.startingWith;
 /**
  * The lexer reads JSON tokens in a streaming fashion from the underlying 
reader.
  *
- * @author Guillaume Laforge
  * @since 1.8.0
  */
 public class JsonLexer implements Iterator<JsonToken> {
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
index a650915..4f65292 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
@@ -39,12 +39,6 @@ import java.util.UUID;
  * This class does not provide the ability to customize the resulting output.  
A {@link JsonGenerator}
  * can be used if the ability to alter the resulting output is required.
  *
- * @author Guillaume Laforge
- * @author Roshan Dawrani
- * @author Andrey Bloschetsov
- * @author Rick Hightower
- * @author Graeme Rocher
- *
  * @see JsonGenerator
  * @since 1.8.0
  */
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java
index de04394..8afc72c 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonParser.java
@@ -25,7 +25,7 @@ import java.io.Reader;
 /**
  * This is the parser interface that backs the new JsonSlurper.
  * It was derived from the Boon JSON parser.
- * @author Rick Hightower
+ *
  * @since 2.3.0
  */
 public interface JsonParser {
diff --git 
a/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java
index 65e9a41..1a62b2d 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonParserType.java
@@ -52,7 +52,6 @@ package groovy.json;
  *     Use CHARACTER_SOURCE if you are dealing with large JSON files over 2MB.
  *     INDEX_OVERLAY is highly tuned for object deserialization from JSON.
  * </p>
- * @author Rick Hightower
  * @since 2.3.0
  */
 public enum JsonParserType {
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
index dd931f0..e3782ee 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
@@ -83,9 +83,6 @@ import java.util.Map;
  * </pre></code>
  *
  * @see groovy.json.JsonParserType
- *
- * @author Guillaume Laforge
- * @author Rick Hightower
  * @since 1.8.0
  */
 public class JsonSlurper {
diff --git 
a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
index eb984af..667f67a 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
@@ -58,7 +58,6 @@ import static groovy.json.JsonTokenType.STRING;
  * assert result.person.pets[1] == "cat"
  * </pre></code>
  *
- * @author Guillaume Laforge
  * @since 1.8.0
  */
 public class JsonSlurperClassic {
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
index a126825..26bb74e 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
@@ -30,7 +30,6 @@ import static groovy.json.JsonTokenType.TRUE;
 /**
  * A JSON token, with a type, line / column information, and the text of that 
token.
  *
- * @author Guillaume Laforge
  * @since 1.8.0
  */
 public class JsonToken {
diff --git 
a/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java 
b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
index ac819b2..52f26dd 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
@@ -28,7 +28,6 @@ import java.util.regex.Pattern;
  * This is kept around in case someone needs its exact behavior.
  * Enum listing all the possible JSON tokens that should be recognized by the 
lexer.
  *
- * @author Guillaume Laforge
  * @since 1.8.0
  */
 public enum JsonTokenType {
diff --git 
a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java 
b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
index 727cd28..9dd6086 100644
--- 
a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
+++ 
b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
@@ -69,10 +69,6 @@ import java.util.Map;
  *    }
  * </pre>
  *
- * @author Tim Yates
- * @author Andrey Bloschetsov
- * @author Graeme Rocher
- *
  * @since 1.8.1
  */
 public class StreamingJsonBuilder extends GroovyObjectSupport {
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ArrayUtils.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ArrayUtils.java
index 4894f08..1d0fa0f 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ArrayUtils.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ArrayUtils.java
@@ -18,9 +18,6 @@
  */
 package org.apache.groovy.json.internal;
 
-/**
- * @author Richard Hightower
- */
 public class ArrayUtils {
 
     public static char[] copyRange(char[] source, int startIndex, int 
endIndex) {
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
index 98bdbc3..eab7894 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
@@ -36,8 +36,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * Base JSON parser.
  * Scaled down version of Boon JsonParser with features
  * removed that are JDK 1.7 dependent or Groovy duplicated functionality.
- *
- * @author Rick Hightower
  */
 public abstract class BaseJsonParser implements JsonParser {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ByteScanner.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ByteScanner.java
index 8ddfb96..e6186d9 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ByteScanner.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ByteScanner.java
@@ -20,9 +20,6 @@ package org.apache.groovy.json.internal;
 
 import static org.apache.groovy.json.internal.Exceptions.die;
 
-/**
- * @author Richard Hightower
- */
 public class ByteScanner {
 
     /**
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Cache.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Cache.java
index f5cfaaa..eb30f73 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Cache.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Cache.java
@@ -23,7 +23,6 @@ package org.apache.groovy.json.internal;
  *
  * @param <KEY>   key
  * @param <VALUE> value
- * @author Rick Hightower
  */
 public interface Cache<KEY, VALUE> {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CacheType.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CacheType.java
index 8d25bff..6ce464d 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CacheType.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CacheType.java
@@ -18,9 +18,6 @@
  */
 package org.apache.groovy.json.internal;
 
-/**
- * @author Rick Hightower
- */
 public enum CacheType {
 
     LRU,
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
index db850e1..62fd285 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
@@ -26,9 +26,6 @@ import java.io.Writer;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-/**
- * @author Rick Hightower
- */
 public class CharBuf extends Writer implements CharSequence {
 
     protected int capacity = 16;
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
index 2dfacf9..ffd7a57 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
@@ -23,9 +23,6 @@ import java.math.BigDecimal;
 import static org.apache.groovy.json.internal.Exceptions.die;
 import static org.apache.groovy.json.internal.Exceptions.handle;
 
-/**
- * @author Richard Hightower
- */
 public class CharScanner {
 
     protected static final int COMMA = ',';
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
index 40ebc16..21beccf 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
@@ -30,9 +30,6 @@ import static 
org.apache.groovy.json.internal.CharScanner.parseIntFromTo;
 import static org.apache.groovy.json.internal.CharScanner.parseLongFromTo;
 import static org.apache.groovy.json.internal.Exceptions.die;
 
-/**
- * @author Rick Hightower
- */
 public class CharSequenceValue implements Value, CharSequence {
 
     private final Type type;
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharacterSource.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharacterSource.java
index 6fdecd4..5d3068e 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharacterSource.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharacterSource.java
@@ -18,9 +18,6 @@
  */
 package org.apache.groovy.json.internal;
 
-/**
- * @author Richard Hightower
- */
 public interface CharacterSource {
 
     /**
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Chr.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Chr.java
index 6996a8e..a4fdb8e 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Chr.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Chr.java
@@ -18,9 +18,6 @@
  */
 package org.apache.groovy.json.internal;
 
-/**
- * @author Rick Hightower
- */
 public class Chr {
 
     public static char[] array(final char... array) {
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Dates.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Dates.java
index 0cd95f8..d075f75 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Dates.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Dates.java
@@ -22,9 +22,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-/**
- * @author Rick Hightower
- */
 public class Dates {
 
     private static TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone("UTC");
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Exceptions.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Exceptions.java
index e122778..ffb4f0c 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Exceptions.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Exceptions.java
@@ -24,9 +24,6 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.util.Collections;
 
-/**
- * @author Rick Hightower
- */
 public class Exceptions {
 
     public static boolean die() {
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/IO.java 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/IO.java
index fdfec3e..0712742 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/IO.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/IO.java
@@ -22,9 +22,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 
-/**
- * @author Rick Hightower
- */
 public class IO {
 
     private static final int EOF = -1;
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
index 4cc219c..5594724 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
@@ -24,8 +24,6 @@ import java.util.List;
 /**
  * This works in index overlay mode or chop mode.
  * Chop mode reduces possibility of memory leak but causes a few more buffer 
copies as it chops up the buffer.
- *
- * @author Rick Hightower
  */
 public class JsonFastParser extends JsonParserCharArray {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
index 6fb6f4c..08613d0 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
@@ -25,11 +25,7 @@ import java.util.List;
 
 /**
  * Converts an input JSON String into Java objects works with String or char 
array
- * as input. Produces an Object which can be any of the basic JSON types mapped
- * to Java.
- * <p/>
- *
- * @author Rick Hightower
+ * as input. Produces an Object which can be any of the basic JSON types 
mapped to Java.
  */
 public class JsonParserCharArray extends BaseJsonParser {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
index 89e1fa4..05ecd83 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
@@ -21,9 +21,6 @@ package org.apache.groovy.json.internal;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author Richard Hightower
- */
 public class JsonParserLax extends JsonParserCharArray {
 
     private final boolean useValues;
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
index 8b7d969..933a391 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
@@ -29,9 +29,6 @@ import java.util.List;
  * Converts an input JSON String into Java objects works with String or char 
array
  * as input. Produces an Object which can be any of the basic JSON types mapped
  * to Java.
- * <p/>
- *
- * @author Rick Hightower
  */
 public class JsonParserUsingCharacterSource extends BaseJsonParser {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonStringDecoder.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonStringDecoder.java
index a53c9fa..6ac9a59 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonStringDecoder.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonStringDecoder.java
@@ -18,9 +18,6 @@
  */
 package org.apache.groovy.json.internal;
 
-/**
- * @author Richard Hightower
- */
 public class JsonStringDecoder {
 
     public static String decode(char[] chars, int start, int to) {
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
index 81da4d3..df86c42 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
@@ -29,8 +29,6 @@ import java.util.TreeMap;
 /**
  * This maps only builds once you ask for a key for the first time.
  * It is designed to not incur the overhead of creating a map unless needed.
- *
- * @author Rick Hightower
  */
 public class LazyMap extends AbstractMap<String, Object> {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java
index 7692388..a598908 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyValueMap.java
@@ -44,8 +44,6 @@ import static org.apache.groovy.json.internal.Exceptions.die;
  * The lazyChop is performed on the tree that is touched by the JSONPath 
expression or its ilk.
  * <p/>
  * The chop operation can be done during parsing or lazily by storing the 
values in this construct.
- *
- * @author Rick Hightower (insane chipmonk)
  */
 public class LazyValueMap extends AbstractMap<String, Object> implements 
ValueMap<String, Object> {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
index 325214f..b98446b 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/MapItemValue.java
@@ -23,8 +23,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * This holds a mapping from value key to value value to maximize laziness.
- *
- * @author Rick Hightower
  */
 public class MapItemValue implements Map.Entry<String, Value> {
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java
index 525010e..d541fbf 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/NumberValue.java
@@ -34,9 +34,6 @@ import static 
org.apache.groovy.json.internal.CharScanner.parseLongFromTo;
 import static org.apache.groovy.json.internal.Exceptions.die;
 import static org.apache.groovy.json.internal.Exceptions.sputs;
 
-/**
- * @author Rick Hightower
- */
 public class NumberValue extends java.lang.Number implements Value {
 
     private char[] buffer;
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
index 4517f7f..117d7bc 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
@@ -22,9 +22,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
-/**
- * @author Richard Hightower
- */
 public class ReaderCharacterSource implements CharacterSource {
 
     private static final int MAX_TOKEN_SIZE = 5;
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java
index afa54e8..206b81d 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/SimpleCache.java
@@ -21,9 +21,6 @@ package org.apache.groovy.json.internal;
 import org.codehaus.groovy.runtime.memoize.CommonCache;
 import org.codehaus.groovy.runtime.memoize.EvictableCache;
 
-/**
- * @author Richard Hightower
- */
 public class SimpleCache<K, V> implements Cache<K, V> {
     private EvictableCache<K, V> cache;
 
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Type.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Type.java
index 5ce3d27..c6473c5 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Type.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Type.java
@@ -18,9 +18,6 @@
  */
 package org.apache.groovy.json.internal;
 
-/**
- * @author Richard Hightower
- */
 public enum Type {
 
     INTEGER, STRING, DOUBLE, TRUE, FALSE, NULL, MAP, LIST
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Value.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Value.java
index f3024fb..52e1727 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Value.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Value.java
@@ -22,9 +22,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
 
-/**
- * @author Rick Hightower
- */
 public interface Value {
 
     byte byteValue();
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java
index aa21168..e2171ed 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueContainer.java
@@ -27,9 +27,6 @@ import java.util.Map;
 import static org.apache.groovy.json.internal.Exceptions.die;
 import static org.apache.groovy.json.internal.Exceptions.sputs;
 
-/**
- * @author Rick Hightower
- */
 public class ValueContainer implements CharSequence, Value {
 
     public static final Value TRUE = new ValueContainer(Type.TRUE);
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueList.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueList.java
index 7027200..7fa7777 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueList.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueList.java
@@ -23,9 +23,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-/**
- * @author Rick Hightower
- */
 public class ValueList extends AbstractList<Object> {
 
     List<Object> list = new ArrayList<Object>(5);
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMap.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMap.java
index c238cbf..e163138 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMap.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMap.java
@@ -20,9 +20,6 @@ package org.apache.groovy.json.internal;
 
 import java.util.Map;
 
-/**
- * @author Richard Hightower
- */
 public interface ValueMap<K, V> extends Map<K, V> {
 
     /* add a map item value. */
diff --git 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMapImpl.java
 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMapImpl.java
index 0b3103e..d261f80 100644
--- 
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMapImpl.java
+++ 
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ValueMapImpl.java
@@ -30,8 +30,6 @@ import static org.apache.groovy.json.internal.Exceptions.die;
  * This map is for object serialization mainly.
  * The idea is the final conversion of
  * the Value objects are delayed until the last possible moment, i.e., just 
before injected into a bean.
- *
- * @author Rick Hightower
  */
 public class ValueMapImpl extends AbstractMap<String, Value> implements 
ValueMap<String, Value> {
 
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy
index a09721c..5e759a4 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/CharBufTest.groovy
@@ -22,9 +22,6 @@ import org.apache.groovy.json.internal.CharBuf
 
 /**
  * Test the internal CharBuf class
- *
- * @author Rick Hightower
- * @author Guillaume Laforge
  */
 class CharBufTest extends GroovyTestCase {
 
diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy
index 17819f5..2094cf5 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/IOTest.groovy
@@ -23,8 +23,6 @@ import org.apache.groovy.json.internal.IO
 
 /**
  * Test the internal IO class
- *
- * @author Martin Stockhammer
  */
 class IOTest extends GroovyTestCase {
 
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
index e057e18..7af7b69 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
@@ -18,9 +18,6 @@
  */
 package groovy.json
 
-/**
- * @author Guillaume Laforge
- */
 class JsonBuilderTest extends GroovyTestCase {
 
     void testJsonBuilderConstructor() {
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
index 2602343..f67109e 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
@@ -22,9 +22,6 @@ import static groovy.json.JsonTokenType.*
 
 import groovy.io.LineColumnReader
 
-/**
- * @author Guillaume Laforge
- */
 class JsonLexerTest extends GroovyTestCase {
 
     void testSkipWhitespace() {
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy
index a781fbb..289980b 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonOutputTest.groovy
@@ -22,10 +22,6 @@ import static groovy.json.JsonOutput.toJson
 
 import groovy.transform.Canonical
 
-/**
- * @author Guillaume Laforge
- * @author Andrey Bloschetsov
- */
 class JsonOutputTest extends GroovyTestCase {
 
     // Check for GROOVY-5918
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy
index db039d3..8135bee 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonSlurperTest.groovy
@@ -20,9 +20,6 @@ package groovy.json
 
 import org.apache.groovy.json.internal.Value
 
-/**
- * @author Guillaume Laforge
- */
 class JsonSlurperTest extends GroovyTestCase {
 
     def parser
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy
index e0e769a..0ecadda 100644
--- 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy
+++ 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenTypeTest.groovy
@@ -20,10 +20,6 @@ package groovy.json
 
 import static JsonTokenType.*
 
-
-/**
- * @author Guillaume Laforge
- */
 class JsonTokenTypeTest extends GroovyTestCase {
 
     void testMatchingConstants() {
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy
index 67ccfad..ce6f98b 100644
--- 
a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy
+++ 
b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonTokenValueTest.groovy
@@ -20,9 +20,6 @@ package groovy.json
 
 import static JsonTokenType.*
 
-/**
- * @author Guillaume Laforge
- */
 class JsonTokenValueTest extends GroovyTestCase {
 
     void testValues() {
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
 
b/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
index d94f5cb..32bdfee 100644
--- 
a/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
+++ 
b/subprojects/groovy-json/src/test/groovy/groovy/json/RealJsonPayloadsTest.groovy
@@ -18,9 +18,6 @@
  */
 package groovy.json
 
-/**
- * @author Guillaume Laforge
- */
 class RealJsonPayloadsTest extends GroovyTestCase {
 
     def parser = new JsonSlurper()
diff --git 
a/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
 
b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
index ec61dcd..12fe06e 100644
--- 
a/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
+++ 
b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
@@ -20,10 +20,6 @@ package groovy.json
 
 import groovy.transform.CompileStatic
 
-/**
- * @author Tim Yates
- * @author Guillaume Laforge
- */
 class StreamingJsonBuilderTest extends GroovyTestCase {
 
     @CompileStatic
diff --git 
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
 
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
index 4962aa5..d6e45b2 100644
--- 
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+++ 
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
@@ -55,8 +55,7 @@ import javax.script.ScriptException;
  * Used to represent compiled Groovy scripts.  Such scripts may be executed 
repeatedly
  * by Groovy's <code>ScriptEngine</code> using the <code>eval</code> method 
without reparsing overheads.
  *
- * @author Adapted from original by Mike Grogan
- * @author Adapted from original by A. Sundararajan
+ * Adapted from original by Mike Grogan and A. Sundararajan
  */
 public class GroovyCompiledScript extends CompiledScript {
 
diff --git 
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
 
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
index 62981f6..ae59113 100644
--- 
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+++ 
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
@@ -59,10 +59,7 @@ import java.util.List;
  * Groovy <code>ScriptEngines</code> and also exposes metadata describing
  * Groovy's engine class.
  *
- * @author Adapted from original by Mike Grogan
- * @author Adapted from original by A. Sundararajan
- * @author Jim White
- * @author Guillaume Laforge
+ * Adapted from original by Mike Grogan and A. Sundararajan
  */
 public class GroovyScriptEngineFactory implements ScriptEngineFactory {
 
diff --git 
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
 
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 2c9e633..c2c5d4e 100644
--- 
a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ 
b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -85,11 +85,7 @@ import java.security.PrivilegedAction;
 /**
  * JSR-223 Engine implementation.
  *
- * @author Adapted from original by Mike Grogan
- * @author Adapted from original by A. Sundararajan
- * @author Jim White
- * @author Guillaume Laforge
- * @author Jochen Theodorou
+ * Adapted from original by Mike Grogan and A. Sundararajan
  */
 public class GroovyScriptEngineImpl extends AbstractScriptEngine implements 
Compilable, Invocable {
 
diff --git 
a/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
 
b/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
index ce63254..4ad6f0b 100644
--- 
a/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
+++ 
b/subprojects/groovy-jsr223/src/test/groovy/org/codehaus/groovy/jsr223/JSR223Test.groovy
@@ -29,9 +29,6 @@ import javax.script.SimpleScriptContext
 
 /**
  * Tests JSR-223 Groovy engine implementation.
- *
- * @author Jim White
- * @author Guillaume Laforge
  */
 class JSR223Test extends GroovyTestCase {
     protected ScriptEngineManager manager
diff --git 
a/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
 
b/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
index 49b8b06..52b98a3 100644
--- 
a/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
+++ 
b/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
@@ -42,8 +42,6 @@ import java.util.Set;
 
 /**
  * Test for GROOVY-3946 and GROOVY-5255.
- *
- * @author Tiago Fernandez
  */
 public class JSR223SecurityTest {
 

Reply via email to