[groovy] branch GROOVY_2_5_X updated: set source position

2019-05-25 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
 new 5ae4089  set source position
5ae4089 is described below

commit 5ae40890a7f64689083eda39c0b57d5040eed6de
Author: Paul King 
AuthorDate: Sat May 25 16:42:22 2019 +1000

set source position
---
 .../transform/sc/transformers/VariableExpressionTransformer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
 
b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
index b908425..6e490c1 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
@@ -46,13 +46,13 @@ public class VariableExpressionTransformer {
 
 private static Expression 
tryTransformDelegateToProperty(VariableExpression expr) {
 // we need to transform variable expressions that go to a delegate
-// to a property expression, as ACG would loose the information
-// in processClassVariable before it reaches any makeCall, that could
-// handle it
+// to a property expression, as ACG would lose the information in
+// processClassVariable before it reaches any makeCall, that could 
handle it
 Object val = expr.getNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER);
 if (val == null) return null;
 // TODO handle the owner and delegate cases better for nested 
scenarios and potentially remove the need for the implicit this case
 VariableExpression receiver = new 
VariableExpression("owner".equals(val) ? (String) val : "delegate".equals(val) 
? (String) val : "this");
+receiver.setSourcePosition(expr);
 PropertyExpression pexp = new PropertyExpression(receiver, 
expr.getName());
 pexp.copyNodeMetaData(expr);
 pexp.setImplicitThis(true);



[groovy] branch master updated: set source position

2019-05-25 Thread paulk
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 756676e  set source position
756676e is described below

commit 756676e71083d420ef9df8b1c9c3bf3f20ba6e6b
Author: Paul King 
AuthorDate: Sat May 25 16:42:22 2019 +1000

set source position
---
 .../transform/sc/transformers/VariableExpressionTransformer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
 
b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
index b908425..6e490c1 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
@@ -46,13 +46,13 @@ public class VariableExpressionTransformer {
 
 private static Expression 
tryTransformDelegateToProperty(VariableExpression expr) {
 // we need to transform variable expressions that go to a delegate
-// to a property expression, as ACG would loose the information
-// in processClassVariable before it reaches any makeCall, that could
-// handle it
+// to a property expression, as ACG would lose the information in
+// processClassVariable before it reaches any makeCall, that could 
handle it
 Object val = expr.getNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER);
 if (val == null) return null;
 // TODO handle the owner and delegate cases better for nested 
scenarios and potentially remove the need for the implicit this case
 VariableExpression receiver = new 
VariableExpression("owner".equals(val) ? (String) val : "delegate".equals(val) 
? (String) val : "this");
+receiver.setSourcePosition(expr);
 PropertyExpression pexp = new PropertyExpression(receiver, 
expr.getName());
 pexp.copyNodeMetaData(expr);
 pexp.setImplicitThis(true);



[groovy] branch GROOVY_2_5_X updated: GROOVY-9136: check for non-closure parameter references

2019-05-25 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
 new 3a8d932  GROOVY-9136: check for non-closure parameter references
3a8d932 is described below

commit 3a8d932962d0c1e3396bf99cbb8d87072e0b8cd4
Author: Eric Milles 
AuthorDate: Fri May 24 20:04:15 2019 -0500

GROOVY-9136: check for non-closure parameter references
---
 .../transform/stc/StaticTypeCheckingVisitor.java   | 15 +++
 src/test/groovy/bugs/Groovy9136.groovy | 46 ++
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index f855239..c23824a 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -102,7 +102,6 @@ import org.codehaus.groovy.runtime.MetaClassHelper;
 import org.codehaus.groovy.syntax.SyntaxException;
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.TokenUtil;
-import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.transform.StaticTypesTransformation;
 import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys;
 import org.codehaus.groovy.transform.trait.Traits;
@@ -199,7 +198,6 @@ import static 
org.codehaus.groovy.syntax.Types.ASSIGNMENT_OPERATOR;
 import static org.codehaus.groovy.syntax.Types.COMPARE_EQUAL;
 import static org.codehaus.groovy.syntax.Types.COMPARE_IDENTICAL;
 import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_EQUAL;
-import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_IDENTICAL;
 import static org.codehaus.groovy.syntax.Types.COMPARE_TO;
 import static org.codehaus.groovy.syntax.Types.DIVIDE;
 import static org.codehaus.groovy.syntax.Types.DIVIDE_EQUAL;
@@ -520,14 +518,13 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
  * Checks valid cases for accessing a field from an inner class.
  */
 private String checkOrMarkInnerPropertyOwnerAccess(Expression source, 
FieldNode fn, boolean lhsOfAssignment, String delegationData) {
-if (fn == null || fn.isStatic() || fn.isPrivate() || 
"delegate".equals(delegationData)) return delegationData;
-if (source instanceof PropertyExpression && 
typeCheckingContext.getEnclosingClosureStack().size() == 1) {
+if (fn != null && !fn.isStatic() && !fn.isPrivate() && 
!"delegate".equals(delegationData) &&
+source instanceof PropertyExpression && 
typeCheckingContext.getEnclosingClosureStack().size() == 1) {
 PropertyExpression pe = (PropertyExpression) source;
 boolean ownerProperty = !("this".equals(pe.getPropertyAsString()));
+// check for reference to method, closure, for loop or catch block 
parameter
 if (ownerProperty && pe.getObjectExpression() instanceof 
VariableExpression) {
-Variable accessedVariable = ((VariableExpression) 
pe.getObjectExpression()).getAccessedVariable();
-Variable declaredVariable = 
typeCheckingContext.getEnclosingClosure().getClosureExpression().getVariableScope().getDeclaredVariable(pe.getObjectExpression().getText());
-if (accessedVariable != null && accessedVariable == 
declaredVariable) ownerProperty = false;
+ownerProperty = !(((VariableExpression) 
pe.getObjectExpression()).getAccessedVariable() instanceof Parameter);
 }
 if (ownerProperty) {
 delegationData = "owner";
@@ -811,7 +808,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
 @Override
 public void visitBinaryExpression(BinaryExpression expression) {
 int op = expression.getOperation().getType();
-if (op == COMPARE_IDENTICAL || op == COMPARE_NOT_IDENTICAL) {
+if (op == COMPARE_IDENTICAL) {
 return; // we'll report those as errors later
 }
 BinaryExpression enclosingBinaryExpression = 
typeCheckingContext.getEnclosingBinaryExpression();
@@ -3779,7 +3776,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
 }
 BinaryExpression instanceOfExpression = (BinaryExpression) expression;
 int op = instanceOfExpression.getOperation().getType();
-if (op != Types.KEYWORD_INSTANCEOF) {
+if (op != KEYWORD_INSTANCEOF) {
 return null;
 }
 Statement block = ifElse.getIfBlock();
diff --git a/src/test/groovy/bugs/Groovy9136.groovy 
b/src/test/groovy/bugs/Groovy9136.groovy
new file mod

[groovy] branch master updated: GROOVY-9136: check for non-closure parameter references

2019-05-24 Thread paulk
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 506b057  GROOVY-9136: check for non-closure parameter references
506b057 is described below

commit 506b057b0af0204e399cbe8847276c49f94d5d43
Author: Eric Milles 
AuthorDate: Fri May 24 20:04:15 2019 -0500

GROOVY-9136: check for non-closure parameter references
---
 .../transform/stc/StaticTypeCheckingVisitor.java   | 16 
 src/test/groovy/bugs/Groovy9136.groovy | 46 ++
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 6210a60..bc2027b 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -105,7 +105,6 @@ import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.syntax.SyntaxException;
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.TokenUtil;
-import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.transform.StaticTypesTransformation;
 import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys;
 import org.codehaus.groovy.transform.trait.Traits;
@@ -204,6 +203,7 @@ import static 
org.codehaus.groovy.syntax.Types.ASSIGNMENT_OPERATOR;
 import static org.codehaus.groovy.syntax.Types.COMPARE_EQUAL;
 import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_EQUAL;
 import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_IN;
+import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF;
 import static org.codehaus.groovy.syntax.Types.COMPARE_TO;
 import static org.codehaus.groovy.syntax.Types.DIVIDE;
 import static org.codehaus.groovy.syntax.Types.DIVIDE_EQUAL;
@@ -270,7 +270,6 @@ import static 
org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.typeCh
 import static 
org.codehaus.groovy.transform.stc.StaticTypesMarker.CLOSURE_ARGUMENTS;
 import static 
org.codehaus.groovy.transform.stc.StaticTypesMarker.CONSTRUCTED_LAMBDA_EXPRESSION;
 import static 
org.codehaus.groovy.transform.stc.StaticTypesMarker.INFERRED_TYPE;
-//import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF;
 
 /**
  * The main class code visitor responsible for static type checking. It will 
perform various inspections like checking
@@ -531,14 +530,13 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
  * Checks valid cases for accessing a field from an inner class.
  */
 private String checkOrMarkInnerPropertyOwnerAccess(Expression source, 
FieldNode fn, boolean lhsOfAssignment, String delegationData) {
-if (fn == null || fn.isStatic() || fn.isPrivate() || 
"delegate".equals(delegationData)) return delegationData;
-if (source instanceof PropertyExpression && 
typeCheckingContext.getEnclosingClosureStack().size() == 1) {
+if (fn != null && !fn.isStatic() && !fn.isPrivate() && 
!"delegate".equals(delegationData) &&
+source instanceof PropertyExpression && 
typeCheckingContext.getEnclosingClosureStack().size() == 1) {
 PropertyExpression pe = (PropertyExpression) source;
 boolean ownerProperty = !("this".equals(pe.getPropertyAsString()));
+// check for reference to method, closure, for loop or catch block 
parameter
 if (ownerProperty && pe.getObjectExpression() instanceof 
VariableExpression) {
-Variable accessedVariable = ((VariableExpression) 
pe.getObjectExpression()).getAccessedVariable();
-Variable declaredVariable = 
typeCheckingContext.getEnclosingClosure().getClosureExpression().getVariableScope().getDeclaredVariable(pe.getObjectExpression().getText());
-if (accessedVariable != null && accessedVariable == 
declaredVariable) ownerProperty = false;
+ownerProperty = !(((VariableExpression) 
pe.getObjectExpression()).getAccessedVariable() instanceof Parameter);
 }
 if (ownerProperty) {
 delegationData = "owner";
@@ -3998,7 +3996,7 @@ public class StaticTypeCheckingVisitor extends 
ClassCodeVisitorSupport {
 }
 BinaryExpression instanceOfExpression = (BinaryExpression) expression;
 int op = instanceOfExpression.getOperation().getType();
-if (op != Types.KEYWORD_INSTANCEOF) {
+if (op != KEYWORD_INSTANCEOF) {
 return null;
 }
 if (notReturningBlock(ifElse.getIfBlock())) {
@@ -4029,7 +4027,7 @@ public class StaticTypeCheckingVisitor extends 

[groovy] branch GROOVY_2_5_X updated (a995ad2 -> b1fb94b)

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from a995ad2  GROOVY-9135: Additional support for @Testable annotation in 
JUnit5Runner
 new 73f999e  Update eclipse gradle scripts
 new 875db5e  Fix test compile dependency
 new f920a8b  Add test runtime dependency (closes #932)
 new 519cd72  GROOVY-9141: add null check for classNode when checking for 
abstract method with body (closes #933)
 new b1fb94b  GROOVY-9141: add null check for classNode when checking for 
abstract method with body (tweaks)

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore |  17 ++--
 gradle/eclipse.gradle  | 109 ++---
 .../codehaus/groovy/antlr/AntlrParserPlugin.java   |  13 ++-
 .../{Groovy8797Bug.groovy => Groovy9141.groovy}|  31 +++---
 subprojects/groovy-docgenerator/build.gradle   |   4 +
 subprojects/groovy-groovydoc/build.gradle  |   9 ++
 subprojects/groovy-groovysh/build.gradle   |   4 +
 subprojects/groovy-json/build.gradle   |   7 +-
 subprojects/groovy-servlet/build.gradle|   7 +-
 subprojects/groovy-test/build.gradle   |   4 +
 subprojects/tests-vm8/build.gradle |   4 +
 11 files changed, 141 insertions(+), 68 deletions(-)
 copy src/test/groovy/bugs/{Groovy8797Bug.groovy => Groovy9141.groovy} (61%)



[groovy] 02/05: Fix test compile dependency

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit 875db5ea473a5f0280d2c617bc0a8729397372d9
Author: Eric Milles 
AuthorDate: Thu May 23 11:29:08 2019 -0500

Fix test compile dependency
---
 subprojects/groovy-servlet/build.gradle | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/subprojects/groovy-servlet/build.gradle 
b/subprojects/groovy-servlet/build.gradle
index 60faeb1..f5b16a0 100644
--- a/subprojects/groovy-servlet/build.gradle
+++ b/subprojects/groovy-servlet/build.gradle
@@ -24,18 +24,15 @@ dependencies {
 provided dep
 exclude(group: 'javax.servlet', module: 'servlet-api')
 }
-compile rootProject
 testCompile "jmock:jmock:$jmockVersion"
+
+compile rootProject
 // needed for MarkupBuilder
 compile project(':groovy-xml')
 // needed by TemplateServlet
 compile project(':groovy-templates')
+
 testCompile rootProject.sourceSets.test.runtimeClasspath
+testCompile project(':groovy-json')
 testCompile project(':groovy-test')
-// for compilation, dependency is not necessary because the classes are 
loaded using Class.forName
-testRuntime project(':groovy-json')
-}
-
-eclipse.classpath.file.whenMerged {
-entries.removeAll { entry -> entry.path == '/groovy-json' }
 }



[groovy] 01/05: Update eclipse gradle scripts

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit 73f999e5979a60ff382c1303688496492a02a5d2
Author: Eric Milles 
AuthorDate: Wed May 22 14:40:40 2019 -0500

Update eclipse gradle scripts
---
 .gitignore   |  17 +++--
 gradle/eclipse.gradle| 109 +--
 subprojects/groovy-docgenerator/build.gradle |   4 +
 subprojects/groovy-groovydoc/build.gradle|   9 +++
 subprojects/groovy-groovysh/build.gradle |   4 +
 subprojects/groovy-json/build.gradle |   6 +-
 subprojects/groovy-servlet/build.gradle  |   6 +-
 subprojects/groovy-test/build.gradle |   4 +
 subprojects/tests-vm8/build.gradle   |   4 +
 9 files changed, 116 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ba2a13..338baa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,21 @@
+user.gradle
+.gradle/
 target/
 build/
 out/
-/bin/
+
 *.DS_Store
+*.class
+*.swp
 *~
-.gradle
+
+.idea
 *.iml
 *.ipr
 *.iws
-.idea
-.*.swp
-*.class
-user.gradle
+.shelf
+
 .settings/
 .classpath
 .project
-.shelf
+bin/
diff --git a/gradle/eclipse.gradle b/gradle/eclipse.gradle
index 559004b..84be8cf 100644
--- a/gradle/eclipse.gradle
+++ b/gradle/eclipse.gradle
@@ -16,52 +16,85 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-//most of this is just a "hack" to break the circular dependencies between 
projects
-//which exist because Eclipse does not distinguish between build phases (e.g. 
compile, test, runtime)
 allprojects {
 apply plugin: 'eclipse'
-
-eclipse.jdt {
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-}
-
-eclipse.classpath.file {
-whenMerged { classpath ->
-classpath.entries.removeAll{ entry -> entry.path == 
'/groovy-groovydoc' }
-classpath.entries.removeAll{ entry -> entry.path =~ /groovy-ant/ }
-classpath.entries.removeAll{ entry -> entry.path =~ /target/ }
-classpath.entries.unique(true){ entry -> entry.path }
+
+eclipse.classpath.file.whenMerged {
+entries.removeAll { entry -> entry.path =~ '/target/' } // affects: 
cli-commons, cli-picocli, console, groovydoc, macro, servlet, swing, templates, 
xml
+entries.unique(true) { entry -> entry.path } // affects: console, 
groovydoc, macro, servlet, swing, templates, xml
+entries.sort(true) { entry -> "${entry.kind}:${entry.path}".toString() 
}
+
+// set "test" attribute based on gradle scopes
+entries.findAll { entry ->
+entry.class.name in [
+'org.gradle.plugins.ide.eclipse.model.Library',
+'org.gradle.plugins.ide.eclipse.model.SourceFolder'
+]
+}.each { entry ->
+if (entry.entryAttributes['gradle_used_by_scope'] == 'test') {
+entry.entryAttributes['test'] = 'true'
+}
 }
-withXml {
-def node = it.asNode()
-node.appendNode('classpathentry', [kind: 'lib', path: 
"${rootProject.jar.archivePath}"])
+// set "test" attribute based on configuration
+entries.findAll { entry ->
+entry.class.name in [
+'org.gradle.plugins.ide.eclipse.model.ProjectDependency'
+]
+}.each { entry ->
+if (entry.path.substring(1) in 
project.configurations.testCompile.dependencies*.name) {
+entry.entryAttributes['test'] = 'true'
+}
 }
 }
-
+
 project.tasks.eclipse.doLast {
-File groovyPrefs = 
file("${project.projectDir}/.settings/org.eclipse.jdt.groovy.core.prefs")
-if (!groovyPrefs.exists()) {
-groovyPrefs.append('groovy.compiler.level=-1\n')
+
file("${project.projectDir}/.settings/org.eclipse.jdt.groovy.core.prefs").with 
{ prefs ->
+if (!prefs.exists()) {
+append('''\
+eclipse.preferences.version=1
+groovy.compiler.level=30
+'''.stripIndent()
+)
+}
 }
-}
-}
 
-eclipse.classpath.file {
-whenMerged { classpath ->
-classpath.entries.find { entry -> entry.path =~ /src\/main/ }.path = 
'/groovy/src/main'
-classpath.entries.find { entry -> entry.path =~ /src\/main/ }.includes 
= []
-classpath.entries.each { entry -> if(entry.path == 'src/test'){ 
entry.excludes = ['groovy/PropertyTest.groovy'] as List } }
-classpath.entries.removeAll{ entry -> entry.path == '/groovy-test' }
-classpath.entries.removeAll{ entry -> entry.path =~ /subprojects/ }
-classpath.entries.removeAll{ entry

[groovy] 05/05: GROOVY-9141: add null check for classNode when checking for abstract method with body (tweaks)

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit b1fb94bff00617a90a93ba4f4dc29a6816a9d22c
Author: Paul King 
AuthorDate: Fri May 24 11:45:47 2019 +1000

GROOVY-9141: add null check for classNode when checking for abstract method 
with body (tweaks)
---
 .../codehaus/groovy/antlr/AntlrParserPlugin.java   |  9 
 src/test/groovy/bugs/Groovy9141.groovy | 27 +++---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java 
b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index 81ac6a4..dee0a95 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -921,12 +921,11 @@ public class AntlrParserPlugin extends ASTHelper 
implements ParserPlugin, Groovy
 modifiers &= ~Opcodes.ACC_SYNTHETIC;
 methodNode = new MethodNode(name, modifiers, returnType, parameters, 
exceptions, code);
 if ((modifiers & Opcodes.ACC_ABSTRACT) == 0) {
-if (node != null) {
-assertNodeType(SLIST, node);
-code = statementList(node);
-} else {
-throw new ASTRuntimeException(methodDef, "You defined a method 
without body. Try adding a body, or declare it abstract.");
+if (node == null) {
+throw new ASTRuntimeException(methodDef, "You defined a method 
without a body. Try adding a body, or declare it abstract.");
 }
+assertNodeType(SLIST, node);
+code = statementList(node);
 } else if (node != null) {
 if (classNode != null && classNode.isAnnotationDefinition()) {
 code = statement(node);
diff --git a/src/test/groovy/bugs/Groovy9141.groovy 
b/src/test/groovy/bugs/Groovy9141.groovy
index 32dd3a4..97d986c 100644
--- a/src/test/groovy/bugs/Groovy9141.groovy
+++ b/src/test/groovy/bugs/Groovy9141.groovy
@@ -23,24 +23,23 @@ import groovy.transform.CompileStatic
 
 @CompileStatic
 final class Groovy9141 extends CompilableTestSupport {
+private static final String METHOD_DEF = '''
+abstract meth() {
+println 42
+}
+'''
 
-void testAbstractMethodWithBody1() {
-def err = shouldNotCompile '''\
-abstract def meth() {
-  println 42
-}
-'''.stripIndent()
-assert err =~ / You can not define a abstract method\[meth\]  in the 
script. Try removing the 'abstract' /
+void testAbstractMethodWithBodyInScript() {
+def err = shouldNotCompile METHOD_DEF
+assert err =~ / Abstract methods do not define a body. /
 }
 
-void testAbstractMethodWithBody2() {
-def err = shouldNotCompile '''\
+void testAbstractMethodWithBodyInClass() {
+def err = shouldNotCompile """
 class Main {
-  abstract def meth() {
-println 42
-  }
+$METHOD_DEF
 }
-'''.stripIndent()
-assert err =~ / Can't have an abstract method in a non-abstract class. 
/
+"""
+assert err =~ / Abstract methods do not define a body. /
 }
 }



[groovy] 03/05: Add test runtime dependency (closes #932)

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit f920a8b67592342193e886af21dc61d935b903e7
Author: Eric Milles 
AuthorDate: Thu May 23 12:30:58 2019 -0500

Add test runtime dependency (closes #932)
---
 subprojects/groovy-json/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subprojects/groovy-json/build.gradle 
b/subprojects/groovy-json/build.gradle
index 3ff11ac..1ab2576 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -20,6 +20,7 @@ dependencies {
 compile rootProject
 testCompile project(':groovy-test')
 testCompile project(':groovy-dateutil')
+testRuntime "org.slf4j:slf4j-api:$slf4jVersion"
 testRuntime project(':groovy-ant') // for JavadocAssertionTests
 }
 



[groovy] 04/05: GROOVY-9141: add null check for classNode when checking for abstract method with body (closes #933)

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit 519cd72e361f1c712b1c495ebe2e4348cc8f478f
Author: Eric Milles 
AuthorDate: Thu May 23 12:19:50 2019 -0500

GROOVY-9141: add null check for classNode when checking for abstract method 
with body (closes #933)
---
 .../codehaus/groovy/antlr/AntlrParserPlugin.java   | 18 -
 src/test/groovy/bugs/Groovy9141.groovy | 46 ++
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java 
b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index 40362d0..81ac6a4 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -901,7 +901,6 @@ public class AntlrParserPlugin extends ASTHelper implements 
ParserPlugin, Groovy
 ClassNode[] exceptions = ClassNode.EMPTY_ARRAY;
 
 if (classNode == null || !classNode.isAnnotationDefinition()) {
-
 assertNodeType(PARAMETERS, node);
 parameters = parameters(node);
 if (parameters == null) parameters = Parameter.EMPTY_ARRAY;
@@ -922,16 +921,17 @@ public class AntlrParserPlugin extends ASTHelper 
implements ParserPlugin, Groovy
 modifiers &= ~Opcodes.ACC_SYNTHETIC;
 methodNode = new MethodNode(name, modifiers, returnType, parameters, 
exceptions, code);
 if ((modifiers & Opcodes.ACC_ABSTRACT) == 0) {
-if (node == null) {
+if (node != null) {
+assertNodeType(SLIST, node);
+code = statementList(node);
+} else {
 throw new ASTRuntimeException(methodDef, "You defined a method 
without body. Try adding a body, or declare it abstract.");
 }
-assertNodeType(SLIST, node);
-code = statementList(node);
-} else if (node != null && classNode.isAnnotationDefinition()) {
-code = statement(node);
-hasAnnotationDefault = true;
-} else if ((modifiers & Opcodes.ACC_ABSTRACT) > 0) {
-if (node != null) {
+} else if (node != null) {
+if (classNode != null && classNode.isAnnotationDefinition()) {
+code = statement(node);
+hasAnnotationDefault = true;
+} else {
 throw new ASTRuntimeException(methodDef, "Abstract methods do 
not define a body.");
 }
 }
diff --git a/src/test/groovy/bugs/Groovy9141.groovy 
b/src/test/groovy/bugs/Groovy9141.groovy
new file mode 100644
index 000..32dd3a4
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9141.groovy
@@ -0,0 +1,46 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package groovy.bugs
+
+import gls.CompilableTestSupport
+import groovy.transform.CompileStatic
+
+@CompileStatic
+final class Groovy9141 extends CompilableTestSupport {
+
+void testAbstractMethodWithBody1() {
+def err = shouldNotCompile '''\
+abstract def meth() {
+  println 42
+}
+'''.stripIndent()
+assert err =~ / You can not define a abstract method\[meth\]  in the 
script. Try removing the 'abstract' /
+}
+
+void testAbstractMethodWithBody2() {
+def err = shouldNotCompile '''\
+class Main {
+  abstract def meth() {
+println 42
+  }
+}
+'''.stripIndent()
+assert err =~ / Can't have an abstract method in a non-abstract class. 
/
+}
+}



[groovy] 02/02: GROOVY-9141: add null check for classNode when checking for abstract method with body (tweaks)

2019-05-23 Thread paulk
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

commit 4cafae822961b51775b49d3b7201b20939e967b1
Author: Paul King 
AuthorDate: Fri May 24 11:45:47 2019 +1000

GROOVY-9141: add null check for classNode when checking for abstract method 
with body (tweaks)
---
 .../codehaus/groovy/antlr/AntlrParserPlugin.java   |  9 +++--
 src/test/groovy/bugs/Groovy9141.groovy | 38 ++
 .../apache/groovy/parser/antlr4/AstBuilder.java|  6 ++--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java 
b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index 81ac6a4..dee0a95 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -921,12 +921,11 @@ public class AntlrParserPlugin extends ASTHelper 
implements ParserPlugin, Groovy
 modifiers &= ~Opcodes.ACC_SYNTHETIC;
 methodNode = new MethodNode(name, modifiers, returnType, parameters, 
exceptions, code);
 if ((modifiers & Opcodes.ACC_ABSTRACT) == 0) {
-if (node != null) {
-assertNodeType(SLIST, node);
-code = statementList(node);
-} else {
-throw new ASTRuntimeException(methodDef, "You defined a method 
without body. Try adding a body, or declare it abstract.");
+if (node == null) {
+throw new ASTRuntimeException(methodDef, "You defined a method 
without a body. Try adding a body, or declare it abstract.");
 }
+assertNodeType(SLIST, node);
+code = statementList(node);
 } else if (node != null) {
 if (classNode != null && classNode.isAnnotationDefinition()) {
 code = statement(node);
diff --git a/src/test/groovy/bugs/Groovy9141.groovy 
b/src/test/groovy/bugs/Groovy9141.groovy
index 32dd3a4..0889d36 100644
--- a/src/test/groovy/bugs/Groovy9141.groovy
+++ b/src/test/groovy/bugs/Groovy9141.groovy
@@ -20,27 +20,39 @@ package groovy.bugs
 
 import gls.CompilableTestSupport
 import groovy.transform.CompileStatic
+import org.codehaus.groovy.control.CompilerConfiguration
+
+import static org.codehaus.groovy.control.ParserVersion.V_2
 
 @CompileStatic
 final class Groovy9141 extends CompilableTestSupport {
+private static final String METHOD_DEF = '''
+abstract meth() {
+println 42
+}
+'''
 
-void testAbstractMethodWithBody1() {
-def err = shouldNotCompile '''\
-abstract def meth() {
-  println 42
-}
-'''.stripIndent()
-assert err =~ / You can not define a abstract method\[meth\]  in the 
script. Try removing the 'abstract' /
+void testAbstractMethodWithBodyInScript() {
+def err = shouldNotCompile METHOD_DEF
+assert err =~ / You cannot define an abstract method\[meth\] in the 
script. Try removing the 'abstract' /
 }
 
-void testAbstractMethodWithBody2() {
-def err = shouldNotCompile '''\
+void testAbstractMethodWithBodyInClass() {
+def err = shouldNotCompile """
 class Main {
-  abstract def meth() {
-println 42
-  }
+$METHOD_DEF
 }
-'''.stripIndent()
+"""
+// not a language requirement but class level check takes precedence 
in current implementation
 assert err =~ / Can't have an abstract method in a non-abstract class. 
/
 }
+
+void testAbstractMethodWithBodyInScript_oldParser() {
+def cc = new CompilerConfiguration(parserVersion: V_2)
+def err = shouldFail {
+new GroovyShell(cc).evaluate METHOD_DEF
+}
+assert err =~ / Abstract methods do not define a body/
+}
+
 }
diff --git 
a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
 
b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index 0e54bb9..bd93781 100644
--- 
a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ 
b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -1637,7 +1637,7 @@ public class AstBuilder extends 
GroovyParserBaseVisitor implements Groov
 
 if (9 == ctx.ct) { // script
 if (isAbstractMethod || !hasMethodBody) { // method should not be 
declared abstract in the script
-throw createParsingFailedException("You can not define a " + 
(isAbstractMethod ? "abstract" : "") + " method[" + methodNode.getName() + "] " 
+ (!hasMethodBody ? "without method body"

[groovy] branch master updated (5a5494a -> 4cafae8)

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from 5a5494a  Add test runtime dependency (closes #932)
 new 25465fc  GROOVY-9141: add null check for classNode when checking for 
abstract method with body (closes #933)
 new 4cafae8  GROOVY-9141: add null check for classNode when checking for 
abstract method with body (tweaks)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../codehaus/groovy/antlr/AntlrParserPlugin.java   | 13 +++--
 src/test/groovy/bugs/Groovy9141.groovy | 58 ++
 .../apache/groovy/parser/antlr4/AstBuilder.java|  6 +--
 3 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 src/test/groovy/bugs/Groovy9141.groovy



[groovy] 01/02: GROOVY-9141: add null check for classNode when checking for abstract method with body (closes #933)

2019-05-23 Thread paulk
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

commit 25465fcad59b2fa4cd365b66a27cac15ef6f49e0
Author: Eric Milles 
AuthorDate: Thu May 23 12:19:50 2019 -0500

GROOVY-9141: add null check for classNode when checking for abstract method 
with body (closes #933)
---
 .../codehaus/groovy/antlr/AntlrParserPlugin.java   | 18 -
 src/test/groovy/bugs/Groovy9141.groovy | 46 ++
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java 
b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index 40362d0..81ac6a4 100644
--- a/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/java/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -901,7 +901,6 @@ public class AntlrParserPlugin extends ASTHelper implements 
ParserPlugin, Groovy
 ClassNode[] exceptions = ClassNode.EMPTY_ARRAY;
 
 if (classNode == null || !classNode.isAnnotationDefinition()) {
-
 assertNodeType(PARAMETERS, node);
 parameters = parameters(node);
 if (parameters == null) parameters = Parameter.EMPTY_ARRAY;
@@ -922,16 +921,17 @@ public class AntlrParserPlugin extends ASTHelper 
implements ParserPlugin, Groovy
 modifiers &= ~Opcodes.ACC_SYNTHETIC;
 methodNode = new MethodNode(name, modifiers, returnType, parameters, 
exceptions, code);
 if ((modifiers & Opcodes.ACC_ABSTRACT) == 0) {
-if (node == null) {
+if (node != null) {
+assertNodeType(SLIST, node);
+code = statementList(node);
+} else {
 throw new ASTRuntimeException(methodDef, "You defined a method 
without body. Try adding a body, or declare it abstract.");
 }
-assertNodeType(SLIST, node);
-code = statementList(node);
-} else if (node != null && classNode.isAnnotationDefinition()) {
-code = statement(node);
-hasAnnotationDefault = true;
-} else if ((modifiers & Opcodes.ACC_ABSTRACT) > 0) {
-if (node != null) {
+} else if (node != null) {
+if (classNode != null && classNode.isAnnotationDefinition()) {
+code = statement(node);
+hasAnnotationDefault = true;
+} else {
 throw new ASTRuntimeException(methodDef, "Abstract methods do 
not define a body.");
 }
 }
diff --git a/src/test/groovy/bugs/Groovy9141.groovy 
b/src/test/groovy/bugs/Groovy9141.groovy
new file mode 100644
index 000..32dd3a4
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9141.groovy
@@ -0,0 +1,46 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package groovy.bugs
+
+import gls.CompilableTestSupport
+import groovy.transform.CompileStatic
+
+@CompileStatic
+final class Groovy9141 extends CompilableTestSupport {
+
+void testAbstractMethodWithBody1() {
+def err = shouldNotCompile '''\
+abstract def meth() {
+  println 42
+}
+'''.stripIndent()
+assert err =~ / You can not define a abstract method\[meth\]  in the 
script. Try removing the 'abstract' /
+}
+
+void testAbstractMethodWithBody2() {
+def err = shouldNotCompile '''\
+class Main {
+  abstract def meth() {
+println 42
+  }
+}
+'''.stripIndent()
+assert err =~ / Can't have an abstract method in a non-abstract class. 
/
+}
+}



[groovy] 03/03: Add test runtime dependency (closes #932)

2019-05-23 Thread paulk
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

commit 5a5494ae12be4d2b7c7dd50038f88d86c938a1f5
Author: Eric Milles 
AuthorDate: Thu May 23 12:30:58 2019 -0500

Add test runtime dependency (closes #932)
---
 subprojects/groovy-json/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subprojects/groovy-json/build.gradle 
b/subprojects/groovy-json/build.gradle
index 3ff11ac..1ab2576 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -20,6 +20,7 @@ dependencies {
 compile rootProject
 testCompile project(':groovy-test')
 testCompile project(':groovy-dateutil')
+testRuntime "org.slf4j:slf4j-api:$slf4jVersion"
 testRuntime project(':groovy-ant') // for JavadocAssertionTests
 }
 



[groovy] 01/03: Update eclipse gradle scripts

2019-05-23 Thread paulk
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

commit ebd902af8bd3aa8d96cbe6739258750145a32db3
Author: Eric Milles 
AuthorDate: Wed May 22 14:40:40 2019 -0500

Update eclipse gradle scripts
---
 .gitignore   |  18 +++--
 gradle/eclipse.gradle| 109 +--
 subprojects/groovy-docgenerator/build.gradle |   4 +
 subprojects/groovy-groovydoc/build.gradle|   4 +
 subprojects/groovy-groovysh/build.gradle |   4 +
 subprojects/groovy-json/build.gradle |   6 +-
 subprojects/groovy-servlet/build.gradle  |   6 +-
 subprojects/groovy-test/build.gradle |   4 +
 subprojects/groovy-yaml/build.gradle |   4 +
 9 files changed, 111 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7ec6f4..338baa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,21 @@
+user.gradle
+.gradle/
 target/
 build/
 out/
-/bin/
+
 *.DS_Store
+*.class
+*.swp
 *~
-.gradle
+
+.idea
 *.iml
 *.ipr
 *.iws
-.idea
-.*.swp
-*.class
-user.gradle
+.shelf
+
 .settings/
 .classpath
 .project
-.shelf
-
+bin/
diff --git a/gradle/eclipse.gradle b/gradle/eclipse.gradle
index 559004b..84be8cf 100644
--- a/gradle/eclipse.gradle
+++ b/gradle/eclipse.gradle
@@ -16,52 +16,85 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-//most of this is just a "hack" to break the circular dependencies between 
projects
-//which exist because Eclipse does not distinguish between build phases (e.g. 
compile, test, runtime)
 allprojects {
 apply plugin: 'eclipse'
-
-eclipse.jdt {
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-}
-
-eclipse.classpath.file {
-whenMerged { classpath ->
-classpath.entries.removeAll{ entry -> entry.path == 
'/groovy-groovydoc' }
-classpath.entries.removeAll{ entry -> entry.path =~ /groovy-ant/ }
-classpath.entries.removeAll{ entry -> entry.path =~ /target/ }
-classpath.entries.unique(true){ entry -> entry.path }
+
+eclipse.classpath.file.whenMerged {
+entries.removeAll { entry -> entry.path =~ '/target/' } // affects: 
cli-commons, cli-picocli, console, groovydoc, macro, servlet, swing, templates, 
xml
+entries.unique(true) { entry -> entry.path } // affects: console, 
groovydoc, macro, servlet, swing, templates, xml
+entries.sort(true) { entry -> "${entry.kind}:${entry.path}".toString() 
}
+
+// set "test" attribute based on gradle scopes
+entries.findAll { entry ->
+entry.class.name in [
+'org.gradle.plugins.ide.eclipse.model.Library',
+'org.gradle.plugins.ide.eclipse.model.SourceFolder'
+]
+}.each { entry ->
+if (entry.entryAttributes['gradle_used_by_scope'] == 'test') {
+entry.entryAttributes['test'] = 'true'
+}
 }
-withXml {
-def node = it.asNode()
-node.appendNode('classpathentry', [kind: 'lib', path: 
"${rootProject.jar.archivePath}"])
+// set "test" attribute based on configuration
+entries.findAll { entry ->
+entry.class.name in [
+'org.gradle.plugins.ide.eclipse.model.ProjectDependency'
+]
+}.each { entry ->
+if (entry.path.substring(1) in 
project.configurations.testCompile.dependencies*.name) {
+entry.entryAttributes['test'] = 'true'
+}
 }
 }
-
+
 project.tasks.eclipse.doLast {
-File groovyPrefs = 
file("${project.projectDir}/.settings/org.eclipse.jdt.groovy.core.prefs")
-if (!groovyPrefs.exists()) {
-groovyPrefs.append('groovy.compiler.level=-1\n')
+
file("${project.projectDir}/.settings/org.eclipse.jdt.groovy.core.prefs").with 
{ prefs ->
+if (!prefs.exists()) {
+append('''\
+eclipse.preferences.version=1
+groovy.compiler.level=30
+'''.stripIndent()
+)
+}
 }
-}
-}
 
-eclipse.classpath.file {
-whenMerged { classpath ->
-classpath.entries.find { entry -> entry.path =~ /src\/main/ }.path = 
'/groovy/src/main'
-classpath.entries.find { entry -> entry.path =~ /src\/main/ }.includes 
= []
-classpath.entries.each { entry -> if(entry.path == 'src/test'){ 
entry.excludes = ['groovy/PropertyTest.groovy'] as List } }
-classpath.entries.removeAll{ entry -> entry.path == '/groovy-test' }
-classpath.entries.removeAll{ entry -> entry.path =~ /subprojects/ }
-classpath.entries.removeAll{ entry -> entry.p

[groovy] branch master updated (8635e34 -> 5a5494a)

2019-05-23 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from 8635e34  GROOVY-9139: Bump JUnit 5 to 5.5.0-M1
 new ebd902a  Update eclipse gradle scripts
 new fc99f70  Fix test compile dependency
 new 5a5494a  Add test runtime dependency (closes #932)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore   |  18 +++--
 gradle/eclipse.gradle| 109 +--
 subprojects/groovy-docgenerator/build.gradle |   4 +
 subprojects/groovy-groovydoc/build.gradle|   4 +
 subprojects/groovy-groovysh/build.gradle |   4 +
 subprojects/groovy-json/build.gradle |   7 +-
 subprojects/groovy-servlet/build.gradle  |   7 +-
 subprojects/groovy-test/build.gradle |   4 +
 subprojects/groovy-yaml/build.gradle |   4 +
 9 files changed, 111 insertions(+), 50 deletions(-)



[groovy] 02/03: Fix test compile dependency

2019-05-23 Thread paulk
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

commit fc99f70c6f146590faf1f952df480398faa5ead1
Author: Eric Milles 
AuthorDate: Thu May 23 11:29:08 2019 -0500

Fix test compile dependency
---
 subprojects/groovy-servlet/build.gradle | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/subprojects/groovy-servlet/build.gradle 
b/subprojects/groovy-servlet/build.gradle
index 60faeb1..f5b16a0 100644
--- a/subprojects/groovy-servlet/build.gradle
+++ b/subprojects/groovy-servlet/build.gradle
@@ -24,18 +24,15 @@ dependencies {
 provided dep
 exclude(group: 'javax.servlet', module: 'servlet-api')
 }
-compile rootProject
 testCompile "jmock:jmock:$jmockVersion"
+
+compile rootProject
 // needed for MarkupBuilder
 compile project(':groovy-xml')
 // needed by TemplateServlet
 compile project(':groovy-templates')
+
 testCompile rootProject.sourceSets.test.runtimeClasspath
+testCompile project(':groovy-json')
 testCompile project(':groovy-test')
-// for compilation, dependency is not necessary because the classes are 
loaded using Class.forName
-testRuntime project(':groovy-json')
-}
-
-eclipse.classpath.file.whenMerged {
-entries.removeAll { entry -> entry.path == '/groovy-json' }
 }



[groovy] branch master updated: GROOVY-9139: Bump JUnit 5 to 5.5.0-M1

2019-05-22 Thread paulk
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 8635e34  GROOVY-9139: Bump JUnit 5 to 5.5.0-M1
8635e34 is described below

commit 8635e3404c8c4e05eff05f3c5ae7f7532375892c
Author: Paul King 
AuthorDate: Thu May 23 15:45:02 2019 +1000

GROOVY-9139: Bump JUnit 5 to 5.5.0-M1
---
 subprojects/groovy-test-junit5/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subprojects/groovy-test-junit5/build.gradle 
b/subprojects/groovy-test-junit5/build.gradle
index 50f9ec5..2bc7408 100644
--- a/subprojects/groovy-test-junit5/build.gradle
+++ b/subprojects/groovy-test-junit5/build.gradle
@@ -18,8 +18,8 @@
  */
 
 ext {
-junit5Version = '5.4.1'
-junit5PlatformVersion = '1.4.1'
+junit5Version = '5.5.0-M1'
+junit5PlatformVersion = '1.5.0-M1'
 }
 
 dependencies {



[groovy] branch master updated (2221ba0 -> 375b105)

2019-05-22 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from 2221ba0  GROOVY-9135: Additional support for @Testable annotation in 
JUnit5Runner
 new b1e1c8d  GROOVY-7772: Class. had better to have same 
meaning of Class::instanceMethod of Java8 (Add test cases - closes #287)
 new 375b105  GROOVY-7772: Class. had better to have same 
meaning of Class::instanceMethod of Java8 (add doco)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/spec/doc/core-operators.adoc  | 17 +
 src/spec/test/OperatorsTest.groovy| 15 +++
 src/test/groovy/bugs/MethodClosureTest.groovy | 23 +++
 3 files changed, 51 insertions(+), 4 deletions(-)



[groovy] 02/02: GROOVY-7772: Class. had better to have same meaning of Class::instanceMethod of Java8 (add doco)

2019-05-22 Thread paulk
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

commit 375b105dd745b3543d6b374c34fa5ed57eaa8ed6
Author: Paul King 
AuthorDate: Thu May 23 15:18:44 2019 +1000

GROOVY-7772: Class. had better to have same meaning of 
Class::instanceMethod of Java8 (add doco)
---
 src/spec/doc/core-operators.adoc   | 17 +
 src/spec/test/OperatorsTest.groovy | 15 +++
 2 files changed, 32 insertions(+)

diff --git a/src/spec/doc/core-operators.adoc b/src/spec/doc/core-operators.adoc
index 7fa2566..e1a64f5 100644
--- a/src/spec/doc/core-operators.adoc
+++ b/src/spec/doc/core-operators.adoc
@@ -366,6 +366,23 @@ 
include::{projectdir}/src/spec/test/OperatorsTest.groovy[tags=method_pointer_dis
 <4> using the method pointer with a `String` calls the `String` version of 
`doSomething`
 <5> using the method pointer with an `Integer` calls the `Integer` version of 
`doSomething`
 
+To align with Java 8 method reference expectations, in Groovy 3 and above, you 
can use `new` as the
+method name to obtain a method pointer to the constructor:
+[source,groovy]
+
+include::{projectdir}/src/spec/test/OperatorsTest.groovy[tags=method_pointer_new,indent=0]
+
+
+Also in Groovy 3 and above, you can obtain a method pointer to an instance 
method of a class.
+This method pointer takes an additional parameter being the receiver instance 
to
+invoke the method on:
+[source,groovy]
+
+include::{projectdir}/src/spec/test/OperatorsTest.groovy[tags=method_pointer_class_instance,indent=0]
+
+For backwards compatibility, any static methods that happen to have the correct
+parameters for the call will be given precedence over instance methods for 
this case.
+
 [[method-reference-operator]]
 === Method reference operator
 
diff --git a/src/spec/test/OperatorsTest.groovy 
b/src/spec/test/OperatorsTest.groovy
index ca0831b..e26c73c 100644
--- a/src/spec/test/OperatorsTest.groovy
+++ b/src/spec/test/OperatorsTest.groovy
@@ -280,6 +280,21 @@ assert user.@name == 'Bob'   // <1>
 assert reference(123)   == 246   // <5>
 // end::method_pointer_dispatch[]
 '''
+
+assertScript '''
+// tag::method_pointer_new[]
+def foo  = BigInteger.
+def fortyTwo = foo('42')
+assert fortyTwo == 42G
+// end::method_pointer_new[]
+'''
+
+assertScript '''
+// tag::method_pointer_class_instance[]
+def instanceMethod = String.
+assert instanceMethod('foo') == 'FOO'
+// end::method_pointer_class_instance[]
+'''
 }
 
 void testMethodReference() {



[groovy] 01/02: GROOVY-7772: Class. had better to have same meaning of Class::instanceMethod of Java8 (Add test cases - closes #287)

2019-05-22 Thread paulk
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

commit b1e1c8d975b18bfa2bf42688d45c9bb3d2a7eb1f
Author: UEHARA Junji 
AuthorDate: Wed Mar 9 05:00:44 2016 +0900

GROOVY-7772: Class. had better to have same meaning of 
Class::instanceMethod of Java8 (Add test cases - closes #287)
---
 src/test/groovy/bugs/MethodClosureTest.groovy | 23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/test/groovy/bugs/MethodClosureTest.groovy 
b/src/test/groovy/bugs/MethodClosureTest.groovy
index 317ef7f..1ce27fc 100644
--- a/src/test/groovy/bugs/MethodClosureTest.groovy
+++ b/src/test/groovy/bugs/MethodClosureTest.groovy
@@ -29,26 +29,41 @@ class MethodClosureTest extends GroovyTestCase {
 static bb(it) { it}
 
 void testMethodClosure() {
+def cl2 = String. // Class.instanceMethod
+assert cl2 instanceof Closure
+assert cl2 instanceof MethodClosure
+
+assert ["xx", "yy"].collect(cl2) == ["XX","YY"]
+
 Class[] c1 = [ Exception.class, Throwable.class ]
 Class[] c2 = [ IllegalStateException.class ]
 
-def cl = this.
+def cl = this. // instance.instanceMethod
 
 assert cl instanceof Closure
 assert cl instanceof MethodClosure
 
 assert [c1, c2].collect(cl) == [c1,c2]
+
 }
 
 void testStaticMethodAccess() {
def list = [1].collect (this.)
assert list == [1]
-   list = [1].collect (MethodClosureTest.)
+   list = [1].collect (MethodClosureTest.) // Class.staticMethod
assert list == [1]
def mct = new MethodClosureTest()
-   list = [1].collect (mct.)
+   list = [1].collect (mct.) // instance.staticMethod
assert list == [1]
 }
-}
 
 
+void testShellVariable() {
+def shell = new GroovyShell()
+assert shell.evaluate("x = String. x('abc')") == "ABC"
+assert shell.evaluate("x = 'abc'. x()") == "ABC"
+assert shell.evaluate("x = Integer. x('123')") == 123
+assert shell.evaluate("x = 3. x('123')") == 123
+}
+}
+



[groovy] branch GROOVY_2_5_X updated: GROOVY-9135: Additional support for @Testable annotation in JUnit5Runner

2019-05-22 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
 new a995ad2  GROOVY-9135: Additional support for @Testable annotation in 
JUnit5Runner
a995ad2 is described below

commit a995ad2deca3c9df655af158e32fc08c4742848e
Author: Paul King 
AuthorDate: Thu May 23 00:53:04 2019 +1000

GROOVY-9135: Additional support for @Testable annotation in JUnit5Runner
---
 .../main/java/groovy/junit5/plugin/JUnit5Runner.java   | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git 
a/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
 
b/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
index 15e6709..9d6d125 100644
--- 
a/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
+++ 
b/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
@@ -25,6 +25,8 @@ import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Integration code for running JUnit5 tests in Groovy.
@@ -63,18 +65,30 @@ public class JUnit5Runner implements GroovyRunner {
 if (name.startsWith("org.junit.jupiter.api.") && 
tryLoadClass(name, loader)) {
 return true;
 }
-if (isJUnit5TestableMetaAnnotationPresent(type) && 
tryLoadClass(name, loader)) {
+// it might directly annotate a class, e.g. Specification in Spock 
2
+if (name.equals("org.junit.platform.commons.annotation.Testable") 
&& tryLoadClass(name, loader)) {
+return true;
+}
+if (isJUnit5TestableMetaAnnotationPresent(type, new HashSet<>()) 
&& tryLoadClass(name, loader)) {
 return true;
 }
 }
 return false;
 }
 
-private boolean isJUnit5TestableMetaAnnotationPresent(Class type) {
+private boolean isJUnit5TestableMetaAnnotationPresent(Class type, Set seen) {
 for (Annotation annotation : type.getAnnotations()) {
+// It might annotate an annotation, e.g. jqwik @Property
 if 
("org.junit.platform.commons.annotation.Testable".equals(annotation.annotationType().getName()))
 {
 return true;
 }
+// perhaps it's a meta-annotation, e.g. jqwik @Example is 
annotated with @Property
+if (!seen.contains(annotation.annotationType().getName())) {
+seen.add(annotation.annotationType().getName());
+if 
(isJUnit5TestableMetaAnnotationPresent(annotation.annotationType(), seen)) {
+return true;
+}
+}
 }
 return false;
 }



[groovy] branch master updated: GROOVY-9135: Additional support for @Testable annotation in JUnit5Runner

2019-05-22 Thread paulk
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 2221ba0  GROOVY-9135: Additional support for @Testable annotation in 
JUnit5Runner
2221ba0 is described below

commit 2221ba0845369741405b47efc375ca70c76d7356
Author: Paul King 
AuthorDate: Thu May 23 00:53:04 2019 +1000

GROOVY-9135: Additional support for @Testable annotation in JUnit5Runner
---
 .../main/java/groovy/junit5/plugin/JUnit5Runner.java   | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git 
a/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
 
b/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
index 15e6709..9d6d125 100644
--- 
a/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
+++ 
b/subprojects/groovy-test-junit5/src/main/java/groovy/junit5/plugin/JUnit5Runner.java
@@ -25,6 +25,8 @@ import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Integration code for running JUnit5 tests in Groovy.
@@ -63,18 +65,30 @@ public class JUnit5Runner implements GroovyRunner {
 if (name.startsWith("org.junit.jupiter.api.") && 
tryLoadClass(name, loader)) {
 return true;
 }
-if (isJUnit5TestableMetaAnnotationPresent(type) && 
tryLoadClass(name, loader)) {
+// it might directly annotate a class, e.g. Specification in Spock 
2
+if (name.equals("org.junit.platform.commons.annotation.Testable") 
&& tryLoadClass(name, loader)) {
+return true;
+}
+if (isJUnit5TestableMetaAnnotationPresent(type, new HashSet<>()) 
&& tryLoadClass(name, loader)) {
 return true;
 }
 }
 return false;
 }
 
-private boolean isJUnit5TestableMetaAnnotationPresent(Class type) {
+private boolean isJUnit5TestableMetaAnnotationPresent(Class type, Set seen) {
 for (Annotation annotation : type.getAnnotations()) {
+// It might annotate an annotation, e.g. jqwik @Property
 if 
("org.junit.platform.commons.annotation.Testable".equals(annotation.annotationType().getName()))
 {
 return true;
 }
+// perhaps it's a meta-annotation, e.g. jqwik @Example is 
annotated with @Property
+if (!seen.contains(annotation.annotationType().getName())) {
+seen.add(annotation.annotationType().getName());
+if 
(isJUnit5TestableMetaAnnotationPresent(annotation.annotationType(), seen)) {
+return true;
+}
+}
 }
 return false;
 }



[groovy-website] branch asf-site updated: add release dates to changelogs

2019-05-21 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new d45a708  add release dates to changelogs
d45a708 is described below

commit d45a7082c73539c5134dc8474d447cf191ef339b
Author: Paul King 
AuthorDate: Tue May 21 16:29:12 2019 +1000

add release dates to changelogs
---
 .../src/main/groovy/generator/ChangelogParser.groovy | 16 +---
 site/src/site/pages/changelogs.groovy| 10 ++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/generator/src/main/groovy/generator/ChangelogParser.groovy 
b/generator/src/main/groovy/generator/ChangelogParser.groovy
index ea9e075..c5dc813 100644
--- a/generator/src/main/groovy/generator/ChangelogParser.groovy
+++ b/generator/src/main/groovy/generator/ChangelogParser.groovy
@@ -35,11 +35,11 @@ class ChangelogParser {
 private static final String ITEM_MARK = '* '
 private static final Pattern ITEM_PATTERN = ~/\[(GROOVY-[0-9]+)\] - (.+)/
 private static final String VERSION_PATTERN = /^((1\.)|[23]\.)/
-public static final Map UNRELEASED = [
-'1.1.0': 'renamed to 1.5.0',
-'1.9.0': 'renamed to 2.0.0',
-'2.6.0': 'discontinued',
-'3.0.0': 'upcoming new release',
+public static final Map INFO = [
+'1.1.0': 'Unreleased: renamed to 1.5.0',
+'1.9.0': 'Unreleased: renamed to 2.0.0',
+'2.6.0': 'Unreleased: discontinued',
+'3.0.0': 'Unreleased: upcoming new release',
 ]
 
 static List fetchReleaseNotes(File cacheDirectory) {
@@ -49,7 +49,9 @@ class ChangelogParser {
 it.name =~ VERSION_PATTERN &&
 it.released == true
 }.collectEntries {
-[fixName(it.name), it.id]
+def name = fixName(it.name)
+INFO[name] = "Released: $it.releaseDate"
+[name, it.id]
 }
 
 def raw = versionMap.collect { name, id ->
@@ -79,7 +81,7 @@ class ChangelogParser {
 def allMajor = changelogs.groupBy {
 def v = it.groovyVersion
 v.contains('-')?v-v.substring(v.indexOf('-')):v
-}.findAll { ver, logs -> ver in releasedVersions || ver in 
UNRELEASED.keySet() } // add some unreleased versions to get aggregate changelog
+}.findAll { ver, logs -> ver in releasedVersions || ver in 
INFO.keySet() } // add some unreleased versions to get aggregate changelog
 allMajor.collect { k,v ->
 def changelog = changelogs.find { it.groovyVersion == k }
 if (!changelog) {
diff --git a/site/src/site/pages/changelogs.groovy 
b/site/src/site/pages/changelogs.groovy
index caf9f52..ff98daa 100644
--- a/site/src/site/pages/changelogs.groovy
+++ b/site/src/site/pages/changelogs.groovy
@@ -28,15 +28,17 @@ layout 'layouts/main.groovy', true,
 a(name: "changelog$mj") {}
 h2("Groovy $mj")
 ul {
-minor.each { v ->
+minor.sort{ a, b ->
+aInfo = 
generator.ChangelogParser.INFO[a]
+bInfo = 
generator.ChangelogParser.INFO[b]
+(bInfo ? bInfo.split(' ')[-1] : 
'~') <=> (aInfo ? aInfo.split(' ')[-1] : '~')
+}.each { v ->
 def unreleased = 
v.endsWith('-unreleased')
 def ver = unreleased ? v - 
'-unreleased' : v
 li {
 yieldUnescaped ( 
v.endsWith('-unreleased') || (!v.contains('-') && versions.any{ 
it.startsWith("$v-") }) ? "Aggregate c" : "C" ) + "hangelog for "
 a(href: 
"changelogs/changelog-${v}.html", "Groovy $ver")
-if (unreleased) {
-yieldUnescaped 
"[Unreleased: ${generator.ChangelogParser.UNRELEASED[ver]}]"
-}
+yieldUnescaped 
"[${generator.ChangelogParser.INFO[ver]}]"
 }
 }
 }



[groovy-website] branch asf-site updated: release note tweaks

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 2c1ef53  release note tweaks
2c1ef53 is described below

commit 2c1ef5322b2cc66f62ed03826c3e496aa2665e7e
Author: Paul King 
AuthorDate: Tue May 21 15:38:58 2019 +1000

release note tweaks
---
 site/src/site/releasenotes/groovy-3.0.adoc | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/site/src/site/releasenotes/groovy-3.0.adoc 
b/site/src/site/releasenotes/groovy-3.0.adoc
index 58261b6..4e181d9 100644
--- a/site/src/site/releasenotes/groovy-3.0.adoc
+++ b/site/src/site/releasenotes/groovy-3.0.adoc
@@ -511,7 +511,14 @@ assert 'Greetings, Daniel' == daniel.greet()
 
 [width="80%",align="center"]
 |===
-a| NOTE: _Experimental Status:_ While this feature will remain, we regard its 
current implementation as experimental. Currently, interface default methods 
are implemented using traits. This means that they work even when using JDK7 
(i.e. using Groovy 2.6 with Parrot parser enabled on a version 7 JRE). We are 
currently exploring supporting native default methods in interfaces instead of, 
or in addition to, the trait implementation. If we change the implementation, 
we would expect no chang [...]
+a| NOTE: _Experimental Status:_ While this feature will remain, we regard its 
current implementation as experimental.
+Currently, interface default methods are implemented using traits. This means 
that they work even when using JDK7
+(i.e. using Groovy 2.6 with Parrot parser enabled on a version 7 JRE).
+We are currently exploring supporting native default methods in interfaces 
instead of, or in addition to,
+the trait implementation. If we change the implementation, we would expect no 
change in logical behavior
+though the new implementation may have different performance characteristics 
in some circumstances and the
+native implementation would only work on JDK8+.
+Our goal is to clarify this aspect of the language before reaching release 
candidate status.
 |===
 
 [[Groovy3.0releasenotes-Splitpackages]]
@@ -722,4 +729,5 @@ Groovy 3.0 requires JDK9+ to build and JDK8 is the minimum 
version of the JRE th
 [[Groovy3.0releasenotes-Moreinformation]]
 == More information
 
-You can browse all the link:../changelogs/changelog-3.0.0-alpha-1.html[tickets 
closed for Groovy 3.0 in JIRA]. Note: some of the tickets relevant for this 
release are contained in the 
link:../changelogs/changelog-2.6.0-alpha-1.html[tickets closed for Groovy 2.6].
+You can browse all the 
link:../changelogs/changelog-3.0.0-unreleased.html[tickets closed for Groovy 
3.0 in JIRA].
+Note: some of the tickets relevant for this release are contained in the 
link:../changelogs/changelog-2.6.0-unreleased.html[tickets closed for Groovy 
2.6].



[groovy-website] branch asf-site updated: update release note info for method references

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 69608dd  update release note info for method references
69608dd is described below

commit 69608dd4ef6bd8f28ba9ee7c2c8332c410138aa3
Author: Paul King 
AuthorDate: Tue May 21 13:16:37 2019 +1000

update release note info for method references
---
 site/src/site/releasenotes/groovy-3.0.adoc | 62 ++
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/site/src/site/releasenotes/groovy-3.0.adoc 
b/site/src/site/releasenotes/groovy-3.0.adoc
index a000140..58261b6 100644
--- a/site/src/site/releasenotes/groovy-3.0.adoc
+++ b/site/src/site/releasenotes/groovy-3.0.adoc
@@ -5,7 +5,10 @@
 [width="80%",align="center"]
 |===
 a| NOTE: _WARNING:_
-Material on this page is still under development! We are currently creating 
alpha versions of Groovy 3.0 with a goal of gathering feedback on the language 
changes from our community. In addition, the alpha versions assist other 
projects and tool vendors within the Groovy ecosystem to begin assessing the 
impact of moving to/supporting Groovy 3.0. Caution should be exercised if using 
new features as the details may change before final release.)
+Material on this page is still under development! We are currently releasing 
beta versions of Groovy 3.0 with a goal
+of gathering feedback on the language changes from our community. In addition, 
the beta versions assist other projects
+and tool vendors within the Groovy ecosystem to begin assessing the impact of 
moving to/supporting Groovy 3.0.
+Caution should be exercised if using new features as the details may change 
before final release.
 |===
 
 [[Groovy3.0releasenotes-Parrot]]
@@ -164,11 +167,7 @@ assert addWithDefault(1) == 101
 === Method references
 
 The Java 8 method reference syntax using the double colon syntax is now 
supported.
-
-[width="80%",align="center"]
-|===
-a| NOTE: _Experimental Status:_ While this feature will remain, we regard its 
current implementation as experimental. Currently, a method reference is turned 
into a Groovy method closure. This means that it even works when using JDK7 
(i.e. using Groovy 2.6 with Parrot parser enabled on a version 7 JRE). We are 
currently exploring supporting native method references either instead of, or 
in addition to, method closures. If we change the implementation, we would 
expect no change in logical [...]
-|===
+Let's first look at some of the supported cases before coming back to some 
implementation details.
 
 The following examples illustrate referencing both static and instance methods 
of a class:
 
@@ -247,6 +246,54 @@ def names = 
pets.map(Animal::toString).collect(Collectors.joining( "," ))
 assert names == 'Animal(cat),Animal(dog)'
 --
 
+ Implementation details and static optimization
+
+While for the most part you can ignore implementation details, it is useful
+to understand the implementation behind method references in some scenarios.
+For dynamic Groovy, a method reference is implemented as a Closure method 
reference.
+So `String::toUpperCase` is the same as `String.`.
+In the spirit of providing a more Java-like experience when using 
`@CompileStatic`,
+we support native method references for static Groovy.
+
+For this example (using `String.transform` from JDK 12):
+[source,groovy]
+--
+@groovy.transform.CompileStatic
+def method() {
+  assert 'Hi'.transform(String::toUpperCase) == 'HI'
+}
+--
+The compiler will produce bytecode very similar to what Java would produce
+for this case (involves `INVOKEDYNAMIC`, method handles and 
`LambdaMetafactory` for the bytecode geeks).
+If you are already using `@CompileStatic` for extra compile-time type safety 
or performance,
+then the code will be semantically equivalent but optimized similar to Java.
+
+If you have code making use of dynamic features, then you should not use 
`@CompileStatic` with your method references, e.g.:
+
+[source,groovy]
+--
+def convertCase(boolean upper, String arg) {
+arg.transform(String::"${upper ? 'toUpperCase' : 'toLowerCase'}")
+}
+assert convertCase(true, 'Hi') == 'HI'
+assert convertCase(false, 'Bye') == 'bye'
+--
+Since here the GString prohibits the compiler from knowing how to write the
+optimized code that would be required.
+Note: this example is a little contrived and could be refactored to call one
+of two optimized method references but hopefully you get the idea.
+
+The same caveat applies if you want to make use of the Closure nature behind 
the dynamic
+implementation, e.g.:
+
+[source,groovy]
+---

[groovy] branch master updated: GROOVY-9129: [PARROT] Support safe index operations for lists (tweak test)

2019-05-20 Thread paulk
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 519899e  GROOVY-9129: [PARROT] Support safe index operations for lists 
(tweak test)
519899e is described below

commit 519899e61e7b76cc1366dcf71f29e857be4afe8a
Author: Paul King 
AuthorDate: Tue May 21 09:44:49 2019 +1000

GROOVY-9129: [PARROT] Support safe index operations for lists (tweak test)
---
 .../src/test/resources/core/SafeIndex_01x.groovy | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy 
b/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy
index 1cbcf66..b1d0856 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-assert null == null?[1];
-assert null == null?[1]?[1, 2];
-assert null == null?[1]?[1, 2]?[1, 2, 3];
+assert null == null?[1]
+assert null == null?[1]?[1, 2]
+assert null == null?[1]?[1, 2]?[1, 2, 3]
 
-def a = null;
-assert null == a?[1, 2];
+def a = null
+assert null == a?[1, 2]
 
 def f() {return null}
-assert null == f()?[1];
+assert null == f()?[1]
 



[groovy] branch master updated: GROOVY-9128: [PARROT] Provide proper support for the identical (===) and not identical (!==) operators (tweak to test)

2019-05-20 Thread paulk
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 45d8323  GROOVY-9128: [PARROT] Provide proper support for the 
identical (===) and not identical (!==) operators (tweak to test)
45d8323 is described below

commit 45d8323810720e71e51082d926de63a18858abfe
Author: Paul King 
AuthorDate: Tue May 21 08:38:58 2019 +1000

GROOVY-9128: [PARROT] Provide proper support for the identical (===) and 
not identical (!==) operators (tweak to test)
---
 .../parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/subprojects/parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy 
b/subprojects/parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy
index 9110bb4..6703efb 100644
--- a/subprojects/parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy
+++ b/subprojects/parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy
@@ -21,7 +21,9 @@ def y = []
 assert y !== x
 
 assert 'a' === 'a'
-assert 'a' !== new String('a')
+def otherA = new String('a')
+assert 'a' == otherA && 'a'.equals(otherA)
+assert 'a' !== otherA && !'a'.is(otherA)
 assert null === null
 assert true === true
 assert false === false



[groovy] branch master updated: GROOVY-9046: Build hardening

2019-05-20 Thread paulk
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 c80fef5  GROOVY-9046: Build hardening
c80fef5 is described below

commit c80fef5cbcd3bfafa84ff4a25730e9afe88c1f24
Author: Paul King 
AuthorDate: Mon May 20 23:25:49 2019 +1000

GROOVY-9046: Build hardening
---
 build.gradle | 17 +
 1 file changed, 17 insertions(+)

diff --git a/build.gradle b/build.gradle
index 9cd26df..7d5f33b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -476,3 +476,20 @@ licenseReport {
 //licenseFormat.dependsOn licenseFormatGradle
 //
 
+def checkRepo(repo) {
+if (repo instanceof MavenArtifactRepository) {
+def repoUrl = repo.url.toString()
+if (repoUrl.startsWith("http://;)) {
+throw new GradleException("Build should not use insecure 
HTTP-based URLs for repositories. Found: " + repoUrl)
+}
+}
+}
+
+project.afterEvaluate {
+allprojects.repositories.each { handler ->
+handler.each { checkRepo(it) }
+}
+buildscript.repositories.each { handler ->
+handler.each { checkRepo(it) }
+}
+}



[groovy-website] branch asf-site updated: tweak changelog production

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new adf55ac  tweak changelog production
adf55ac is described below

commit adf55ac616f7c97ec9b950708301a0b1d1a0147b
Author: Paul King 
AuthorDate: Mon May 20 19:10:04 2019 +1000

tweak changelog production
---
 generator/src/main/groovy/generator/ChangelogParser.groovy | 10 --
 site/src/site/pages/changelogs.groovy  | 10 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/generator/src/main/groovy/generator/ChangelogParser.groovy 
b/generator/src/main/groovy/generator/ChangelogParser.groovy
index 70563e7..ea9e075 100644
--- a/generator/src/main/groovy/generator/ChangelogParser.groovy
+++ b/generator/src/main/groovy/generator/ChangelogParser.groovy
@@ -35,6 +35,12 @@ class ChangelogParser {
 private static final String ITEM_MARK = '* '
 private static final Pattern ITEM_PATTERN = ~/\[(GROOVY-[0-9]+)\] - (.+)/
 private static final String VERSION_PATTERN = /^((1\.)|[23]\.)/
+public static final Map UNRELEASED = [
+'1.1.0': 'renamed to 1.5.0',
+'1.9.0': 'renamed to 2.0.0',
+'2.6.0': 'discontinued',
+'3.0.0': 'upcoming new release',
+]
 
 static List fetchReleaseNotes(File cacheDirectory) {
 def slurper = new JsonSlurper()
@@ -73,12 +79,12 @@ class ChangelogParser {
 def allMajor = changelogs.groupBy {
 def v = it.groovyVersion
 v.contains('-')?v-v.substring(v.indexOf('-')):v
-}.findAll { ver, logs -> ver in releasedVersions || ver in ['2.6.0', 
'3.0.0'] } // 2.6, 3.0 added to get aggregate changelog
+}.findAll { ver, logs -> ver in releasedVersions || ver in 
UNRELEASED.keySet() } // add some unreleased versions to get aggregate changelog
 allMajor.collect { k,v ->
 def changelog = changelogs.find { it.groovyVersion == k }
 if (!changelog) {
 println "Not found: $k"
-// it's useful to have an aggregate when we haven't done a 
'.0' release yet, use '-unreleased' to track
+// it's useful to have an aggregate when we haven't done a 
'.0' release, use '-unreleased' to track
 changelog = new Changelog(groovyVersion: k + '-unreleased', 
issues:[])
 changelogs << changelog
 }
diff --git a/site/src/site/pages/changelogs.groovy 
b/site/src/site/pages/changelogs.groovy
index 7efd865..caf9f52 100644
--- a/site/src/site/pages/changelogs.groovy
+++ b/site/src/site/pages/changelogs.groovy
@@ -29,14 +29,14 @@ layout 'layouts/main.groovy', true,
 h2("Groovy $mj")
 ul {
 minor.each { v ->
-def ver = v
-def unreleased = ''
-if (v.endsWith('-unreleased')) {
-ver = (v - '-unreleased') + ' 
(unreleased)'
-}
+def unreleased = 
v.endsWith('-unreleased')
+def ver = unreleased ? v - 
'-unreleased' : v
 li {
 yieldUnescaped ( 
v.endsWith('-unreleased') || (!v.contains('-') && versions.any{ 
it.startsWith("$v-") }) ? "Aggregate c" : "C" ) + "hangelog for "
 a(href: 
"changelogs/changelog-${v}.html", "Groovy $ver")
+if (unreleased) {
+yieldUnescaped 
"[Unreleased: ${generator.ChangelogParser.UNRELEASED[ver]}]"
+}
 }
 }
 }



[groovy-website] branch asf-site updated (a76a617 -> ac08eeb)

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git.


from a76a617  Reflect the aggregation status of .0 releases more accurately
 new a9e29e2  Reflect the aggregation status of .0 releases more accurately
 new ca2bf4d  Reflect the aggregation status of .0 releases more accurately
 new ac08eeb  bump asciidoctorj and groovy versions

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 generator/build.gradle |  8 
 generator/src/main/groovy/generator/ChangelogParser.groovy |  6 +++---
 site/src/site/pages/changelogs.groovy  | 14 ++
 3 files changed, 13 insertions(+), 15 deletions(-)



[groovy-website] 01/03: Reflect the aggregation status of .0 releases more accurately

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit a9e29e2d8c3a529415687c352904e3e612cf029c
Author: Paul King 
AuthorDate: Mon May 20 18:44:21 2019 +1000

Reflect the aggregation status of .0 releases more accurately
---
 site/src/site/pages/changelogs.groovy | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/site/src/site/pages/changelogs.groovy 
b/site/src/site/pages/changelogs.groovy
index 450e0f3..7efd865 100644
--- a/site/src/site/pages/changelogs.groovy
+++ b/site/src/site/pages/changelogs.groovy
@@ -28,17 +28,15 @@ layout 'layouts/main.groovy', true,
 a(name: "changelog$mj") {}
 h2("Groovy $mj")
 ul {
-minor.each { raw ->
-def v = raw
+minor.each { v ->
+def ver = v
 def unreleased = ''
-if (v.endsWith('-placeholder')) {
-v -= '-placeholder'
-unreleased = ' (unreleased)'
+if (v.endsWith('-unreleased')) {
+ver = (v - '-unreleased') + ' 
(unreleased)'
 }
 li {
-yieldUnescaped ( !v.contains('-') 
&& versions.any{ it.startsWith("$v-") } ? "Aggregate c" : "C" ) + "hangelog for 
"
-a(href: 
"changelogs/changelog-${v}.html", "Groovy $v")
-yieldUnescaped unreleased
+yieldUnescaped ( 
v.endsWith('-unreleased') || (!v.contains('-') && versions.any{ 
it.startsWith("$v-") }) ? "Aggregate c" : "C" ) + "hangelog for "
+a(href: 
"changelogs/changelog-${v}.html", "Groovy $ver")
 }
 }
 }



[groovy-website] 03/03: bump asciidoctorj and groovy versions

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit ac08eeb90199270b277f3977e7044c3cb9806b40
Author: Paul King 
AuthorDate: Mon May 20 18:45:22 2019 +1000

bump asciidoctorj and groovy versions
---
 generator/build.gradle | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/generator/build.gradle b/generator/build.gradle
index dc55f00..b68660b 100644
--- a/generator/build.gradle
+++ b/generator/build.gradle
@@ -24,8 +24,8 @@ repositories {
 }
 
 dependencies {
-ext.groovyVersion = '2.4.15'
-ext.asciidocVersion = '1.5.8.1'
+ext.groovyVersion = '2.4.17'
+ext.asciidocVersion = '2.0.0'
 compile "org.codehaus.groovy:groovy:$groovyVersion"
 compile "org.codehaus.groovy:groovy-json:$groovyVersion"
 compile "org.codehaus.groovy:groovy-templates:$groovyVersion"
@@ -38,5 +38,5 @@ dependencies {
 //compile "org.jruby:jruby-complete:9.1.17.0"
 }
 
-compileGroovy.sourceCompatibility = '1.7'
-compileGroovy.targetCompatibility = '1.7'
+compileGroovy.sourceCompatibility = '1.8'
+compileGroovy.targetCompatibility = '1.8'



[groovy-website] 02/03: Reflect the aggregation status of .0 releases more accurately

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit ca2bf4d37931bdff7a03ac35b1294e29f5d931f2
Author: Paul King 
AuthorDate: Mon May 20 18:44:47 2019 +1000

Reflect the aggregation status of .0 releases more accurately
---
 generator/src/main/groovy/generator/ChangelogParser.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generator/src/main/groovy/generator/ChangelogParser.groovy 
b/generator/src/main/groovy/generator/ChangelogParser.groovy
index 72ddd42..70563e7 100644
--- a/generator/src/main/groovy/generator/ChangelogParser.groovy
+++ b/generator/src/main/groovy/generator/ChangelogParser.groovy
@@ -73,13 +73,13 @@ class ChangelogParser {
 def allMajor = changelogs.groupBy {
 def v = it.groovyVersion
 v.contains('-')?v-v.substring(v.indexOf('-')):v
-}.findAll { ver, logs -> ver in releasedVersions || ver in ['2.6.0', 
'3.0.0'] }
+}.findAll { ver, logs -> ver in releasedVersions || ver in ['2.6.0', 
'3.0.0'] } // 2.6, 3.0 added to get aggregate changelog
 allMajor.collect { k,v ->
 def changelog = changelogs.find { it.groovyVersion == k }
 if (!changelog) {
 println "Not found: $k"
-// it's useful to have an aggregate when we haven't done a 
'.0' release yet, use '-placeholder' to track
-changelog = new Changelog(groovyVersion: k + '-placeholder', 
issues:[])
+// it's useful to have an aggregate when we haven't done a 
'.0' release yet, use '-unreleased' to track
+changelog = new Changelog(groovyVersion: k + '-unreleased', 
issues:[])
 changelogs << changelog
 }
 v.each {



[groovy-website] branch asf-site updated: Reflect the aggregation status of .0 releases more accurately

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new a76a617  Reflect the aggregation status of .0 releases more accurately
a76a617 is described below

commit a76a617a445e9d15e5e42c0b810f687e7d64fd37
Author: Paul King 
AuthorDate: Mon May 20 17:45:34 2019 +1000

Reflect the aggregation status of .0 releases more accurately
---
 generator/src/main/groovy/generator/ChangelogParser.groovy | 5 +++--
 site/src/site/pages/changelogs.groovy  | 9 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/generator/src/main/groovy/generator/ChangelogParser.groovy 
b/generator/src/main/groovy/generator/ChangelogParser.groovy
index 2935f39..72ddd42 100644
--- a/generator/src/main/groovy/generator/ChangelogParser.groovy
+++ b/generator/src/main/groovy/generator/ChangelogParser.groovy
@@ -73,12 +73,13 @@ class ChangelogParser {
 def allMajor = changelogs.groupBy {
 def v = it.groovyVersion
 v.contains('-')?v-v.substring(v.indexOf('-')):v
-}.findAll { ver, logs -> ver in releasedVersions }
+}.findAll { ver, logs -> ver in releasedVersions || ver in ['2.6.0', 
'3.0.0'] }
 allMajor.collect { k,v ->
 def changelog = changelogs.find { it.groovyVersion == k }
 if (!changelog) {
 println "Not found: $k"
-changelog = new Changelog(groovyVersion: k, issues:[])
+// it's useful to have an aggregate when we haven't done a 
'.0' release yet, use '-placeholder' to track
+changelog = new Changelog(groovyVersion: k + '-placeholder', 
issues:[])
 changelogs << changelog
 }
 v.each {
diff --git a/site/src/site/pages/changelogs.groovy 
b/site/src/site/pages/changelogs.groovy
index c64c014..450e0f3 100644
--- a/site/src/site/pages/changelogs.groovy
+++ b/site/src/site/pages/changelogs.groovy
@@ -28,10 +28,17 @@ layout 'layouts/main.groovy', true,
 a(name: "changelog$mj") {}
 h2("Groovy $mj")
 ul {
-minor.each { v->
+minor.each { raw ->
+def v = raw
+def unreleased = ''
+if (v.endsWith('-placeholder')) {
+v -= '-placeholder'
+unreleased = ' (unreleased)'
+}
 li {
 yieldUnescaped ( !v.contains('-') 
&& versions.any{ it.startsWith("$v-") } ? "Aggregate c" : "C" ) + "hangelog for 
"
 a(href: 
"changelogs/changelog-${v}.html", "Groovy $v")
+yieldUnescaped unreleased
 }
 }
 }



[groovy-website] branch asf-site updated: Reflect the aggregation status of .0 releases more accurately

2019-05-20 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 8e11858  Reflect the aggregation status of .0 releases more accurately
8e11858 is described below

commit 8e11858207093630fddf87591ea6ea986cec8e2a
Author: Paul King 
AuthorDate: Mon May 20 16:36:00 2019 +1000

Reflect the aggregation status of .0 releases more accurately
---
 site/src/site/pages/changelogs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/site/pages/changelogs.groovy 
b/site/src/site/pages/changelogs.groovy
index 3d8cd8e..c64c014 100644
--- a/site/src/site/pages/changelogs.groovy
+++ b/site/src/site/pages/changelogs.groovy
@@ -30,7 +30,7 @@ layout 'layouts/main.groovy', true,
 ul {
 minor.each { v->
 li {
-yieldUnescaped "Changelog for "
+yieldUnescaped ( !v.contains('-') 
&& versions.any{ it.startsWith("$v-") } ? "Aggregate c" : "C" ) + "hangelog for 
"
 a(href: 
"changelogs/changelog-${v}.html", "Groovy $v")
 }
 }



[groovy] branch master updated: no longer needed since all java files are in src/main/java now

2019-05-19 Thread paulk
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 1153475  no longer needed since all java files are in src/main/java now
1153475 is described below

commit 1153475589cc73e8d687b8fe0889b37d7edaa131
Author: Paul King 
AuthorDate: Mon May 20 06:55:41 2019 +1000

no longer needed since all java files are in src/main/java now
---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 70835eb..9cd26df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,8 +229,6 @@ ext.generatedDirectory = "${buildDir}/generated/sources"
 sourceSets {
 main {
 java {
-// the only reason we add src/main/groovy here is for the 
bootstrap compiler
-srcDir 'src/main/groovy'
 srcDir "$generatedDirectory/antlr2/src/main"
 if (!JavaVersion.current().isJava8Compatible()) {
 exclude '**/v8/*'



[groovy-website] branch asf-site updated: typo

2019-05-19 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 4109e50  typo
4109e50 is described below

commit 4109e50368c0ea30b9535b53b05d99a14dd4cbf1
Author: Paul King 
AuthorDate: Sun May 19 23:33:39 2019 +1000

typo
---
 site/src/site/releasenotes/groovy-3.0.adoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/site/src/site/releasenotes/groovy-3.0.adoc 
b/site/src/site/releasenotes/groovy-3.0.adoc
index 04144db..a000140 100644
--- a/site/src/site/releasenotes/groovy-3.0.adoc
+++ b/site/src/site/releasenotes/groovy-3.0.adoc
@@ -555,7 +555,7 @@ You should not mix and match old and new classes.
 | org.codehaus.groovy.binding
 | org.apache.groovy.swing.binding
 .3+| You can continue to use the old classes if you use them in your existing 
code or from within legacy classes still
-using the old classes. `SwingBuilder` now uses the bew classes.
+using the old classes. `SwingBuilder` now uses the new classes.
 | groovy.model
 | groovy.swing.model
 | groovy.inspect.swingui
@@ -669,8 +669,7 @@ As part of implementing the new grammar, additional support 
has been added.
 
 == JDK requirements
 
-Groovy 3.0 requires JDK9+ to build and JDK8 is the minimum version of the JRE 
that we support. As additional Java 9/10 support is added, the version
-required to build may be bumped to JDK9.
+Groovy 3.0 requires JDK9+ to build and JDK8 is the minimum version of the JRE 
that we support.
 
 [[Groovy3.0releasenotes-Moreinformation]]
 == More information



[groovy] branch master updated (a0971cc -> 86f5c82)

2019-05-19 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from a0971cc  GROOVY-8647: Split package renaming (a few remaining 
deprecations)
 new 3c1d895  GROOVY-8647: Split package renaming (fix a broken link)
 new 86f5c82  move some java files from src/main/groovy to src/main/java 
and fix up some Javadoc assertion tests that weren't running

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gradle/test.gradle |  2 +-
 src/main/{groovy => java}/groovy/beans/Bindable.java   |  0
 .../groovy/beans/BindableASTTransformation.java|  0
 .../{groovy => java}/groovy/beans/DefaultPropertyAccessor.java |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyReader.java   |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyWriter.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyAccessor.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyReader.java |  0
 src/main/{groovy => java}/groovy/beans/PropertyWriter.java |  0
 src/main/{groovy => java}/groovy/beans/Vetoable.java   |  0
 .../groovy/beans/VetoableASTTransformation.java|  0
 src/main/{groovy => java}/groovy/cli/Option.java   |  0
 src/main/{groovy => java}/groovy/cli/TypedOption.java  |  0
 src/main/{groovy => java}/groovy/cli/Unparsed.java |  0
 .../groovy/grape/GrabAnnotationTransformation.java |  0
 src/main/{groovy => java}/groovy/grape/Grape.java  |  0
 src/main/{groovy => java}/groovy/grape/GrapeEngine.java|  0
 src/main/{groovy => java}/groovy/inspect/Inspector.java|  0
 src/main/{groovy => java}/groovy/inspect/package.html  |  0
 .../groovy/io/EncodingAwareBufferedWriter.java |  0
 src/main/{groovy => java}/groovy/io/FileType.java  |  0
 src/main/{groovy => java}/groovy/io/FileVisitResult.java   |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintStream.java |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java |  0
 src/main/{groovy => java}/groovy/io/LineColumnReader.java  |  0
 src/main/{groovy => java}/groovy/io/PlatformLineWriter.java|  0
 src/main/{groovy => java}/groovy/io/package.html   |  0
 src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java   |  0
 .../{groovy => java}/groovy/lang/BenchmarkInterceptor.java |  0
 src/main/{groovy => java}/groovy/lang/Binding.java |  0
 src/main/{groovy => java}/groovy/lang/Buildable.java   |  0
 src/main/{groovy => java}/groovy/lang/Category.java|  0
 src/main/{groovy => java}/groovy/lang/Closure.java |  2 +-
 src/main/{groovy => java}/groovy/lang/ClosureException.java|  0
 .../{groovy => java}/groovy/lang/ClosureInvokingMethod.java|  0
 src/main/{groovy => java}/groovy/lang/Delegate.java|  0
 src/main/{groovy => java}/groovy/lang/DelegatesTo.java |  0
 src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java |  0
 .../{groovy => java}/groovy/lang/DeprecationException.java |  0
 src/main/{groovy => java}/groovy/lang/EmptyRange.java  |  0
 src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java|  0
 .../groovy/lang/ExpandoMetaClassCreationHandle.java|  0
 src/main/{groovy => java}/groovy/lang/GString.java |  0
 .../{groovy => java}/groovy/lang/GeneratedGroovyProxy.java |  0
 src/main/{groovy => java}/groovy/lang/Grab.java|  0
 src/main/{groovy => java}/groovy/lang/GrabConfig.java  |  0
 src/main/{groovy => java}/groovy/lang/GrabExclude.java |  0
 src/main/{groovy => java}/groovy/lang/GrabResolver.java|  0
 src/main/{groovy => java}/groovy/lang/Grapes.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyCallable.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java |  0
 src/main/{groovy => java}/groovy/lang/GroovyObject.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java |  0
 .../{groovy => java}/groovy/lang/GroovyResourceLoader.java |  0
 .../{groovy => java}/groovy/lang/GroovyRuntimeException.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyShell.java |  0
 src/main/{groovy => java}/groovy/lang/GroovySystem.java|  0
 src/main/{groo

[groovy] 02/02: move some java files from src/main/groovy to src/main/java and fix up some Javadoc assertion tests that weren't running

2019-05-19 Thread paulk
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

commit 86f5c8216b5d0f042408bdc4ae5d6a7baa247c95
Author: Paul King 
AuthorDate: Sun May 19 19:04:42 2019 +1000

move some java files from src/main/groovy to src/main/java and fix up some 
Javadoc assertion tests that weren't running
---
 gradle/test.gradle |  2 +-
 src/main/{groovy => java}/groovy/beans/Bindable.java   |  0
 .../groovy/beans/BindableASTTransformation.java|  0
 .../{groovy => java}/groovy/beans/DefaultPropertyAccessor.java |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyReader.java   |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyWriter.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyAccessor.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyReader.java |  0
 src/main/{groovy => java}/groovy/beans/PropertyWriter.java |  0
 src/main/{groovy => java}/groovy/beans/Vetoable.java   |  0
 .../groovy/beans/VetoableASTTransformation.java|  0
 src/main/{groovy => java}/groovy/cli/Option.java   |  0
 src/main/{groovy => java}/groovy/cli/TypedOption.java  |  0
 src/main/{groovy => java}/groovy/cli/Unparsed.java |  0
 .../groovy/grape/GrabAnnotationTransformation.java |  0
 src/main/{groovy => java}/groovy/grape/Grape.java  |  0
 src/main/{groovy => java}/groovy/grape/GrapeEngine.java|  0
 src/main/{groovy => java}/groovy/inspect/Inspector.java|  0
 src/main/{groovy => java}/groovy/inspect/package.html  |  0
 .../groovy/io/EncodingAwareBufferedWriter.java |  0
 src/main/{groovy => java}/groovy/io/FileType.java  |  0
 src/main/{groovy => java}/groovy/io/FileVisitResult.java   |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintStream.java |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java |  0
 src/main/{groovy => java}/groovy/io/LineColumnReader.java  |  0
 src/main/{groovy => java}/groovy/io/PlatformLineWriter.java|  0
 src/main/{groovy => java}/groovy/io/package.html   |  0
 src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java   |  0
 .../{groovy => java}/groovy/lang/BenchmarkInterceptor.java |  0
 src/main/{groovy => java}/groovy/lang/Binding.java |  0
 src/main/{groovy => java}/groovy/lang/Buildable.java   |  0
 src/main/{groovy => java}/groovy/lang/Category.java|  0
 src/main/{groovy => java}/groovy/lang/Closure.java |  2 +-
 src/main/{groovy => java}/groovy/lang/ClosureException.java|  0
 .../{groovy => java}/groovy/lang/ClosureInvokingMethod.java|  0
 src/main/{groovy => java}/groovy/lang/Delegate.java|  0
 src/main/{groovy => java}/groovy/lang/DelegatesTo.java |  0
 src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java |  0
 .../{groovy => java}/groovy/lang/DeprecationException.java |  0
 src/main/{groovy => java}/groovy/lang/EmptyRange.java  |  0
 src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java|  0
 .../groovy/lang/ExpandoMetaClassCreationHandle.java|  0
 src/main/{groovy => java}/groovy/lang/GString.java |  0
 .../{groovy => java}/groovy/lang/GeneratedGroovyProxy.java |  0
 src/main/{groovy => java}/groovy/lang/Grab.java|  0
 src/main/{groovy => java}/groovy/lang/GrabConfig.java  |  0
 src/main/{groovy => java}/groovy/lang/GrabExclude.java |  0
 src/main/{groovy => java}/groovy/lang/GrabResolver.java|  0
 src/main/{groovy => java}/groovy/lang/Grapes.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyCallable.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java |  0
 src/main/{groovy => java}/groovy/lang/GroovyObject.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java |  0
 .../{groovy => java}/groovy/lang/GroovyResourceLoader.java |  0
 .../{groovy => java}/groovy/lang/GroovyRuntimeException.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyShell.java |  0
 src/main/{groovy => java}/groovy/lang/GroovySystem.java|  0
 src/main/{groovy => java}/groovy/lang/Groovydoc.java   |  0
 .../groovy/lang/IllegalPropertyAccessException.java|  0
 .../groovy/lang/IncorrectClosureArgumentsException.java|  0
 src/main/{groovy => java}/groovy/lang/IntRange.java|  0
 src/main/{groovy => java}/groovy/lang/Interceptor.java 

[groovy] 01/02: GROOVY-8647: Split package renaming (fix a broken link)

2019-05-19 Thread paulk
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

commit 3c1d89556a82e2c0dce05c1f4536f6c167d6b7ca
Author: Paul King 
AuthorDate: Sun May 19 15:08:04 2019 +1000

GROOVY-8647: Split package renaming (fix a broken link)
---
 .../groovy-test/src/main/java/groovy/transform/NotYetImplemented.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java 
b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
index 986ef99..0f9ddf3 100644
--- 
a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
+++ 
b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
  * The idea for this AST transformation originated in {@link 
groovy.test.GroovyTestCase#notYetImplemented()}.
  *
  * @since 2.0.0
- * @deprecated use {@link groovy.test.transform.NotYetImplemented}
+ * @deprecated use {@link groovy.test.NotYetImplemented}
  */
 @Deprecated
 @java.lang.annotation.Documented



[groovy] branch GROOVY_2_4_X updated: minor refactor: remove legacy CI check

2019-05-18 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/GROOVY_2_4_X by this push:
 new a81ba2a  minor refactor: remove legacy CI check
a81ba2a is described below

commit a81ba2a2592b8cbd23c2bc781ac87633d26afaaa
Author: Paul King 
AuthorDate: Sun May 19 13:35:23 2019 +1000

minor refactor: remove legacy CI check
---
 .../groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy  | 9 -
 1 file changed, 9 deletions(-)

diff --git 
a/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
 
b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
index 6785a8b..fb86613 100644
--- 
a/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
+++ 
b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
@@ -36,18 +36,9 @@ class PropertyUsageFromJavaTest extends StubTestCase {
 
 @Before
 void setUp() {
-//assumeNotOnTravisCIAndNotJava6()
 super.setUp()
 }
 
-private assumeNotOnTravisCIAndNotJava6() {
-boolean travisCI = new File('.').absolutePath =~ /travis/
-boolean java6 = System.getProperty('java.version').startsWith('1.6')
-
-assumeFalse('''Test always fails with 
"java.lang.IllegalArgumentException: URI is not hierarchical"
-on open jdk used by travis.''', travisCI && java6)
-}
-
 @Test
 void test() {
 super.testRun()



[groovy] branch GROOVY_2_4_X updated: test if build fails on CI server with zulu vs vanilla openjdk

2019-05-18 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/GROOVY_2_4_X by this push:
 new 540d048  test if build fails on CI server with zulu vs vanilla openjdk
540d048 is described below

commit 540d048d20dfcd160d0b60e688c8ffa80a9636a5
Author: Paul King 
AuthorDate: Sun May 19 12:41:47 2019 +1000

test if build fails on CI server with zulu vs vanilla openjdk
---
 .../groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
 
b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
index e199972..6785a8b 100644
--- 
a/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
+++ 
b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy
@@ -36,7 +36,7 @@ class PropertyUsageFromJavaTest extends StubTestCase {
 
 @Before
 void setUp() {
-assumeNotOnTravisCIAndNotJava6()
+//assumeNotOnTravisCIAndNotJava6()
 super.setUp()
 }
 



[groovy] branch master updated: GROOVY-8647: Split package renaming (a few remaining deprecations)

2019-05-17 Thread paulk
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 a0971cc  GROOVY-8647: Split package renaming (a few remaining 
deprecations)
a0971cc is described below

commit a0971cc76fa8c6927ed00174e293c44ecf96e0ce
Author: Paul King 
AuthorDate: Sat May 18 15:29:42 2019 +1000

GROOVY-8647: Split package renaming (a few remaining deprecations)
---
 .../groovy/org/codehaus/groovy/tools/shell/Parser.groovy | 16 
 .../groovy/tools/shell/util/PackageHelperImpl.groovy |  1 +
 .../tools/shell/util/ScriptVariableAnalyzer.groovy   |  3 +++
 .../src/main/java/groovy/util/GroovyMBean.java   |  3 +++
 .../src/main/java/groovy/util/XmlNodePrinter.java|  1 +
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
index 33efe3c..189d15a 100644
--- 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
+++ 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
@@ -79,8 +79,8 @@ class Parser
 /**
  * A relaxed parser, which tends to allow more, but won't really catch valid 
syntax errors.
  */
-final class RelaxedParser implements Parsing
-{
+@Deprecated
+final class RelaxedParser implements Parsing {
 private final Logger log = Logger.create(this.class)
 
 private SourceBuffer sourceBuffer
@@ -136,8 +136,8 @@ final class RelaxedParser implements Parsing
 /**
  * A more rigid parser which catches more syntax errors, but also tends to 
barf on stuff that is really valid from time to time.
  */
-final class RigidParser implements Parsing
-{
+@Deprecated
+final class RigidParser implements Parsing {
 private static final Pattern ANNOTATION_PATTERN = 
Pattern.compile('^@[a-zA-Z_][a-zA-Z_0-9]*(.*)$')
 static final String SCRIPT_FILENAME = 'groovysh_parse'
 
@@ -240,8 +240,8 @@ final class RigidParser implements Parsing
 /**
  * Container for the parse code.
  */
-final class ParseCode
-{
+@Deprecated
+final class ParseCode {
 static final ParseCode COMPLETE = new ParseCode(0)
 
 static final ParseCode INCOMPLETE = new ParseCode(1)
@@ -263,8 +263,8 @@ final class ParseCode
 /**
  * Container for parse status details.
  */
-final class ParseStatus
-{
+@Deprecated
+final class ParseStatus {
 final ParseCode code
 
 final Throwable cause
diff --git 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
index 394f848..5a6556d 100644
--- 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
+++ 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
@@ -472,6 +472,7 @@ Files.walkFileTree(fs.getPath('modules'),
 }
 
 @CompileStatic
+@Deprecated
 class CachedPackage {
 String name
 boolean containsClasses
diff --git 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
index a6e6fe7..28a0ba1 100644
--- 
a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
+++ 
b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
@@ -44,6 +44,7 @@ class ScriptVariableAnalyzer {
 /**
  * define a visitor that visits all variable expressions
  */
+@Deprecated
 static class VariableVisitor extends ClassCodeVisitorSupport implements 
GroovyClassVisitor {
 Set bound = new HashSet()
 Set unbound = new HashSet()
@@ -73,6 +74,7 @@ class ScriptVariableAnalyzer {
  * custom PrimaryClassNodeOperation
  * to be able to hook our code visitor
  */
+@Deprecated
 static class VisitorSourceOperation extends 
CompilationUnit.PrimaryClassNodeOperation {
 
 final GroovyClassVisitor visitor
@@ -91,6 +93,7 @@ class ScriptVariableAnalyzer {
 /**
  * class loader to add our phase operation
  */
+@Deprecated
 static class VisitorClassLoader extends GroovyClassLoader {
 final GroovyClassVisitor visitor
 
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 8f48699..0cb4bdc 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy

[groovy] 01/06: GROOVY-8647: Split package renaming (avoid groovy.xml package in groovy module tests to avoid confusion even though not a strict requirement)

2019-05-17 Thread paulk
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

commit 0e4596914c9e6e446c258afa9c112c576ed73fd0
Author: Paul King 
AuthorDate: Sat May 18 09:07:30 2019 +1000

GROOVY-8647: Split package renaming (avoid groovy.xml package in groovy 
module tests to avoid confusion even though not a strict requirement)
---
 src/test/groovy/{xml => util}/XmlAssert.java  | 2 +-
 .../org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java  | 2 +-
 .../codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java   | 2 +-
 src/test/org/codehaus/groovy/classgen/TestSupport.java| 8 ++--
 .../groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy  | 2 +-
 .../groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java | 2 +-
 .../src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy| 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/test/groovy/xml/XmlAssert.java 
b/src/test/groovy/util/XmlAssert.java
similarity index 98%
rename from src/test/groovy/xml/XmlAssert.java
rename to src/test/groovy/util/XmlAssert.java
index f71e658..52b5cd5 100644
--- a/src/test/groovy/xml/XmlAssert.java
+++ b/src/test/groovy/util/XmlAssert.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.xml;
+package groovy.util;
 
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
diff --git 
a/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java 
b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
index a62f59c..fd9dfef 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.codehaus.groovy.antlr.parser.GroovyTokenTypes;
 
-import static groovy.xml.XmlAssert.assertXmlEquals;
+import static groovy.util.XmlAssert.assertXmlEquals;
 
 /**
  * Testcases for the antlr AST visitor that prints groovy source code nodes as 
Freemind compatible XML.
diff --git 
a/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java 
b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
index 43ba85d..92f8a77 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
@@ -20,7 +20,7 @@ package org.codehaus.groovy.antlr.treewalker;
 
 import junit.framework.TestCase;
 
-import static groovy.xml.XmlAssert.assertXmlEquals;
+import static groovy.util.XmlAssert.assertXmlEquals;
 
 /**
  * Testcases for the antlr AST visitor that prints groovy source code nodes as 
HTML.
diff --git a/src/test/org/codehaus/groovy/classgen/TestSupport.java 
b/src/test/org/codehaus/groovy/classgen/TestSupport.java
index a984174..a6f19c8 100644
--- a/src/test/org/codehaus/groovy/classgen/TestSupport.java
+++ b/src/test/org/codehaus/groovy/classgen/TestSupport.java
@@ -18,8 +18,12 @@
  */
 package org.codehaus.groovy.classgen;
 
-import groovy.lang.*;
-import groovy.util.GroovyTestCase;
+import groovy.lang.Binding;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyObject;
+import groovy.lang.Script;
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.CompileUnit;
 import org.codehaus.groovy.ast.FieldNode;
diff --git 
a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy 
b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
index 31ee8e6..02f0df1 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
@@ -24,7 +24,7 @@ import org.xml.sax.InputSource
 
 import javax.xml.transform.stream.StreamSource
 
-import static groovy.xml.XmlAssert.assertXmlEquals
+import static groovy.util.XmlAssert.assertXmlEquals
 import static groovy.xml.XmlUtil.escapeControlCharacters
 import static groovy.xml.XmlUtil.escapeXml
 import static groovy.xml.XmlUtil.newSAXParser
diff --git a/src/test/groovy/bugs/SeansBug.java 
b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
similarity index 98%
rename from src/test/groovy/bugs/SeansBug.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
index 2bb7014..9eb3048 100644
--- a/src/test/groovy/bugs/SeansBug.java
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.bugs;
+package groovy.xml.bugs;
 
 import groovy.lang.GroovyShell;
 import org.codehaus.groovy.classgen.TestSupport;
diff --git 
a/subprojects/gro

[groovy] 02/06: Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename file to target-name

2019-05-17 Thread paulk
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

commit dd353089c427523a91e6ef64da9352d8ad29ea2d
Author: Paul King 
AuthorDate: Sat May 18 09:11:30 2019 +1000

Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - rename file to target-name
---
 .../groovy-jmx/src/main/java/groovy/{util => jmx}/GroovyMBean.java| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
similarity index 100%
rename from subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java



[groovy] branch master updated (f37feca -> 6be8375)

2019-05-17 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from f37feca  GROOVY-8647: Split package renaming (groovy.xml.QName -> 
groovy.namespace.QName)
 new 0e45969  GROOVY-8647: Split package renaming (avoid groovy.xml package 
in groovy module tests to avoid confusion even though not a strict requirement)
 new 60ace39  Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - rename source-file to temp
 new dd35308  Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - rename file to target-name
 new 3ec3765  Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - resolve conflict and keep both files
 new f5fa3bd  Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - restore name of source-file
 new 6be8375  GROOVY-8647: Split package renaming (groovy-jmx)

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/test/groovy/{xml => util}/XmlAssert.java  | 2 +-
 .../org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java  | 2 +-
 .../codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java   | 2 +-
 src/test/org/codehaus/groovy/classgen/TestSupport.java| 8 ++--
 .../src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy | 2 ++
 .../src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy   | 2 ++
 .../src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy | 2 ++
 .../src/main/java/groovy/{util => jmx}/GroovyMBean.java   | 2 +-
 .../groovy-jmx/src/test/groovy/groovy/{util => jmx}/Dummy.java| 4 ++--
 .../groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy | 1 +
 .../src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy | 1 +
 .../groovy-jmx/src/test/java/groovy/{util => jmx}/DummyMBean.java | 2 +-
 .../groovy-jmx/src/test/java/groovy/{util => jmx}/MBeanTest.java  | 4 ++--
 .../groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy  | 2 +-
 .../groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java | 2 +-
 .../src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy| 2 +-
 16 files changed, 26 insertions(+), 14 deletions(-)
 rename src/test/groovy/{xml => util}/XmlAssert.java (98%)
 copy subprojects/groovy-jmx/src/main/java/groovy/{util => 
jmx}/GroovyMBean.java (99%)
 rename subprojects/groovy-jmx/src/test/groovy/groovy/{util => jmx}/Dummy.java 
(95%)
 rename subprojects/groovy-jmx/src/test/java/groovy/{util => 
jmx}/DummyMBean.java (97%)
 rename subprojects/groovy-jmx/src/test/java/groovy/{util => 
jmx}/MBeanTest.java (94%)
 rename {src/test/groovy => 
subprojects/groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java (98%)



[groovy] 06/06: GROOVY-8647: Split package renaming (groovy-jmx)

2019-05-17 Thread paulk
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

commit 6be83758a4d0498f22718232e1e571dd89db00fe
Author: Paul King 
AuthorDate: Sat May 18 10:46:01 2019 +1000

GROOVY-8647: Split package renaming (groovy-jmx)
---
 .../src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy | 2 ++
 .../src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy   | 2 ++
 .../src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy | 2 ++
 subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java  | 2 +-
 .../groovy-jmx/src/test/groovy/groovy/{util => jmx}/Dummy.java| 4 ++--
 .../test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy| 1 +
 .../src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy | 1 +
 .../groovy-jmx/src/test/java/groovy/{util => jmx}/DummyMBean.java | 2 +-
 .../groovy-jmx/src/test/java/groovy/{util => jmx}/MBeanTest.java  | 4 ++--
 9 files changed, 14 insertions(+), 6 deletions(-)

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 b4b4df1..71f75f7 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
@@ -18,6 +18,8 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
+
 import javax.management.DynamicMBean
 import javax.management.MBeanServerConnection
 import javax.management.MBeanServerFactory
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 1689b45..123b401 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
@@ -18,6 +18,8 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
+
 import javax.management.MBeanServer
 import javax.management.NotificationFilterSupport
 import javax.management.ObjectName
diff --git 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
index f8a738b..160b7df 100644
--- 
a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
+++ 
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
+
 import javax.management.MBeanServer
 import javax.management.NotificationFilter
 import javax.management.NotificationFilterSupport
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java 
b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
index 8f48699..27fd6ac 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.util;
+package groovy.jmx;
 
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.GroovyRuntimeException;
diff --git a/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java 
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/Dummy.java
similarity index 95%
rename from subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/Dummy.java
index 5827f99..8b4b146 100644
--- a/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
+++ b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/Dummy.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.util;
+package groovy.jmx;
 
-public class Dummy implements DummyMBean {
+public class Dummy implements groovy.jmx.DummyMBean {
 
 private String name = "James";
 private String location = "London";
diff --git 
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
 
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
index a962093..dc21e31 100644
--- 
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
+++ 
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
 import groovy.test.GroovyTestCase
 
 import javax.management.MBeanServerConnection
diff --git 
a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
 
b/subprojects/groo

[groovy] 04/06: Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - resolve conflict and keep both files

2019-05-17 Thread paulk
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

commit 3ec376560eecef3f9f51a627925e9889840b8728
Merge: 60ace39 dd35308
Author: Paul King 
AuthorDate: Sat May 18 09:11:31 2019 +1000

Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - resolve conflict and keep both files

 .../src/main/java/groovy/jmx/GroovyMBean.java  | 391 +
 1 file changed, 391 insertions(+)



[groovy] 03/06: Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename source-file to temp

2019-05-17 Thread paulk
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

commit 60ace39ced71d65f819b100c2683a9f493414aa6
Author: Paul King 
AuthorDate: Sat May 18 09:11:31 2019 +1000

Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - rename source-file to temp
---
 .../groovy-jmx/src/{main/java/groovy/util/GroovyMBean.java => temp}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java 
b/subprojects/groovy-jmx/src/temp
similarity index 100%
rename from subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
rename to subprojects/groovy-jmx/src/temp



[groovy] 05/06: Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - restore name of source-file

2019-05-17 Thread paulk
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

commit f5fa3bdb5295dadf85115421d6fa7d9146b84350
Author: Paul King 
AuthorDate: Sat May 18 09:11:31 2019 +1000

Split history main/java/groovy/util/GroovyMBean.java to 
main/java/groovy/jmx - restore name of source-file
---
 .../groovy-jmx/src/{temp => main/java/groovy/util/GroovyMBean.java}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-jmx/src/temp 
b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
similarity index 100%
rename from subprojects/groovy-jmx/src/temp
rename to subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java



[groovy-website] branch asf-site updated: GROOVY-8647: Split package renaming (release note changes cont'd - add groovy-jmx)

2019-05-17 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 167d375  GROOVY-8647: Split package renaming (release note changes 
cont'd - add groovy-jmx)
167d375 is described below

commit 167d3752939751998c8143b155b5e0eab34a91d3
Author: Paul King 
AuthorDate: Sat May 18 09:48:18 2019 +1000

GROOVY-8647: Split package renaming (release note changes cont'd - add 
groovy-jmx)
---
 site/src/site/releasenotes/groovy-3.0.adoc | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/site/src/site/releasenotes/groovy-3.0.adoc 
b/site/src/site/releasenotes/groovy-3.0.adoc
index 4074a9d..04144db 100644
--- a/site/src/site/releasenotes/groovy-3.0.adoc
+++ b/site/src/site/releasenotes/groovy-3.0.adoc
@@ -534,6 +534,12 @@ using `AntBuilder` or you will still be using the 
deprecated version.
 | `groovysh` is normally used as a command-line tool and its use in that form 
is unaffected.
 If you use any of the classes directly you can use the old versions until you 
migrate.
 You should not mix and match old and new classes.
+3+^| *Module: groovy-jmx*
+| groovy.util.GroovyMBean
+| groovy.jmx
+| You need to add the import for `GroovyMBean` before Groovy 4.
+Feel free to use the old class in your own code but `JmxBuilder` only uses the 
new class.
+You should not mix the old and new classes.
 3+^| *Module: groovy-nio*
 | org.codehaus.groovy.runtime. +
 NioGroovyMethods | org.apache.groovy.nio.extensions. +



[groovy-website] branch asf-site updated: GROOVY-8647: Split package renaming (release note changes cont'd)

2019-05-17 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new d8ed4f7  GROOVY-8647: Split package renaming (release note changes 
cont'd)
d8ed4f7 is described below

commit d8ed4f7ac52226703b42ed822918f277059986b3
Author: Paul King 
AuthorDate: Fri May 17 22:50:11 2019 +1000

GROOVY-8647: Split package renaming (release note changes cont'd)
---
 site/src/site/releasenotes/groovy-3.0.adoc | 30 +++---
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/site/src/site/releasenotes/groovy-3.0.adoc 
b/site/src/site/releasenotes/groovy-3.0.adoc
index 9bc4fa2..4074a9d 100644
--- a/site/src/site/releasenotes/groovy-3.0.adoc
+++ b/site/src/site/releasenotes/groovy-3.0.adoc
@@ -467,7 +467,7 @@ a| NOTE: _Experimental Status:_ While this feature will 
remain, we regard its cu
 |===
 
 [[Groovy3.0releasenotes-Splitpackages]]
-== Split package changes
+== Split package changes (from beta-2)
 
 The Java Platform Module System requires that classes in distinct modules
 have distinct package names. Groovy has it's own "modules" but these haven't
@@ -503,12 +503,19 @@ Read the _Notes_ column in the table below for further 
details.
 |New copied class/package name +
 (3.0 and above)
 |Notes
-3+^| Module: groovy-ant
+3+^| *Module: groovy*
+| groovy.xml.QName
+| groovy.namespace
+| You need to migrate to using the new class at the same time as you migrate 
to affected modules
+using that class as a parameter in methods including `groovy-ant` and 
`groovy-xml` but only if you
+are using methods with `QName` parameters. You can continue to use the legacy 
class in your existing
+code or with the legacy versions of affected classes until Groovy 4.
+3+^| *Module: groovy-ant*
 | groovy.util
 | groovy.ant
 | Add an `import groovy.ant.AntBuilder` to classes/scripts
 using `AntBuilder` or you will still be using the deprecated version.
-3+^| Module: groovy-console
+3+^| *Module: groovy-console*
 | groovy.ui.ConsoleApplet
 | N/A
 | The `java.applet` API is deprecated. No replacement is planned for this 
Groovy class in Groovy 4.
@@ -521,13 +528,13 @@ using `AntBuilder` or you will still be using the 
deprecated version.
 | groovy.console.ui
 | groovy.ui
 | groovy.console.ui
-3+^| Module: groovy-groovysh
+3+^| *Module: groovy-groovysh*
 | org.codehaus.groovy.tools.shell
 | org.apache.groovy.groovysh
 | `groovysh` is normally used as a command-line tool and its use in that form 
is unaffected.
 If you use any of the classes directly you can use the old versions until you 
migrate.
 You should not mix and match old and new classes.
-3+^| Module: groovy-nio
+3+^| *Module: groovy-nio*
 | org.codehaus.groovy.runtime. +
 NioGroovyMethods | org.apache.groovy.nio.extensions. +
 NioExtensions | In normal use, related extension methods will simply be 
automatically available from the new location.
@@ -538,7 +545,16 @@ If you must reference the class, we recommend changing 
imports and recompiling a
 If this is difficult, you can use the old class (and directly use the related 
`NioGroovyMethods` methods)
 until you are ready to migrate.
 You should not mix and match old and new classes.
-3+^| Module: groovy-test
+3+^| *Module: groovy-swing*
+| org.codehaus.groovy.binding
+| org.apache.groovy.swing.binding
+.3+| You can continue to use the old classes if you use them in your existing 
code or from within legacy classes still
+using the old classes. `SwingBuilder` now uses the bew classes.
+| groovy.model
+| groovy.swing.model
+| groovy.inspect.swingui
+| org.apache.groovy.swing.table
+3+^| *Module: groovy-test*
 | org.codehaus.groovy.runtime. +
 ScriptTestAdapter
 | org.apache.groovy.test
@@ -555,7 +571,7 @@ NotYetImplemented
 get the deprecated version. You will need to do this before Groovy 4.
 | groovy.lang
 | groovy.test
-3+^| Module: groovy-xml
+3+^| *Module: groovy-xml*
 | groovy.util
 | groovy.xml
 | For classes like `XmlParser` and `XmlSlurper`, you need to import 
`groovy.xml.XmlParser` and `groovy.xml.XmlSlurper` respectively to not



[groovy] branch master updated: GROOVY-8647: Split package renaming (groovy.xml.QName -> groovy.namespace.QName)

2019-05-17 Thread paulk
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 f37feca  GROOVY-8647: Split package renaming (groovy.xml.QName -> 
groovy.namespace.QName)
f37feca is described below

commit f37feca3f78c278e4e40e4110e6258f31ca1a3b1
Author: Paul King 
AuthorDate: Fri May 17 22:48:54 2019 +1000

GROOVY-8647: Split package renaming (groovy.xml.QName -> 
groovy.namespace.QName)
---
 src/main/groovy/groovy/{xml => namespace}/QName.java   |  2 +-
 src/main/groovy/groovy/util/Node.java  |  2 +-
 src/main/groovy/groovy/util/NodeList.java  |  2 +-
 src/main/groovy/groovy/xml/QName.java  |  3 ++-
 .../XmlTest.java => src/test/groovy/namespace/QNameTest.java   | 10 ++
 src/test/groovy/util/NodeTest.groovy   |  2 +-
 .../groovy-ant/src/main/java/groovy/ant/AntBuilder.java|  2 +-
 .../src/main/groovy/groovy/text/XmlTemplateEngine.java |  6 +++---
 .../groovy-xml/src/main/java/groovy/xml/DOMBuilder.java|  1 +
 .../groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java |  1 +
 subprojects/groovy-xml/src/main/java/groovy/xml/Namespace.java |  2 ++
 .../src/main/java/groovy/xml/NamespaceBuilderSupport.java  |  1 +
 .../groovy-xml/src/main/java/groovy/xml/SAXBuilder.java|  1 +
 .../groovy-xml/src/main/java/groovy/xml/XmlNodePrinter.java|  1 +
 subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java |  1 +
 .../groovy-xml/src/main/java/groovy/xml/XmlSlurper.java|  1 +
 .../groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java   |  2 +-
 .../src/main/java/groovy/xml/slurpersupport/Attributes.java|  2 +-
 .../java/groovy/xml/slurpersupport/NamespaceAwareHashMap.java  |  2 +-
 subprojects/groovy-xml/src/spec/doc/xml-userguide.adoc |  6 +++---
 .../groovy-xml/src/spec/test/UserGuideXmlParserTest.groovy |  1 +
 .../src/test/groovy/groovy/xml/NamespaceNodeTest.groovy|  2 ++
 .../groovy-xml/src/test/groovy/groovy/xml/XmlParserTest.groovy |  1 +
 23 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/main/groovy/groovy/xml/QName.java 
b/src/main/groovy/groovy/namespace/QName.java
similarity index 99%
copy from src/main/groovy/groovy/xml/QName.java
copy to src/main/groovy/groovy/namespace/QName.java
index 06a733d..2d43d79 100644
--- a/src/main/groovy/groovy/xml/QName.java
+++ b/src/main/groovy/groovy/namespace/QName.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.xml;
+package groovy.namespace;
 
 import java.io.Serializable;
 
diff --git a/src/main/groovy/groovy/util/Node.java 
b/src/main/groovy/groovy/util/Node.java
index b1907ce..2adc8ea 100644
--- a/src/main/groovy/groovy/util/Node.java
+++ b/src/main/groovy/groovy/util/Node.java
@@ -23,7 +23,7 @@ import groovy.lang.DelegatingMetaClass;
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;
 import groovy.lang.Tuple2;
-import groovy.xml.QName;
+import groovy.namespace.QName;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.codehaus.groovy.runtime.StringGroovyMethods;
diff --git a/src/main/groovy/groovy/util/NodeList.java 
b/src/main/groovy/groovy/util/NodeList.java
index 8ce39f4..c4fac31 100644
--- a/src/main/groovy/groovy/util/NodeList.java
+++ b/src/main/groovy/groovy/util/NodeList.java
@@ -23,7 +23,7 @@ import groovy.lang.DelegatingMetaClass;
 import groovy.lang.GroovyRuntimeException;
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;
-import groovy.xml.QName;
+import groovy.namespace.QName;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/groovy/groovy/xml/QName.java 
b/src/main/groovy/groovy/xml/QName.java
index 06a733d..0c37f42 100644
--- a/src/main/groovy/groovy/xml/QName.java
+++ b/src/main/groovy/groovy/xml/QName.java
@@ -29,6 +29,7 @@ import java.io.Serializable;
  * The localPart provides the local part of the qualified name. The
  * namespaceURI is a URI reference identifying the namespace.
  */
+@Deprecated
 public class QName implements Serializable {
 private static final long serialVersionUID = -9029109610006696081L;
 
@@ -284,4 +285,4 @@ public class QName implements Serializable {
 result = 29 * result + localPart.hashCode();
 return result;
 }
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlTest.java 
b/src/test/groovy/namespace/QNameTest.java
similarity index 78%
rename from subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlTest.java
rename to src/test/groovy/namespace/QNameTest.java
index 645e7f5..bbc0e94 100644
--- a/subprojects/groovy-

[groovy] branch master updated: GROOVY-8647: Split package renaming (some more tests to use new package for GroovyTestCase)

2019-05-17 Thread paulk
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 e865a69  GROOVY-8647: Split package renaming (some more tests to use 
new package for GroovyTestCase)
e865a69 is described below

commit e865a6998209bd7709742b1d5978ea1f753f1a31
Author: Paul King 
AuthorDate: Fri May 17 19:22:43 2019 +1000

GROOVY-8647: Split package renaming (some more tests to use new package for 
GroovyTestCase)
---
 .../groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy |  3 ++-
 .../groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy |  2 ++
 .../src/test/groovy/groovy/ant/FileNameFinderTest.groovy |  2 ++
 .../src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java  |  2 +-
 .../src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java | 10 --
 .../src/test/java/org/codehaus/groovy/bsf/CacheBSFTest.java  | 12 ++--
 .../src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy |  1 +
 .../src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy |  1 +
 .../src/main/groovy/groovy/console/ui/ObjectBrowser.groovy   |  2 +-
 9 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy 
b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy
index c81db9a..d93c249 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTest.groovy
@@ -18,10 +18,11 @@
  */
 package groovy.ant
 
+import groovy.test.GroovyTestCase
+import groovy.xml.NamespaceBuilder
 import org.apache.tools.ant.BuildEvent
 import org.apache.tools.ant.Project
 import org.apache.tools.ant.ProjectHelper
-import groovy.xml.NamespaceBuilder
 import org.apache.tools.ant.UnknownElement
 import org.junit.Assert
 
diff --git 
a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy 
b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy
index 21d3d64..18fb16e 100644
--- a/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy
+++ b/subprojects/groovy-ant/src/test/groovy/groovy/ant/AntTestCase.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.ant
 
+import groovy.test.GroovyTestCase
+
 abstract class AntTestCase extends GroovyTestCase {
 protected void doInTmpDir(Closure cl) {
 // tag::create_zip_builder[]
diff --git 
a/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy 
b/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy
index c05c4b2..623d00e 100644
--- 
a/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy
+++ 
b/subprojects/groovy-ant/src/test/groovy/groovy/ant/FileNameFinderTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.ant
 
+import groovy.test.GroovyLogTestCase
+
 /**
  * Make sure FileNameFinder uses Ant filesets correctly.
  */
diff --git 
a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
 
b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
index a6a6834..8f9811f 100644
--- 
a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
+++ 
b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovyTest.java
@@ -19,7 +19,7 @@
 package org.codehaus.groovy.ant;
 
 import groovy.lang.GroovyRuntimeException;
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.groovy.io.StringBuilderWriter;
diff --git 
a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
 
b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
index e3d97bb..e0f25dc 100644
--- 
a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
+++ 
b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
@@ -18,12 +18,18 @@
  */
 package org.codehaus.groovy.ant;
 
-import groovy.util.GroovyTestCase;
+import groovy.test.GroovyTestCase;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.util.regex.Pattern;
 
 /**
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 4a09ebe..0e012a4 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

[groovy] branch master updated: GROOVY-8647: Split package renaming (groovy-console additional deprecations)

2019-05-17 Thread paulk
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 121d806  GROOVY-8647: Split package renaming (groovy-console 
additional deprecations)
121d806 is described below

commit 121d806e36cb3f39f531f96a5d2beebfb902a6e9
Author: Paul King 
AuthorDate: Fri May 17 16:23:01 2019 +1000

GROOVY-8647: Split package renaming (groovy-console additional deprecations)
---
 .../src/main/groovy/groovy/inspect/TextNode.groovy   | 1 +
 .../src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy  | 1 +
 .../src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy | 9 -
 .../groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy  | 2 ++
 .../groovy/groovy/inspect/swingui/ButtonOrDefaultRenderer.groovy | 1 +
 .../main/groovy/groovy/inspect/swingui/ButtonOrTextEditor.groovy | 1 +
 .../src/main/groovy/groovy/inspect/swingui/ObjectBrowser.groovy  | 1 +
 .../groovy/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy | 3 +++
 .../groovy-console/src/main/groovy/groovy/ui/Console.groovy  | 1 +
 9 files changed, 19 insertions(+), 1 deletion(-)

diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
index 1179769..d76748c 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextNode.groovy
@@ -24,6 +24,7 @@ package groovy.inspect
 import groovy.transform.CompileStatic
 
 @CompileStatic
+@Deprecated
 class TextNode {
 Object userObject
 List> properties
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
index d47db95..fa24403 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/TextTreeNodeMaker.groovy
@@ -25,6 +25,7 @@ import groovy.inspect.swingui.AstBrowserNodeMaker
 import groovy.transform.CompileStatic
 
 @CompileStatic
+@Deprecated
 class TextTreeNodeMaker implements AstBrowserNodeMaker {
 TextNode makeNode(Object userObject) {
 new TextNode(userObject)
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
index 87001af..03cf944 100644
--- 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
+++ 
b/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstBrowser.groovy
@@ -57,7 +57,7 @@ import static java.awt.GridBagConstraints.WEST
  * Usage: java groovy.inspect.swingui.AstBrowser [filename]
  * where [filename] is an existing Groovy script. 
  */
-
+@Deprecated
 class AstBrowser {
 
 private static final String BYTECODE_MSG_SELECT_NODE = '// Please select a 
class node in the tree view.'
@@ -500,6 +500,7 @@ class AstBrowser {
 /**
  * This class sets and restores control positions in the browser.
  */
+@Deprecated
 class AstBrowserUiPreferences {
 
 final frameLocation
@@ -559,6 +560,7 @@ class AstBrowserUiPreferences {
  * An adapter for the CompilePhase enum that can be entered into a Swing 
combobox.
  */
 @CompileStatic
+@Deprecated
 enum CompilePhaseAdapter {
 INITIALIZATION(Phases.INITIALIZATION, 'Initialization'),
 PARSING(Phases.PARSING, 'Parsing'),
@@ -587,6 +589,7 @@ enum CompilePhaseAdapter {
  * This class is a TreeNode and you can store additional properties on it.
  */
 @CompileStatic
+@Deprecated
 class TreeNodeWithProperties extends DefaultMutableTreeNode {
 
 List> properties
@@ -619,6 +622,7 @@ class TreeNodeWithProperties extends DefaultMutableTreeNode 
{
  * This interface is used to create tree nodes of various types 
  */
 @CompileStatic
+@Deprecated
 interface AstBrowserNodeMaker {
 T makeNode(Object userObject)
 
@@ -629,6 +633,7 @@ interface AstBrowserNodeMaker {
  * Creates tree nodes for swing UI  
  */
 @CompileStatic
+@Deprecated
 class SwingTreeNodeMaker implements 
AstBrowserNodeMaker {
 DefaultMutableTreeNode makeNode(Object userObject) {
 new DefaultMutableTreeNode(userObject)
@@ -639,6 +644,7 @@ class SwingTreeNodeMaker implements 
AstBrowserNodeMaker
 }
 }
 
+@Deprecated
 class BytecodeCollector extends ClassCollector {
 
 Map bytecode
@@ -657,6 +663,7 @@ class BytecodeCollector extends ClassCollector {
 }
 
 @CompileStatic
+@Deprecated
 class GeneratedBytecodeAwareGroovyClassLoader extends GroovyClassLoader {
 
 private final Map bytecode = new HashMap()
diff --git 
a/subprojects/groovy-console/src/main/groovy/groovy/inspect/swingui/AstNodeToScriptAdapter.groo

[groovy] 01/17: Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - rename file to target-name

2019-05-16 Thread paulk
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

commit cb0ed447747b3e7277c8312c1b8bcc198454d4eb
Author: Paul King 
AuthorDate: Fri May 17 13:50:53 2019 +1000

Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - rename file to target-name
---
 .../groovy => apache/groovy/swing}/binding/AbstractFullBinding.java   | 0
 .../groovy => apache/groovy/swing}/binding/AggregateBinding.java  | 0
 .../org/{codehaus/groovy => apache/groovy/swing}/binding/BindPath.java| 0
 .../{codehaus/groovy => apache/groovy/swing}/binding/BindingProxy.java| 0
 .../groovy => apache/groovy/swing}/binding/BindingUpdatable.java  | 0
 .../groovy => apache/groovy/swing}/binding/ClosureSourceBinding.java  | 0
 .../groovy => apache/groovy/swing}/binding/ClosureTriggerBinding.java | 0
 .../groovy => apache/groovy/swing}/binding/EventTriggerBinding.java   | 0
 .../org/{codehaus/groovy => apache/groovy/swing}/binding/FullBinding.java | 0
 .../groovy => apache/groovy/swing}/binding/MutualPropertyBinding.java | 0
 .../{codehaus/groovy => apache/groovy/swing}/binding/PropertyBinding.java | 0
 .../groovy/swing}/binding/PropertyChangeProxyTargetBinding.java   | 0
 .../groovy => apache/groovy/swing}/binding/PropertyPathFullBinding.java   | 0
 .../{codehaus/groovy => apache/groovy/swing}/binding/SourceBinding.java   | 0
 .../groovy => apache/groovy/swing}/binding/SwingTimerTriggerBinding.java  | 0
 .../{codehaus/groovy => apache/groovy/swing}/binding/TargetBinding.java   | 0
 .../{codehaus/groovy => apache/groovy/swing}/binding/TriggerBinding.java  | 0
 .../org/{codehaus/groovy => apache/groovy/swing}/binding/package.html | 0
 18 files changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AbstractFullBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/AggregateBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindPath.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingProxy.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/BindingUpdatable.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureSourceBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
 
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/c

[groovy] 13/17: Split history main/java/groovy/model to main/java/groovy/swing - rename file to target-name

2019-05-16 Thread paulk
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

commit 7d9f9bb4841c59dba4a58b77bb720c2da50daadd
Author: Paul King 
AuthorDate: Fri May 17 13:54:53 2019 +1000

Split history main/java/groovy/model to main/java/groovy/swing - rename 
file to target-name
---
 .../groovy-swing/src/main/java/groovy/{ => swing}/model/ClosureModel.java | 0
 .../src/main/java/groovy/{ => swing}/model/DefaultTableColumn.java| 0
 .../src/main/java/groovy/{ => swing}/model/DefaultTableModel.java | 0
 .../groovy-swing/src/main/java/groovy/{ => swing}/model/FormModel.java| 0
 .../src/main/java/groovy/{ => swing}/model/NestedValueModel.java  | 0
 .../src/main/java/groovy/{ => swing}/model/PropertyModel.java | 0
 .../groovy-swing/src/main/java/groovy/{ => swing}/model/ValueHolder.java  | 0
 .../groovy-swing/src/main/java/groovy/{ => swing}/model/ValueModel.java   | 0
 .../groovy-swing/src/main/java/groovy/{ => swing}/model/package.html  | 0
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/ClosureModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableColumn.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/FormModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/NestedValueModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/PropertyModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueHolder.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/model/ValueModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/package.html 
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/package.html
rename to subprojects/groovy-swing/src/main/java/groovy/swing/model/package.html



[groovy] 06/17: Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - rename source-file to temp

2019-05-16 Thread paulk
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

commit cc20ac353497f2f3babb07f4e029dfd718801f74
Author: Paul King 
AuthorDate: Fri May 17 13:53:34 2019 +1000

Split history main/java/groovy/inspect/swingui/TableMap.java to 
main/java/groovy/swing/table - rename source-file to temp
---
 .../src/{main/java/groovy/inspect/swingui/TableMap.java => temp}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java 
b/subprojects/groovy-swing/src/temp
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
rename to subprojects/groovy-swing/src/temp



[groovy] 14/17: Split history main/java/groovy/model to main/java/groovy/swing - rename source-file to temp

2019-05-16 Thread paulk
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

commit 79a199733efad3f7141f0a5e6ea3a54c84f4d075
Author: Paul King 
AuthorDate: Fri May 17 13:54:53 2019 +1000

Split history main/java/groovy/model to main/java/groovy/swing - rename 
source-file to temp
---
 .../groovy-swing/src/{main/java/groovy/model => temp}/ClosureModel.java   | 0
 .../src/{main/java/groovy/model => temp}/DefaultTableColumn.java  | 0
 .../src/{main/java/groovy/model => temp}/DefaultTableModel.java   | 0
 .../groovy-swing/src/{main/java/groovy/model => temp}/FormModel.java  | 0
 .../src/{main/java/groovy/model => temp}/NestedValueModel.java| 0
 .../groovy-swing/src/{main/java/groovy/model => temp}/PropertyModel.java  | 0
 .../groovy-swing/src/{main/java/groovy/model => temp}/ValueHolder.java| 0
 .../groovy-swing/src/{main/java/groovy/model => temp}/ValueModel.java | 0
 .../groovy-swing/src/{main/java/groovy/model => temp}/package.html| 0
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java 
b/subprojects/groovy-swing/src/temp/ClosureModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
rename to subprojects/groovy-swing/src/temp/ClosureModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java 
b/subprojects/groovy-swing/src/temp/DefaultTableColumn.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
rename to subprojects/groovy-swing/src/temp/DefaultTableColumn.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java 
b/subprojects/groovy-swing/src/temp/DefaultTableModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
rename to subprojects/groovy-swing/src/temp/DefaultTableModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java 
b/subprojects/groovy-swing/src/temp/FormModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
rename to subprojects/groovy-swing/src/temp/FormModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java 
b/subprojects/groovy-swing/src/temp/NestedValueModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
rename to subprojects/groovy-swing/src/temp/NestedValueModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java 
b/subprojects/groovy-swing/src/temp/PropertyModel.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
rename to subprojects/groovy-swing/src/temp/PropertyModel.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java 
b/subprojects/groovy-swing/src/temp/ValueHolder.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
rename to subprojects/groovy-swing/src/temp/ValueHolder.java
diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java 
b/subprojects/groovy-swing/src/temp/ValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
rename to subprojects/groovy-swing/src/temp/ValueModel.java
diff --git a/subprojects/groovy-swing/src/main/java/groovy/model/package.html 
b/subprojects/groovy-swing/src/temp/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/main/java/groovy/model/package.html
rename to subprojects/groovy-swing/src/temp/package.html



[groovy] 03/17: Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit ce873bb51418d5026b9aa42e0a0887cda9ee0c82
Merge: b786db2 cb0ed44
Author: Paul King 
AuthorDate: Fri May 17 13:50:54 2019 +1000

Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - resolve conflict and keep both files

 .../groovy/swing/binding/AbstractFullBinding.java  | 113 +++
 .../groovy/swing/binding/AggregateBinding.java |  82 +
 .../org/apache/groovy/swing/binding/BindPath.java  | 237 +
 .../apache/groovy/swing/binding/BindingProxy.java  | 159 +
 .../groovy/swing/binding/BindingUpdatable.java |  57 
 .../groovy/swing/binding/ClosureSourceBinding.java |  61 
 .../swing/binding/ClosureTriggerBinding.java   | 167 ++
 .../groovy/swing/binding/EventTriggerBinding.java  |  87 +
 .../apache/groovy/swing/binding/FullBinding.java   |  47 +++
 .../swing/binding/MutualPropertyBinding.java   | 198 +++
 .../groovy/swing/binding/PropertyBinding.java  | 367 +
 .../binding/PropertyChangeProxyTargetBinding.java  |  41 +++
 .../swing/binding/PropertyPathFullBinding.java |  78 +
 .../apache/groovy/swing/binding/SourceBinding.java |  28 ++
 .../swing/binding/SwingTimerTriggerBinding.java| 181 ++
 .../apache/groovy/swing/binding/TargetBinding.java |  27 ++
 .../groovy/swing/binding/TriggerBinding.java   |  28 ++
 .../org/apache/groovy/swing/binding/package.html   |  28 ++
 18 files changed, 1986 insertions(+)



[groovy] 08/17: Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - restore name of source-file

2019-05-16 Thread paulk
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

commit cbf43482a038d87bfe6fc3b838f3bfc609d83072
Author: Paul King 
AuthorDate: Fri May 17 13:53:35 2019 +1000

Split history main/java/groovy/inspect/swingui/TableMap.java to 
main/java/groovy/swing/table - restore name of source-file
---
 .../src/{temp => main/java/groovy/inspect/swingui/TableMap.java}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-swing/src/temp 
b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp
rename to 
subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java



[groovy] 12/17: Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - restore name of source-file

2019-05-16 Thread paulk
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

commit ea297f85f806b66c8c2d7ccfeade0ca978c25631
Author: Paul King 
AuthorDate: Fri May 17 13:53:55 2019 +1000

Split history main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - restore name of source-file
---
 .../src/{temp => main/java/groovy/inspect/swingui/TableSorter.java}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-swing/src/temp 
b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp
rename to 
subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java



[groovy] 04/17: Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - restore name of source-file

2019-05-16 Thread paulk
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

commit 42d5fa3ae2f4635b751dc01bf240187219e96e96
Author: Paul King 
AuthorDate: Fri May 17 13:50:54 2019 +1000

Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - restore name of source-file
---
 .../java/org/codehaus/groovy/binding}/AbstractFullBinding.java| 0
 .../{temp => main/java/org/codehaus/groovy/binding}/AggregateBinding.java | 0
 .../src/{temp => main/java/org/codehaus/groovy/binding}/BindPath.java | 0
 .../src/{temp => main/java/org/codehaus/groovy/binding}/BindingProxy.java | 0
 .../{temp => main/java/org/codehaus/groovy/binding}/BindingUpdatable.java | 0
 .../java/org/codehaus/groovy/binding}/ClosureSourceBinding.java   | 0
 .../java/org/codehaus/groovy/binding}/ClosureTriggerBinding.java  | 0
 .../java/org/codehaus/groovy/binding}/EventTriggerBinding.java| 0
 .../src/{temp => main/java/org/codehaus/groovy/binding}/FullBinding.java  | 0
 .../java/org/codehaus/groovy/binding}/MutualPropertyBinding.java  | 0
 .../{temp => main/java/org/codehaus/groovy/binding}/PropertyBinding.java  | 0
 .../org/codehaus/groovy/binding}/PropertyChangeProxyTargetBinding.java| 0
 .../java/org/codehaus/groovy/binding}/PropertyPathFullBinding.java| 0
 .../{temp => main/java/org/codehaus/groovy/binding}/SourceBinding.java| 0
 .../java/org/codehaus/groovy/binding}/SwingTimerTriggerBinding.java   | 0
 .../{temp => main/java/org/codehaus/groovy/binding}/TargetBinding.java| 0
 .../{temp => main/java/org/codehaus/groovy/binding}/TriggerBinding.java   | 0
 .../src/{temp => main/java/org/codehaus/groovy/binding}/package.html  | 0
 18 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-swing/src/temp/AbstractFullBinding.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/AbstractFullBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
diff --git a/subprojects/groovy-swing/src/temp/AggregateBinding.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/AggregateBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
diff --git a/subprojects/groovy-swing/src/temp/BindPath.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/BindPath.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
diff --git a/subprojects/groovy-swing/src/temp/BindingProxy.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/BindingProxy.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
diff --git a/subprojects/groovy-swing/src/temp/BindingUpdatable.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/BindingUpdatable.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
diff --git a/subprojects/groovy-swing/src/temp/ClosureSourceBinding.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ClosureSourceBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
diff --git a/subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/temp/EventTriggerBinding.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/EventTriggerBinding.java
rename to 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
diff --git a/subprojects/groovy-swing/src/temp/FullBinding.java 
b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/FullBinding.java
rename to 
subprojects/

[groovy] 15/17: Split history main/java/groovy/model to main/java/groovy/swing - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit 33d0e4189caa55dc614797c14a5d0529eed86e45
Merge: 79a1997 7d9f9bb
Author: Paul King 
AuthorDate: Fri May 17 13:54:54 2019 +1000

Split history main/java/groovy/model to main/java/groovy/swing - resolve 
conflict and keep both files

 .../main/java/groovy/swing/model/ClosureModel.java |  78 
 .../groovy/swing/model/DefaultTableColumn.java |  83 
 .../java/groovy/swing/model/DefaultTableModel.java | 214 +
 .../main/java/groovy/swing/model/FormModel.java|  46 +
 .../java/groovy/swing/model/NestedValueModel.java  |  27 +++
 .../java/groovy/swing/model/PropertyModel.java |  80 
 .../main/java/groovy/swing/model/ValueHolder.java  |  93 +
 .../main/java/groovy/swing/model/ValueModel.java   |  29 +++
 .../src/main/java/groovy/swing/model/package.html  |  29 +++
 9 files changed, 679 insertions(+)



[groovy] 07/17: Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit 4ad595525ce0796e2460ac72fd2999275a2e6ad2
Merge: cc20ac3 046c59a
Author: Paul King 
AuthorDate: Fri May 17 13:53:34 2019 +1000

Split history main/java/groovy/inspect/swingui/TableMap.java to 
main/java/groovy/swing/table - resolve conflict and keep both files

 .../src/main/java/groovy/swing/table/TableMap.java | 86 ++
 1 file changed, 86 insertions(+)



[groovy] 10/17: Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - rename source-file to temp

2019-05-16 Thread paulk
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

commit 9af853fdbdbc7a58f18f723b4ec6679e9232f375
Author: Paul King 
AuthorDate: Fri May 17 13:53:54 2019 +1000

Split history main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - rename source-file to temp
---
 .../src/{main/java/groovy/inspect/swingui/TableSorter.java => temp}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
 b/subprojects/groovy-swing/src/temp
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
rename to subprojects/groovy-swing/src/temp



[groovy] 17/17: GROOVY-8647: Split package renaming (groovy-swing)

2019-05-16 Thread paulk
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

commit a9d4d59970b08d485474c44e69d4053e3cbeb895
Author: Paul King 
AuthorDate: Fri May 17 14:50:35 2019 +1000

GROOVY-8647: Split package renaming (groovy-swing)
---
 src/test/groovy/NewExpressionTest.groovy   |  1 +
 .../groovy/groovy/swing/LookAndFeelHelper.groovy   | 18 ++---
 .../swing/binding/JComboBoxMetaMethods.groovy  |  5 +-
 .../groovy/swing/binding/JListMetaMethods.groovy   |  5 +-
 .../groovy/swing/binding/JTableMetaMethods.groovy  | 16 ++--
 .../groovy/swing/factory/TableModelFactory.groovy  | 90 +++---
 .../main/java/groovy/inspect/swingui/TableMap.java |  1 +
 .../java/groovy/inspect/swingui/TableSorter.java   |  1 +
 .../src/main/java/groovy/model/ClosureModel.java   |  1 +
 .../main/java/groovy/model/DefaultTableColumn.java |  1 +
 .../main/java/groovy/model/DefaultTableModel.java  |  1 +
 .../src/main/java/groovy/model/FormModel.java  |  1 +
 .../main/java/groovy/model/NestedValueModel.java   |  1 +
 .../src/main/java/groovy/model/PropertyModel.java  |  1 +
 .../src/main/java/groovy/model/ValueHolder.java|  1 +
 .../src/main/java/groovy/model/ValueModel.java |  1 +
 .../main/java/groovy/swing/model/ClosureModel.java |  2 +-
 .../groovy/swing/model/DefaultTableColumn.java |  2 +-
 .../java/groovy/swing/model/DefaultTableModel.java |  2 +-
 .../main/java/groovy/swing/model/FormModel.java|  2 +-
 .../java/groovy/swing/model/NestedValueModel.java  |  2 +-
 .../java/groovy/swing/model/PropertyModel.java |  2 +-
 .../main/java/groovy/swing/model/ValueHolder.java  |  2 +-
 .../main/java/groovy/swing/model/ValueModel.java   |  2 +-
 .../src/main/java/groovy/swing/model/package.html  |  2 +-
 .../src/main/java/groovy/swing/table/TableMap.java |  2 +-
 .../main/java/groovy/swing/table/TableSorter.java  |  2 +-
 .../groovy/swing/binding/AbstractFullBinding.java  |  2 +-
 .../groovy/swing/binding/AggregateBinding.java |  2 +-
 .../org/apache/groovy/swing/binding/BindPath.java  |  2 +-
 .../apache/groovy/swing/binding/BindingProxy.java  |  2 +-
 .../groovy/swing/binding/BindingUpdatable.java |  2 +-
 .../groovy/swing/binding/ClosureSourceBinding.java |  2 +-
 .../swing/binding/ClosureTriggerBinding.java   |  2 +-
 .../groovy/swing/binding/EventTriggerBinding.java  |  2 +-
 .../apache/groovy/swing/binding/FullBinding.java   |  2 +-
 .../swing/binding/MutualPropertyBinding.java   |  3 +-
 .../groovy/swing/binding/PropertyBinding.java  |  2 +-
 .../binding/PropertyChangeProxyTargetBinding.java  |  2 +-
 .../swing/binding/PropertyPathFullBinding.java |  2 +-
 .../apache/groovy/swing/binding/SourceBinding.java |  2 +-
 .../swing/binding/SwingTimerTriggerBinding.java|  2 +-
 .../apache/groovy/swing/binding/TargetBinding.java |  2 +-
 .../groovy/swing/binding/TriggerBinding.java   |  2 +-
 .../org/apache/groovy/swing/binding/package.html   |  2 +-
 .../groovy/binding/AbstractFullBinding.java|  1 +
 .../codehaus/groovy/binding/AggregateBinding.java  |  1 +
 .../java/org/codehaus/groovy/binding/BindPath.java |  1 +
 .../org/codehaus/groovy/binding/BindingProxy.java  |  1 +
 .../codehaus/groovy/binding/BindingUpdatable.java  |  1 +
 .../groovy/binding/ClosureSourceBinding.java   |  1 +
 .../groovy/binding/ClosureTriggerBinding.java  |  4 +
 .../groovy/binding/EventTriggerBinding.java|  1 +
 .../org/codehaus/groovy/binding/FullBinding.java   |  1 +
 .../groovy/binding/MutualPropertyBinding.java  |  1 +
 .../codehaus/groovy/binding/PropertyBinding.java   |  1 +
 .../binding/PropertyChangeProxyTargetBinding.java  |  1 +
 .../groovy/binding/PropertyPathFullBinding.java|  1 +
 .../org/codehaus/groovy/binding/SourceBinding.java |  1 +
 .../groovy/binding/SwingTimerTriggerBinding.java   |  2 +
 .../org/codehaus/groovy/binding/TargetBinding.java |  1 +
 .../codehaus/groovy/binding/TriggerBinding.java|  1 +
 .../{ => swing}/ClosureSwingListenerTest.groovy|  4 +-
 .../groovy/runtime => groovy/swing}/DummyBean.java |  6 +-
 .../{util => swing}/GroovySwingTestCase.groovy |  8 +-
 .../groovy/groovy/{ => swing}/StrangeBean.java |  2 +-
 .../groovy/{ => swing}/StrangeBeanBeanInfo.java|  2 +-
 .../groovy/{ => swing}/StrangeEventListener.java   |  2 +-
 .../groovy/swing/SwingBuilderBindingsTest.groovy   | 73 ++
 .../groovy/swing/SwingBuilderTableTest.groovy  | 14 ++--
 .../{ => swing}/beans/BindableSwingTest.groovy |  9 ++-
 .../{ => swing}/beans/VetoableSwingTest.groovy |  9 ++-
 .../groovy/{ => swing}/bugs/Groovy303_Bug.groovy   | 21 +++--
 .../groovy/{ => swing}/bugs/PropertyBug.groovy |  5 +-
 .../groovy/{ => swing}/model/TableModelTest.groovy |  4 +-
 75 files changed, 217 insertions(+), 167 deletions(-)

diff --git a/src/test/groovy/NewExpress

[groovy] 02/17: Split history main/java/org/codehaus/groovy/binding to main/java/org/apache/groovy/swing - rename source-file to temp

2019-05-16 Thread paulk
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

commit b786db21bf210a6255f0923484ebfcb2b6ae18b7
Author: Paul King 
AuthorDate: Fri May 17 13:50:53 2019 +1000

Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - rename source-file to temp
---
 .../java/org/codehaus/groovy/binding => temp}/AbstractFullBinding.java| 0
 .../{main/java/org/codehaus/groovy/binding => temp}/AggregateBinding.java | 0
 .../src/{main/java/org/codehaus/groovy/binding => temp}/BindPath.java | 0
 .../src/{main/java/org/codehaus/groovy/binding => temp}/BindingProxy.java | 0
 .../{main/java/org/codehaus/groovy/binding => temp}/BindingUpdatable.java | 0
 .../java/org/codehaus/groovy/binding => temp}/ClosureSourceBinding.java   | 0
 .../java/org/codehaus/groovy/binding => temp}/ClosureTriggerBinding.java  | 0
 .../java/org/codehaus/groovy/binding => temp}/EventTriggerBinding.java| 0
 .../src/{main/java/org/codehaus/groovy/binding => temp}/FullBinding.java  | 0
 .../java/org/codehaus/groovy/binding => temp}/MutualPropertyBinding.java  | 0
 .../{main/java/org/codehaus/groovy/binding => temp}/PropertyBinding.java  | 0
 .../groovy/binding => temp}/PropertyChangeProxyTargetBinding.java | 0
 .../org/codehaus/groovy/binding => temp}/PropertyPathFullBinding.java | 0
 .../{main/java/org/codehaus/groovy/binding => temp}/SourceBinding.java| 0
 .../org/codehaus/groovy/binding => temp}/SwingTimerTriggerBinding.java| 0
 .../{main/java/org/codehaus/groovy/binding => temp}/TargetBinding.java| 0
 .../{main/java/org/codehaus/groovy/binding => temp}/TriggerBinding.java   | 0
 .../src/{main/java/org/codehaus/groovy/binding => temp}/package.html  | 0
 18 files changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
 b/subprojects/groovy-swing/src/temp/AbstractFullBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AbstractFullBinding.java
rename to subprojects/groovy-swing/src/temp/AbstractFullBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
 b/subprojects/groovy-swing/src/temp/AggregateBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/AggregateBinding.java
rename to subprojects/groovy-swing/src/temp/AggregateBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
 b/subprojects/groovy-swing/src/temp/BindPath.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
rename to subprojects/groovy-swing/src/temp/BindPath.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
 b/subprojects/groovy-swing/src/temp/BindingProxy.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingProxy.java
rename to subprojects/groovy-swing/src/temp/BindingProxy.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
 b/subprojects/groovy-swing/src/temp/BindingUpdatable.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindingUpdatable.java
rename to subprojects/groovy-swing/src/temp/BindingUpdatable.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
 b/subprojects/groovy-swing/src/temp/ClosureSourceBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureSourceBinding.java
rename to subprojects/groovy-swing/src/temp/ClosureSourceBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
 b/subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
rename to subprojects/groovy-swing/src/temp/ClosureTriggerBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
 b/subprojects/groovy-swing/src/temp/EventTriggerBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/EventTriggerBinding.java
rename to subprojects/groovy-swing/src/temp/EventTriggerBinding.java
diff --git 
a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/FullBinding.java
 b/subprojects/groovy-swing/src/temp/FullBinding.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/ja

[groovy] 16/17: Split history main/java/groovy/model to main/java/groovy/swing - restore name of source-file

2019-05-16 Thread paulk
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

commit c41d398cee14a1d2d5e5f0d0eeac1ce6154a657c
Author: Paul King 
AuthorDate: Fri May 17 13:54:54 2019 +1000

Split history main/java/groovy/model to main/java/groovy/swing - restore 
name of source-file
---
 .../groovy-swing/src/{temp => main/java/groovy/model}/ClosureModel.java   | 0
 .../src/{temp => main/java/groovy/model}/DefaultTableColumn.java  | 0
 .../src/{temp => main/java/groovy/model}/DefaultTableModel.java   | 0
 .../groovy-swing/src/{temp => main/java/groovy/model}/FormModel.java  | 0
 .../src/{temp => main/java/groovy/model}/NestedValueModel.java| 0
 .../groovy-swing/src/{temp => main/java/groovy/model}/PropertyModel.java  | 0
 .../groovy-swing/src/{temp => main/java/groovy/model}/ValueHolder.java| 0
 .../groovy-swing/src/{temp => main/java/groovy/model}/ValueModel.java | 0
 .../groovy-swing/src/{temp => main/java/groovy/model}/package.html| 0
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-swing/src/temp/ClosureModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ClosureModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ClosureModel.java
diff --git a/subprojects/groovy-swing/src/temp/DefaultTableColumn.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/DefaultTableColumn.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableColumn.java
diff --git a/subprojects/groovy-swing/src/temp/DefaultTableModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/DefaultTableModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/model/DefaultTableModel.java
diff --git a/subprojects/groovy-swing/src/temp/FormModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/FormModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/FormModel.java
diff --git a/subprojects/groovy-swing/src/temp/NestedValueModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/NestedValueModel.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/model/NestedValueModel.java
diff --git a/subprojects/groovy-swing/src/temp/PropertyModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/PropertyModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/PropertyModel.java
diff --git a/subprojects/groovy-swing/src/temp/ValueHolder.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ValueHolder.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ValueHolder.java
diff --git a/subprojects/groovy-swing/src/temp/ValueModel.java 
b/subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
similarity index 100%
rename from subprojects/groovy-swing/src/temp/ValueModel.java
rename to subprojects/groovy-swing/src/main/java/groovy/model/ValueModel.java
diff --git a/subprojects/groovy-swing/src/temp/package.html 
b/subprojects/groovy-swing/src/main/java/groovy/model/package.html
similarity index 100%
rename from subprojects/groovy-swing/src/temp/package.html
rename to subprojects/groovy-swing/src/main/java/groovy/model/package.html



[groovy] 11/17: Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit 5f61e690b5549f92b44bb01fdb25b837f90605f1
Merge: 9af853f d78bf65
Author: Paul King 
AuthorDate: Fri May 17 13:53:55 2019 +1000

Split history main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - resolve conflict and keep both files

 .../main/java/groovy/swing/table/TableSorter.java  | 326 +
 1 file changed, 326 insertions(+)



[groovy] 05/17: Split history main/java/groovy/inspect/swingui/TableMap.java to main/java/groovy/swing/table - rename file to target-name

2019-05-16 Thread paulk
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

commit 046c59a00fe54574e3fd6cfffa41e77e5d41503e
Author: Paul King 
AuthorDate: Fri May 17 13:53:33 2019 +1000

Split history main/java/groovy/inspect/swingui/TableMap.java to 
main/java/groovy/swing/table - rename file to target-name
---
 .../src/main/java/groovy/{inspect/swingui => swing/table}/TableMap.java   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java 
b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableMap.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java



[groovy] branch master updated (60c102a -> a9d4d59)

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from 60c102a  GROOVY-9121: Default compiler configuration is modified by 
GroovyMain
 new b786db2  Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - rename source-file to temp
 new cb0ed44  Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - rename file to target-name
 new ce873bb  Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - resolve conflict and keep both files
 new 42d5fa3  Split history main/java/org/codehaus/groovy/binding to 
main/java/org/apache/groovy/swing - restore name of source-file
 new cc20ac3  Split history main/java/groovy/inspect/swingui/TableMap.java 
to main/java/groovy/swing/table - rename source-file to temp
 new 046c59a  Split history main/java/groovy/inspect/swingui/TableMap.java 
to main/java/groovy/swing/table - rename file to target-name
 new 4ad5955  Split history main/java/groovy/inspect/swingui/TableMap.java 
to main/java/groovy/swing/table - resolve conflict and keep both files
 new cbf4348  Split history main/java/groovy/inspect/swingui/TableMap.java 
to main/java/groovy/swing/table - restore name of source-file
 new 9af853f  Split history 
main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - rename source-file to temp
 new d78bf65  Split history 
main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - rename file to target-name
 new 5f61e69  Split history 
main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - resolve conflict and keep both files
 new ea297f8  Split history 
main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - restore name of source-file
 new 79a1997  Split history main/java/groovy/model to 
main/java/groovy/swing - rename source-file to temp
 new 7d9f9bb  Split history main/java/groovy/model to 
main/java/groovy/swing - rename file to target-name
 new 33d0e41  Split history main/java/groovy/model to 
main/java/groovy/swing - resolve conflict and keep both files
 new c41d398  Split history main/java/groovy/model to 
main/java/groovy/swing - restore name of source-file
 new a9d4d59  GROOVY-8647: Split package renaming (groovy-swing)

The 17 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/test/groovy/NewExpressionTest.groovy   |  1 +
 .../groovy/groovy/swing/LookAndFeelHelper.groovy   | 18 ++---
 .../swing/binding/JComboBoxMetaMethods.groovy  |  5 +-
 .../groovy/swing/binding/JListMetaMethods.groovy   |  5 +-
 .../groovy/swing/binding/JTableMetaMethods.groovy  | 16 ++--
 .../groovy/swing/factory/TableModelFactory.groovy  | 90 +++---
 .../main/java/groovy/inspect/swingui/TableMap.java |  1 +
 .../java/groovy/inspect/swingui/TableSorter.java   |  1 +
 .../src/main/java/groovy/model/ClosureModel.java   |  1 +
 .../main/java/groovy/model/DefaultTableColumn.java |  1 +
 .../main/java/groovy/model/DefaultTableModel.java  |  1 +
 .../src/main/java/groovy/model/FormModel.java  |  1 +
 .../main/java/groovy/model/NestedValueModel.java   |  1 +
 .../src/main/java/groovy/model/PropertyModel.java  |  1 +
 .../src/main/java/groovy/model/ValueHolder.java|  1 +
 .../src/main/java/groovy/model/ValueModel.java |  1 +
 .../groovy/{ => swing}/model/ClosureModel.java |  2 +-
 .../{ => swing}/model/DefaultTableColumn.java  |  2 +-
 .../{ => swing}/model/DefaultTableModel.java   |  2 +-
 .../java/groovy/{ => swing}/model/FormModel.java   |  2 +-
 .../groovy/{ => swing}/model/NestedValueModel.java |  2 +-
 .../groovy/{ => swing}/model/PropertyModel.java|  2 +-
 .../java/groovy/{ => swing}/model/ValueHolder.java |  2 +-
 .../java/groovy/{ => swing}/model/ValueModel.java  |  2 +-
 .../src/main/java/groovy/swing/model/package.html  | 29 +++
 .../{inspect/swingui => swing/table}/TableMap.java |  2 +-
 .../swingui => swing/table}/TableSorter.java   |  2 +-
 .../groovy/swing}/binding/AbstractFullBinding.java |  2 +-
 .../groovy/swing}/binding/AggregateBinding.java|  2 +-
 .../groovy/swing}/binding/BindPath.java|  2 +-
 .../groovy/swing}/binding/BindingProxy.java|  2 +-
 .../groovy/swing}/binding/BindingUpdatable.java|  2 +-
 .../swing}/binding/ClosureSourceBinding.java   |  2 +-
 .../swing}/binding/ClosureTriggerBinding.java  |  2 +-
 .../groovy/swing}/binding/EventTriggerBinding.java |  2 +-
 .../groovy/swing}/binding/FullBinding.java |  2

[groovy] 09/17: Split history main/java/groovy/inspect/swingui/TableSorter.java to main/java/groovy/swing/table - rename file to target-name

2019-05-16 Thread paulk
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

commit d78bf65466dccd00441bc4c1355bb00443e47f0d
Author: Paul King 
AuthorDate: Fri May 17 13:53:54 2019 +1000

Split history main/java/groovy/inspect/swingui/TableSorter.java to 
main/java/groovy/swing/table - rename file to target-name
---
 .../main/java/groovy/{inspect/swingui => swing/table}/TableSorter.java| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
 b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
similarity index 100%
rename from 
subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java
rename to 
subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java



[groovy] 05/05: Merge remote-tracking branch 'origin/GROOVY_2_5_X' into GROOVY_2_5_X

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit 6902f2b8670d9d096d4a0cb5780e2b09d4448d40
Merge: 1a65ef7 0ff47b0
Author: Paul King 
AuthorDate: Fri May 17 13:20:42 2019 +1000

Merge remote-tracking branch 'origin/GROOVY_2_5_X' into GROOVY_2_5_X

 src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java | 5 -
 1 file changed, 5 deletions(-)



[groovy] 04/05: GROOVY-9121: Default compiler configuration is modified by GroovyMain

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit 1a65ef74a6ffa43df8d02b551d397169c2ff5511
Author: Paul King 
AuthorDate: Fri May 17 12:44:55 2019 +1000

GROOVY-9121: Default compiler configuration is modified by GroovyMain
---
 src/main/groovy/groovy/ui/GroovyMain.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/groovy/groovy/ui/GroovyMain.java 
b/src/main/groovy/groovy/ui/GroovyMain.java
index b1ea153..699e5c0 100644
--- a/src/main/groovy/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/groovy/ui/GroovyMain.java
@@ -281,7 +281,7 @@ public class GroovyMain {
 }
 
 if (indy) {
-
CompilerConfiguration.DEFAULT.getOptimizationOptions().put("indy", true);
+System.setProperty("groovy.target.indy", "true");
 main.conf.getOptimizationOptions().put("indy", true);
 }
 



[groovy] 01/05: minor refactor: formatting and style

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit d36a1be78af53e7c0c3a9218ac7ce73cde4aa0b1
Author: Paul King 
AuthorDate: Fri May 17 11:03:01 2019 +1000

minor refactor: formatting and style
---
 .../codehaus/groovy/control/ProcessingUnit.java| 57 ++
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java 
b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index 1621535..b37793e 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -32,9 +32,10 @@ public abstract class ProcessingUnit {
 /**
  * The current phase
  */
-protected int phase;
+protected int phase = Phases.INITIALIZATION;
+
 /**
- * Set true if phase is finished
+ * True if phase is finished
  */
 protected boolean phaseComplete;
 
@@ -55,10 +56,9 @@ public abstract class ProcessingUnit {
 
 
 /**
- * Initialize the ProcessingUnit to the empty state.
+ * Initializes the ProcessingUnit to the empty state.
  */
 public ProcessingUnit(final CompilerConfiguration configuration, final 
GroovyClassLoader classLoader, final ErrorCollector errorCollector) {
-this.phase = Phases.INITIALIZATION;
 setClassLoader(classLoader);
 configure(configuration != null ? configuration : 
CompilerConfiguration.DEFAULT);
 this.errorCollector = errorCollector != null ? errorCollector : new 
ErrorCollector(getConfiguration());
@@ -95,25 +95,31 @@ public abstract class ProcessingUnit {
  */
 
 public void setClassLoader(final GroovyClassLoader loader) {
-// Classloaders should only be created inside doPrivileged block
-// This code creates a classloader, which needs permission if a 
security manage is installed.
-// If this code might be invoked by code that does not have security 
permissions, then the classloader creation needs to occur inside a doPrivileged 
block.
-this.classLoader = AccessController.doPrivileged(new 
PrivilegedAction() {
+// ClassLoaders should only be created inside a doPrivileged block in 
case
+// this method is invoked by code that does not have security 
permissions.
+this.classLoader = loader != null ? loader : 
AccessController.doPrivileged(new PrivilegedAction() {
 public GroovyClassLoader run() {
 ClassLoader parent = 
Thread.currentThread().getContextClassLoader();
 if (parent == null) parent = 
ProcessingUnit.class.getClassLoader();
-return loader == null ? new GroovyClassLoader(parent, 
configuration) : loader;
+return new GroovyClassLoader(parent, getConfiguration());
 }
 });
 }
 
 
 /**
+ * Errors found during the compilation should be reported through the 
ErrorCollector.
+ */
+public ErrorCollector getErrorCollector() {
+return errorCollector;
+}
+
+/**
  * Returns the current phase.
  */
 
 public int getPhase() {
-return this.phase;
+return phase;
 }
 
 
@@ -122,25 +128,15 @@ public abstract class ProcessingUnit {
  */
 
 public String getPhaseDescription() {
-return Phases.getDescription(this.phase);
+return Phases.getDescription(phase);
 }
 
-/**
- * Errors found during the compilation should be reported through the 
ErrorCollector.
- *
- * @return the ErrorCollector for this ProcessingUnit
- */
-public ErrorCollector getErrorCollector() {
-return errorCollector;
+public boolean isPhaseComplete() {
+return phaseComplete;
 }
 
-
//---
-// PROCESSING
-
-
 /**
- * Marks the current phase complete and processes any
- * errors.
+ * Marks the current phase complete and processes any errors.
  */
 
 public void completePhase() throws CompilationFailedException {
@@ -150,24 +146,21 @@ public abstract class ProcessingUnit {
 
 
 /**
- * A synonym for gotoPhase( phase + 1 ).
+ * A synonym for gotoPhase(getPhase() + 1).
  */
 public void nextPhase() throws CompilationFailedException {
-gotoPhase(this.phase + 1);
+gotoPhase(phase + 1);
 }
 
 
 /**
- * Wraps up any pending operations for the current phase
- * and switches to the next phase.
+ * Wraps up any pending operations for the current phase and switches to 
the given phase.
  */
 public void gotoPhase(int phase) throws CompilationFailedException {
-if (!this.phaseComplete) {
+if (!phaseComplete) {
 completePhase();
 }
-
 this.phase = phase

[groovy] branch GROOVY_2_5_X updated (0ff47b0 -> 6902f2b)

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from 0ff47b0  port for 2_5_X
 new d36a1be  minor refactor: formatting and style
 new 746e104  GROOVY-9122: code smell in ProcessingUnit
 new f306f9f  minor refactor: remove dead code
 new 1a65ef7  GROOVY-9121: Default compiler configuration is modified by 
GroovyMain
 new 6902f2b  Merge remote-tracking branch 'origin/GROOVY_2_5_X' into 
GROOVY_2_5_X

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/groovy/groovy/ui/GroovyMain.java  |  2 +-
 .../codehaus/groovy/control/CompilationUnit.java   | 11 
 .../codehaus/groovy/control/ProcessingUnit.java| 71 +++---
 3 files changed, 36 insertions(+), 48 deletions(-)



[groovy] 03/05: minor refactor: remove dead code

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit f306f9f0e818ae9aaf48d94acc9a40d127c5f7b1
Author: Paul King 
AuthorDate: Fri May 17 11:57:14 2019 +1000

minor refactor: remove dead code
---
 .../java/org/codehaus/groovy/control/CompilationUnit.java | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java 
b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index 26e58bf..0aa7372 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -336,20 +336,9 @@ public class CompilationUnit extends ProcessingUnit {
 public void configure(CompilerConfiguration configuration) {
 super.configure(configuration);
 this.debug = configuration.getDebug();
-
-if (!this.configured && this.classLoader instanceof GroovyClassLoader) 
{
-appendCompilerConfigurationClasspathToClassLoader(configuration, 
(GroovyClassLoader) this.classLoader);
-}
-
 this.configured = true;
 }
 
-private void 
appendCompilerConfigurationClasspathToClassLoader(CompilerConfiguration 
configuration, GroovyClassLoader classLoader) {
-/*for (Iterator iterator = configuration.getClasspath().iterator(); 
iterator.hasNext(); ) {
-classLoader.addClasspath((String) iterator.next());
-}*/
-}
-
 /**
  * Returns the CompileUnit that roots our AST.
  */



[groovy] 02/05: GROOVY-9122: code smell in ProcessingUnit

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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

commit 746e104ee592031c82bfc494e98f9e79e3b67313
Author: Paul King 
AuthorDate: Fri May 17 11:50:39 2019 +1000

GROOVY-9122: code smell in ProcessingUnit
---
 .../java/org/codehaus/groovy/control/ProcessingUnit.java   | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java 
b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index b37793e..c279363 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -59,9 +59,10 @@ public abstract class ProcessingUnit {
  * Initializes the ProcessingUnit to the empty state.
  */
 public ProcessingUnit(final CompilerConfiguration configuration, final 
GroovyClassLoader classLoader, final ErrorCollector errorCollector) {
+setConfiguration(configuration != null ? configuration : 
CompilerConfiguration.DEFAULT);
 setClassLoader(classLoader);
-configure(configuration != null ? configuration : 
CompilerConfiguration.DEFAULT);
 this.errorCollector = errorCollector != null ? errorCollector : new 
ErrorCollector(getConfiguration());
+configure(getConfiguration());
 }
 
 
@@ -69,15 +70,20 @@ public abstract class ProcessingUnit {
  * Reconfigures the ProcessingUnit.
  */
 public void configure(CompilerConfiguration configuration) {
-this.configuration = configuration;
+setConfiguration(configuration);
 }
 
-
+/**
+ * Get the CompilerConfiguration for this ProcessingUnit.
+ */
 public CompilerConfiguration getConfiguration() {
 return configuration;
 }
 
-public void setConfiguration(CompilerConfiguration configuration) {
+/**
+ * Sets the CompilerConfiguration for this ProcessingUnit.
+ */
+public final void setConfiguration(CompilerConfiguration configuration) {
 this.configuration = configuration;
 }
 



[groovy] branch master updated (d250f8a -> 60c102a)

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from d250f8a  GROOVY-8647: Split package renaming (groovy-xml)
 new 9f66b48  fix memStub javadoc typo
 new 1fd7f04  minor refactor: formatting and style
 new 50fd92d  GROOVY-9122: code smell in ProcessingUnit
 new d0b8e91  minor refactor: remove dead code
 new 60c102a  GROOVY-9121: Default compiler configuration is modified by 
GroovyMain

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/groovy/groovy/ui/GroovyMain.java  |  2 +-
 .../codehaus/groovy/control/CompilationUnit.java   | 11 
 .../groovy/control/CompilerConfiguration.java  |  2 +-
 .../codehaus/groovy/control/ProcessingUnit.java| 66 +++---
 4 files changed, 35 insertions(+), 46 deletions(-)



[groovy] 03/05: GROOVY-9122: code smell in ProcessingUnit

2019-05-16 Thread paulk
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

commit 50fd92dc30cdfb89d83054e8cc8f5294d807f943
Author: Paul King 
AuthorDate: Fri May 17 11:50:39 2019 +1000

GROOVY-9122: code smell in ProcessingUnit
---
 .../java/org/codehaus/groovy/control/ProcessingUnit.java| 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java 
b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index f4509cd..a16c826 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -58,23 +58,30 @@ public abstract class ProcessingUnit {
  * Initializes the ProcessingUnit to the empty state.
  */
 public ProcessingUnit(final CompilerConfiguration configuration, final 
GroovyClassLoader classLoader, final ErrorCollector errorCollector) {
+setConfiguration(configuration != null ? configuration : 
CompilerConfiguration.DEFAULT);
 setClassLoader(classLoader);
-configure(configuration != null ? configuration : 
CompilerConfiguration.DEFAULT);
 this.errorCollector = errorCollector != null ? errorCollector : new 
ErrorCollector(getConfiguration());
+configure(getConfiguration());
 }
 
 /**
  * Reconfigures the ProcessingUnit.
  */
 public void configure(CompilerConfiguration configuration) {
-this.configuration = configuration;
+setConfiguration(configuration);
 }
 
+/**
+ * Get the CompilerConfiguration for this ProcessingUnit.
+ */
 public CompilerConfiguration getConfiguration() {
 return configuration;
 }
 
-public void setConfiguration(CompilerConfiguration configuration) {
+/**
+ * Sets the CompilerConfiguration for this ProcessingUnit.
+ */
+public final void setConfiguration(CompilerConfiguration configuration) {
 this.configuration = configuration;
 }
 



[groovy] 04/05: minor refactor: remove dead code

2019-05-16 Thread paulk
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

commit d0b8e9178e3690c64f841dfcd6da89c69def7803
Author: Paul King 
AuthorDate: Fri May 17 11:57:14 2019 +1000

minor refactor: remove dead code
---
 .../java/org/codehaus/groovy/control/CompilationUnit.java | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java 
b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index b9dbaec..205431c 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -342,20 +342,9 @@ public class CompilationUnit extends ProcessingUnit {
 public void configure(CompilerConfiguration configuration) {
 super.configure(configuration);
 this.debug = configuration.getDebug();
-
-if (!this.configured && this.classLoader instanceof GroovyClassLoader) 
{
-appendCompilerConfigurationClasspathToClassLoader(configuration, 
(GroovyClassLoader) this.classLoader);
-}
-
 this.configured = true;
 }
 
-private void 
appendCompilerConfigurationClasspathToClassLoader(CompilerConfiguration 
configuration, GroovyClassLoader classLoader) {
-/*for (Iterator iterator = configuration.getClasspath().iterator(); 
iterator.hasNext(); ) {
-classLoader.addClasspath((String) iterator.next());
-}*/
-}
-
 /**
  * Returns the CompileUnit that roots our AST.
  */



[groovy] 01/05: fix memStub javadoc typo

2019-05-16 Thread paulk
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

commit 9f66b48bae509a8de4007f9f9446ac9b73a23d9c
Author: Paul King 
AuthorDate: Fri May 17 08:45:50 2019 +1000

fix memStub javadoc typo
---
 src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java 
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 44f8bdb..7bc3cbe 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -55,7 +55,7 @@ public class CompilerConfiguration {
 /** This ("runtimeGroovydoc") is the Optimization Option 
value for enabling attaching {@link groovy.lang.Groovydoc} annotation*/
 public static final String RUNTIME_GROOVYDOC = "runtimeGroovydoc";
 
-/** This ("memStub") is the Optimization Option value for 
enabling generating stubs in memory*/
+/** This ("memStub") is the Joint Compilation Option value 
for enabling generating stubs in memory*/
 public static final String MEM_STUB = "memStub";
 
 /** This ("1.4") is the value for targetBytecode to compile 
for a JDK 1.4. **/



[groovy] 02/05: minor refactor: formatting and style

2019-05-16 Thread paulk
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

commit 1fd7f048226384f10a2635f8129c02b8937e57f3
Author: Paul King 
AuthorDate: Fri May 17 11:03:01 2019 +1000

minor refactor: formatting and style
---
 .../codehaus/groovy/control/ProcessingUnit.java| 53 ++
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java 
b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
index 34c9439..f4509cd 100644
--- a/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/ProcessingUnit.java
@@ -32,10 +32,10 @@ public abstract class ProcessingUnit {
 /**
  * The current phase
  */
-protected int phase;
+protected int phase = Phases.INITIALIZATION;
 
 /**
- * Set true if phase is finished
+ * True if phase is finished
  */
 protected boolean phaseComplete;
 
@@ -55,10 +55,9 @@ public abstract class ProcessingUnit {
 protected ErrorCollector errorCollector;
 
 /**
- * Initialize the ProcessingUnit to the empty state.
+ * Initializes the ProcessingUnit to the empty state.
  */
 public ProcessingUnit(final CompilerConfiguration configuration, final 
GroovyClassLoader classLoader, final ErrorCollector errorCollector) {
-this.phase = Phases.INITIALIZATION;
 setClassLoader(classLoader);
 configure(configuration != null ? configuration : 
CompilerConfiguration.DEFAULT);
 this.errorCollector = errorCollector != null ? errorCollector : new 
ErrorCollector(getConfiguration());
@@ -90,47 +89,44 @@ public abstract class ProcessingUnit {
  * Sets the class loader for use by this ProcessingUnit.
  */
 public void setClassLoader(final GroovyClassLoader loader) {
-// Classloaders should only be created inside a doPrivileged block in 
case
-// this method is invoked by code that does not have security 
permissions
+// ClassLoaders should only be created inside a doPrivileged block in 
case
+// this method is invoked by code that does not have security 
permissions.
 this.classLoader = loader != null ? loader : 
AccessController.doPrivileged(new PrivilegedAction() {
 public GroovyClassLoader run() {
 ClassLoader parent = 
Thread.currentThread().getContextClassLoader();
 if (parent == null) parent = 
ProcessingUnit.class.getClassLoader();
-return new GroovyClassLoader(parent, configuration);
+return new GroovyClassLoader(parent, getConfiguration());
 }
 });
 }
 
 /**
+ * Errors found during the compilation should be reported through the 
ErrorCollector.
+ */
+public ErrorCollector getErrorCollector() {
+return errorCollector;
+}
+
+/**
  * Returns the current phase.
  */
 public int getPhase() {
-return this.phase;
+return phase;
 }
 
 /**
  * Returns the description for the current phase.
  */
 public String getPhaseDescription() {
-return Phases.getDescription(this.phase);
+return Phases.getDescription(phase);
 }
 
-/**
- * Errors found during the compilation should be reported through the 
ErrorCollector.
- *
- * @return the ErrorCollector for this ProcessingUnit
- */
-public ErrorCollector getErrorCollector() {
-return errorCollector;
+public boolean isPhaseComplete() {
+return phaseComplete;
 }
 
-
//---
-// PROCESSING
-
-
 /**
- * Marks the current phase complete and processes any
- * errors.
+ * Marks the current phase complete and processes any errors.
  */
 public void completePhase() throws CompilationFailedException {
 errorCollector.failIfErrors();
@@ -138,23 +134,20 @@ public abstract class ProcessingUnit {
 }
 
 /**
- * A synonym for gotoPhase( phase + 1 ).
+ * A synonym for gotoPhase(getPhase() + 1).
  */
 public void nextPhase() throws CompilationFailedException {
-gotoPhase(this.phase + 1);
+gotoPhase(phase + 1);
 }
 
 /**
- * Wraps up any pending operations for the current phase
- * and switches to the next phase.
+ * Wraps up any pending operations for the current phase and switches to 
the given phase.
  */
 public void gotoPhase(int phase) throws CompilationFailedException {
-if (!this.phaseComplete) {
+if (!phaseComplete) {
 completePhase();
 }
-
 this.phase = phase;
-this.phaseComplete = false;
+phaseComplete = false;
 }
-
 }



[groovy] 05/05: GROOVY-9121: Default compiler configuration is modified by GroovyMain

2019-05-16 Thread paulk
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

commit 60c102a2c8c93794cecde4cee7a8b43e510ba538
Author: Paul King 
AuthorDate: Fri May 17 12:44:55 2019 +1000

GROOVY-9121: Default compiler configuration is modified by GroovyMain
---
 src/main/groovy/groovy/ui/GroovyMain.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/groovy/groovy/ui/GroovyMain.java 
b/src/main/groovy/groovy/ui/GroovyMain.java
index e6702e4..d227357 100644
--- a/src/main/groovy/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/groovy/ui/GroovyMain.java
@@ -281,7 +281,7 @@ public class GroovyMain {
 }
 
 if (indy) {
-
CompilerConfiguration.DEFAULT.getOptimizationOptions().put("indy", true);
+System.setProperty("groovy.target.indy", "true");
 main.conf.getOptimizationOptions().put("indy", true);
 }
 



[groovy-dev-site] branch asf-site updated: add windows installers

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 00dfd51  add windows installers
00dfd51 is described below

commit 00dfd51d770ca921778f388c2fb9634e14f77c65
Author: Paul King 
AuthorDate: Thu May 16 22:45:36 2019 +1000

add windows installers
---
 download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.html b/download.html
index a9e9106..1476a40 100644
--- a/download.html
+++ b/download.html
@@ -60,7 +60,7 @@
  Improve this doc
 
  Download Download 2.5.7Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
+See below for verification information' 
onclick='window.location.href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.7.zip;'> Download 2.5.7Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
 
 
 



[groovy-website] branch asf-site updated: add 2.4.17 windows installer

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new 364bd81  add 2.4.17 windows installer
364bd81 is described below

commit 364bd8142ad63be3a993c90dc082875258a27c55
Author: Paul King 
AuthorDate: Thu May 16 22:37:09 2019 +1000

add 2.4.17 windows installer
---
 site/src/site/sitemap-dev.groovy  | 7 +--
 site/src/site/sitemap-user.groovy | 7 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index d0fd9d1..2c09941 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -111,12 +111,7 @@ downloads {
 }
 version('2.4.17') {
 stable true
-//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.4.17-installer.exe'
-}
-version('2.4.16') {
-stable true
-archive true
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.4.16-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.4.17-installer.exe'
 }
 }
 }
diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index df31526..7d53e7e 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -180,12 +180,7 @@ downloads {
 }
 version('2.4.17') {
 stable true
-//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.4.17-installer.exe'
-}
-version('2.4.16') {
-stable true
-archive true
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.4.16-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.4.17-installer.exe'
 }
 }
 }



[groovy] 17/25: Split history main/java/groovy/util/XmlParser.java to main/java/groovy/xml - rename file to target-name

2019-05-16 Thread paulk
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

commit c3632b87a902f12921d380c5d0e0026bcdbdc930
Author: Paul King 
AuthorDate: Thu May 16 18:28:56 2019 +1000

Split history main/java/groovy/util/XmlParser.java to main/java/groovy/xml 
- rename file to target-name
---
 subprojects/groovy-xml/src/main/java/groovy/{util => xml}/XmlParser.java | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java 
b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
similarity index 100%
rename from subprojects/groovy-xml/src/main/java/groovy/util/XmlParser.java
rename to subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java



[groovy] 09/25: Split history main/java/groovy/util/slurpersupport to main/java/groovy/xml - rename file to target-name

2019-05-16 Thread paulk
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

commit 9f8431b71abebf242669a88b4be7ca67aa2dc84d
Author: Paul King 
AuthorDate: Thu May 16 18:27:17 2019 +1000

Split history main/java/groovy/util/slurpersupport to main/java/groovy/xml 
- rename file to target-name
---
 .../src/main/java/groovy/{util => xml}/slurpersupport/Attribute.java  | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/Attributes.java | 0
 .../main/java/groovy/{util => xml}/slurpersupport/FilteredAttributes.java | 0
 .../java/groovy/{util => xml}/slurpersupport/FilteredNodeChildren.java| 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/GPathResult.java| 0
 .../java/groovy/{util => xml}/slurpersupport/NamespaceAwareHashMap.java   | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/NoChildren.java | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/Node.java   | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/NodeChild.java  | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/NodeChildren.java   | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/NodeIterator.java   | 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/NodeParents.java| 0
 .../main/java/groovy/{util => xml}/slurpersupport/ReplacementNode.java| 0
 .../src/main/java/groovy/{util => xml}/slurpersupport/package.html| 0
 14 files changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
 b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attribute.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attribute.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attributes.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attributes.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/FilteredAttributes.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/FilteredAttributes.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/FilteredNodeChildren.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/FilteredNodeChildren.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/GPathResult.java
 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/GPathResult.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NamespaceAwareHashMap.java
 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NamespaceAwareHashMap.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NamespaceAwareHashMap.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NamespaceAwareHashMap.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NoChildren.java
 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NoChildren.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NoChildren.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NoChildren.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Node.java 
b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Node.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Node.java
rename to 
subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Node.java
diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
 b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NodeChild.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/groovy

[groovy] branch master updated (f034f99 -> d250f8a)

2019-05-16 Thread paulk
This is an automated email from the ASF dual-hosted git repository.

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


from f034f99  GROOVY-8647: Split package renaming (groovy-test 
GroovyTestCase and friends)
 new 6e07693  Split history 
main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - rename source-file to temp
 new 25900ba  Split history 
main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - rename file to target-name
 new 37539ae  Split history 
main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - resolve conflict and keep both files
 new 9aba316  Split history 
main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - restore name of source-file
 new 8537178  Split history 
main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java to 
main/java/org/apache/groovy/xml/extensions - rename source-file to temp
 new d519558  Split history 
main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java to 
main/java/org/apache/groovy/xml/extensions - rename file to target-name
 new b49f8c0  Split history 
main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java to 
main/java/org/apache/groovy/xml/extensions - resolve conflict and keep both 
files
 new 94a722a  Split history 
main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java to 
main/java/org/apache/groovy/xml/extensions - restore name of source-file
 new 22d5509  Split history main/java/groovy/util/slurpersupport to 
main/java/groovy/xml - rename source-file to temp
 new 9f8431b  Split history main/java/groovy/util/slurpersupport to 
main/java/groovy/xml - rename file to target-name
 new ff5a54b  Split history main/java/groovy/util/slurpersupport to 
main/java/groovy/xml - resolve conflict and keep both files
 new 90e8153  Split history main/java/groovy/util/slurpersupport to 
main/java/groovy/xml - restore name of source-file
 new 89289c4  Split history main/java/groovy/util/XmlSlurper.java to 
main/java/groovy/xml - rename source-file to temp
 new 55c3b22  Split history main/java/groovy/util/XmlSlurper.java to 
main/java/groovy/xml - rename file to target-name
 new bb9dc01  Split history main/java/groovy/util/XmlSlurper.java to 
main/java/groovy/xml - resolve conflict and keep both files
 new e15e188  Split history main/java/groovy/util/XmlSlurper.java to 
main/java/groovy/xml - restore name of source-file
 new 344fd25  Split history main/java/groovy/util/XmlParser.java to 
main/java/groovy/xml - rename source-file to temp
 new c3632b8  Split history main/java/groovy/util/XmlParser.java to 
main/java/groovy/xml - rename file to target-name
 new d6258d6  Split history main/java/groovy/util/XmlParser.java to 
main/java/groovy/xml - resolve conflict and keep both files
 new 96df9a8  Split history main/java/groovy/util/XmlParser.java to 
main/java/groovy/xml - restore name of source-file
 new d10dd71  Split history main/java/groovy/util/XmlNodePrinter.java to 
main/java/groovy/xml - rename source-file to temp
 new b4e6768  Split history main/java/groovy/util/XmlNodePrinter.java to 
main/java/groovy/xml - rename file to target-name
 new 39d3315  Split history main/java/groovy/util/XmlNodePrinter.java to 
main/java/groovy/xml - resolve conflict and keep both files
 new 422cd83  Split history main/java/groovy/util/XmlNodePrinter.java to 
main/java/groovy/xml - restore name of source-file
 new d250f8a  GROOVY-8647: Split package renaming (groovy-xml)

The 25 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/groovy/util/XmlNodePrinter.java  |  2 +
 .../src/main/java/groovy/util/XmlParser.java   |  3 +
 .../src/main/java/groovy/util/XmlSlurper.java  |  2 +
 .../src/main/java/groovy/util/XmlUtil.java | 78 ++
 .../java/groovy/util/slurpersupport/Attribute.java |  1 +
 .../groovy/util/slurpersupport/Attributes.java |  1 +
 .../util/slurpersupport/FilteredAttributes.java|  4 +-
 .../util/slurpersupport/FilteredNodeChildren.java  |  1 +
 .../groovy/util/slurpersupport/GPathResult.java|  1 +
 .../util/slurpersupport/NamespaceAwareHashMap.java |  1 +
 .../groovy/util/slurpersupport/NoChildren.java |  1 +
 .../main/java/groovy/util/slurpersupport/Node.java |  1 +
 .../java/groovy/util/slurpersupport/NodeChild.java |  1 +
 .../groovy/util/slurpersupport/NodeChildren.java   |  1 +
 .../groovy/util/slurpersupport/NodeIterator.java   |  1 +
 .../groovy/util/slurpersupport/NodeParents.java|  1 +
 .../util/slurpersupport/Replacement

[groovy] 03/25: Split history main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to main/java/org/apache/groovy/xml/tools - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit 37539ae9bad398b82404c01c3fc81930e568663c
Merge: 6e07693 25900ba
Author: Paul King 
AuthorDate: Thu May 16 18:24:38 2019 +1000

Split history main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - resolve conflict and keep both files

 .../org/apache/groovy/xml/tools/DomToGroovy.java   | 404 +
 1 file changed, 404 insertions(+)



[groovy] 19/25: Split history main/java/groovy/util/XmlParser.java to main/java/groovy/xml - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit d6258d6fabb60d02aae81600090bc0c469426122
Merge: 344fd25 c3632b8
Author: Paul King 
AuthorDate: Thu May 16 18:28:57 2019 +1000

Split history main/java/groovy/util/XmlParser.java to main/java/groovy/xml 
- resolve conflict and keep both files

 .../src/main/java/groovy/xml/XmlParser.java| 502 +
 1 file changed, 502 insertions(+)



[groovy] 14/25: Split history main/java/groovy/util/XmlSlurper.java to main/java/groovy/xml - rename source-file to temp

2019-05-16 Thread paulk
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

commit 89289c4424c570eadd210dd9d8cb639ff1dd0200
Author: Paul King 
AuthorDate: Thu May 16 18:28:38 2019 +1000

Split history main/java/groovy/util/XmlSlurper.java to main/java/groovy/xml 
- rename source-file to temp
---
 .../groovy-xml/src/{main/java/groovy/util/XmlSlurper.java => temp}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java 
b/subprojects/groovy-xml/src/temp
similarity index 100%
rename from subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
rename to subprojects/groovy-xml/src/temp



[groovy] 25/25: GROOVY-8647: Split package renaming (groovy-xml)

2019-05-16 Thread paulk
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

commit d250f8a1ef7eaad41b8e84d5a01b7cbd508a21b6
Author: Paul King 
AuthorDate: Thu May 16 20:12:15 2019 +1000

GROOVY-8647: Split package renaming (groovy-xml)
---
 .../src/main/java/groovy/util/XmlNodePrinter.java  |  2 +
 .../src/main/java/groovy/util/XmlParser.java   |  3 +
 .../src/main/java/groovy/util/XmlSlurper.java  |  2 +
 .../src/main/java/groovy/util/XmlUtil.java | 78 ++
 .../java/groovy/util/slurpersupport/Attribute.java |  1 +
 .../groovy/util/slurpersupport/Attributes.java |  1 +
 .../util/slurpersupport/FilteredAttributes.java|  4 +-
 .../util/slurpersupport/FilteredNodeChildren.java  |  1 +
 .../groovy/util/slurpersupport/GPathResult.java|  1 +
 .../util/slurpersupport/NamespaceAwareHashMap.java |  1 +
 .../groovy/util/slurpersupport/NoChildren.java |  1 +
 .../main/java/groovy/util/slurpersupport/Node.java |  1 +
 .../java/groovy/util/slurpersupport/NodeChild.java |  1 +
 .../groovy/util/slurpersupport/NodeChildren.java   |  1 +
 .../groovy/util/slurpersupport/NodeIterator.java   |  1 +
 .../groovy/util/slurpersupport/NodeParents.java|  1 +
 .../util/slurpersupport/ReplacementNode.java   |  1 +
 .../src/main/java/groovy/xml/XmlNodePrinter.java   |  5 +-
 .../src/main/java/groovy/xml/XmlParser.java|  5 +-
 .../src/main/java/groovy/xml/XmlSlurper.java   | 14 ++--
 .../src/main/java/groovy/xml/XmlUtil.java  |  3 +-
 .../java/groovy/xml/slurpersupport/Attribute.java  |  2 +-
 .../java/groovy/xml/slurpersupport/Attributes.java |  2 +-
 .../xml/slurpersupport/FilteredAttributes.java |  2 +-
 .../xml/slurpersupport/FilteredNodeChildren.java   |  2 +-
 .../groovy/xml/slurpersupport/GPathResult.java |  2 +-
 .../xml/slurpersupport/NamespaceAwareHashMap.java  |  2 +-
 .../java/groovy/xml/slurpersupport/NoChildren.java |  2 +-
 .../main/java/groovy/xml/slurpersupport/Node.java  |  2 +-
 .../java/groovy/xml/slurpersupport/NodeChild.java  |  2 +-
 .../groovy/xml/slurpersupport/NodeChildren.java|  2 +-
 .../groovy/xml/slurpersupport/NodeIterator.java|  2 +-
 .../groovy/xml/slurpersupport/NodeParents.java |  2 +-
 .../groovy/xml/slurpersupport/ReplacementNode.java |  2 +-
 .../java/groovy/xml/slurpersupport/package.html|  2 +-
 .../{XmlGroovyMethods.java => XmlExtensions.java}  |  4 +-
 .../org/apache/groovy/xml/tools/DomToGroovy.java   |  2 +-
 .../codehaus/groovy/runtime/XmlGroovyMethods.java  |  3 +
 .../org/codehaus/groovy/tools/xml/DomToGroovy.java |  1 +
 .../src/spec/test/UserGuideXmlSlurperTest.groovy   |  8 ++-
 .../groovy/groovy/xml/BuilderTestSupport.groovy|  3 +-
 .../groovy/groovy/{util => xml}/CustomNode.java|  5 +-
 .../groovy/{util => xml}/CustomXmlParser.java  |  6 +-
 .../groovy/{tree => xml}/NavigationXmlTest.groovy  |  4 +-
 .../xml/SafeNumberXmlParserTest.groovy}|  5 +-
 .../SafeNumberXmlSlurperTest.groovy}   | 36 +-
 .../groovy/xml/{vm6 => }/StaxBuilderTest.groovy|  9 +--
 .../groovy/xml/StreamingSAXBuilderTest.groovy  | 16 +++--
 .../groovy/xml/UseMarkupWithWriterScript.groovy|  6 +-
 .../groovy/xml/XmlJavadocAssertionTest.groovy  |  1 +
 .../groovy/{util => xml}/XmlNodePrinterTest.groovy |  2 +-
 .../groovy/{util => xml}/XmlParserTest.groovy  |  7 +-
 .../groovy/{util => xml}/XmlSlurperTest.groovy |  8 +--
 .../src/test/groovy/groovy/xml/XmlTest.java|  4 +-
 .../src/test/groovy/groovy/xml/XmlUtilTest.groovy  |  3 +-
 .../xml/benchmark}/BuilderPerfTest.groovy  |  3 +
 .../groovy/{ => xml}/bugs/Groovy249_Bug.groovy |  3 +-
 .../groovy/{ => xml}/bugs/Groovy4285Bug.groovy |  4 +-
 .../groovy/{ => xml}/bugs/Groovy593_Bug.groovy |  4 +-
 .../groovy/{ => xml}/bugs/Groovy_2473Bug.groovy|  3 +-
 .../groovy/{ => xml}/bugs/MarkupInScriptBug.java   |  8 +--
 .../groovy/{ => xml}/bugs/StaticMarkupBug.groovy   |  2 +-
 .../groovy/{ => xml}/bugs/TedsClosureBug.groovy|  4 +-
 .../groovy/groovy/xml/dom/DOMCategoryTest.groovy   |  6 +-
 .../src/test/groovy/groovy/xml/dom/DOMTest.groovy  |  1 +
 .../groovy/groovy/xml/dom/NamespaceDOMTest.groovy  |  7 +-
 .../{ => groovy/xml}/script/AtomTestScript.groovy  |  4 +-
 .../groovy/xml/tools}/DomToGroovyTest.groovy   |  9 ++-
 .../src/test/groovy/script/MarkupTestScript.groovy | 40 ---
 .../src/test/groovy/util/NavToWiki.groovy  | 59 
 .../tools/xml => apache/groovy/xml/tools}/po.xsd   |  0
 .../xml => apache/groovy/xml/tools}/swing.xml  |  0
 .../xml => apache/groovy/xml/tools}/swing2.xml |  0
 .../xml => apache/groovy/xml/tools}/test1.xml  |  0
 74 files changed, 239 insertions(+), 207 deletions(-)

diff --git 
a/subprojects/groovy-xml/src/main/java/groovy/util/XmlNodePrin

[groovy] 02/25: Split history main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to main/java/org/apache/groovy/xml/tools - rename source-file to temp

2019-05-16 Thread paulk
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

commit 6e076938af85a0f7a0deb3b126b158b90eac3d7a
Author: Paul King 
AuthorDate: Thu May 16 18:24:37 2019 +1000

Split history main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - rename source-file to temp
---
 .../{main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java => temp}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
 b/subprojects/groovy-xml/src/temp
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
rename to subprojects/groovy-xml/src/temp



[groovy] 11/25: Split history main/java/groovy/util/slurpersupport to main/java/groovy/xml - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit ff5a54bd8a63e2838a14c7dab4040a183ba90731
Merge: 22d5509 9f8431b
Author: Paul King 
AuthorDate: Thu May 16 18:27:18 2019 +1000

Split history main/java/groovy/util/slurpersupport to main/java/groovy/xml 
- resolve conflict and keep both files

 .../java/groovy/xml/slurpersupport/Attribute.java  | 142 +
 .../java/groovy/xml/slurpersupport/Attributes.java | 139 
 .../xml/slurpersupport/FilteredAttributes.java |  59 ++
 .../xml/slurpersupport/FilteredNodeChildren.java   |  64 ++
 .../groovy/xml/slurpersupport/GPathResult.java | 710 +
 .../xml/slurpersupport/NamespaceAwareHashMap.java  |  78 +++
 .../java/groovy/xml/slurpersupport/NoChildren.java | 166 +
 .../main/java/groovy/xml/slurpersupport/Node.java  | 338 ++
 .../java/groovy/xml/slurpersupport/NodeChild.java  | 159 +
 .../groovy/xml/slurpersupport/NodeChildren.java| 234 +++
 .../groovy/xml/slurpersupport/NodeIterator.java|  59 ++
 .../groovy/xml/slurpersupport/NodeParents.java |  55 ++
 .../groovy/xml/slurpersupport/ReplacementNode.java |  46 ++
 .../java/groovy/xml/slurpersupport/package.html|  28 +
 14 files changed, 2277 insertions(+)



[groovy] 23/25: Split history main/java/groovy/util/XmlNodePrinter.java to main/java/groovy/xml - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit 39d33159ab71e67cfd53aa828d1b257dfb10d187
Merge: d10dd71 b4e6768
Author: Paul King 
AuthorDate: Thu May 16 18:29:07 2019 +1000

Split history main/java/groovy/util/XmlNodePrinter.java to 
main/java/groovy/xml - resolve conflict and keep both files

 .../src/main/java/groovy/xml/XmlNodePrinter.java   | 443 +
 1 file changed, 443 insertions(+)



[groovy] 01/25: Split history main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to main/java/org/apache/groovy/xml/tools - rename file to target-name

2019-05-16 Thread paulk
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

commit 25900ba93c26535f598ae4c9663bb870b2305da4
Author: Paul King 
AuthorDate: Thu May 16 18:24:37 2019 +1000

Split history main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java to 
main/java/org/apache/groovy/xml/tools - rename file to target-name
---
 .../groovy/tools/xml => apache/groovy/xml/tools}/DomToGroovy.java | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
 
b/subprojects/groovy-xml/src/main/java/org/apache/groovy/xml/tools/DomToGroovy.java
similarity index 100%
rename from 
subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
rename to 
subprojects/groovy-xml/src/main/java/org/apache/groovy/xml/tools/DomToGroovy.java



[groovy] 15/25: Split history main/java/groovy/util/XmlSlurper.java to main/java/groovy/xml - resolve conflict and keep both files

2019-05-16 Thread paulk
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

commit bb9dc015546a7a2f78db4b335e76af7b8ed09b47
Merge: 89289c4 55c3b22
Author: Paul King 
AuthorDate: Thu May 16 18:28:39 2019 +1000

Split history main/java/groovy/util/XmlSlurper.java to main/java/groovy/xml 
- resolve conflict and keep both files

 .../src/main/java/groovy/xml/XmlSlurper.java   | 465 +
 1 file changed, 465 insertions(+)



  1   2   3   4   5   6   7   8   9   10   >