You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/10/10 03:11:41 UTC
[groovy] branch master updated: merge parser-antlr4 pseudo
subproject into root project
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 74be42e merge parser-antlr4 pseudo subproject into root project
74be42e is described below
commit 74be42edf15bdc82dce143a7c7a10eef9ecd28bd
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Oct 10 13:11:31 2020 +1000
merge parser-antlr4 pseudo subproject into root project
---
build.gradle | 6 +-
.../src/main/groovy/org.apache.groovy-core.gradle | 35 +++++++++-
.../apache/groovy/parser/antlr4/AbstractLexer.java | 0
.../groovy/parser/antlr4/AbstractParser.java | 0
.../groovy/parser/antlr4/Antlr4ParserPlugin.java | 0
.../groovy/parser/antlr4/Antlr4PluginFactory.java | 0
.../apache/groovy/parser/antlr4/AstBuilder.java | 0
.../groovy/parser/antlr4/GroovyLangLexer.java | 0
.../groovy/parser/antlr4/GroovyLangParser.java | 0
.../groovy/parser/antlr4/GroovySyntaxError.java | 0
.../groovy/parser/antlr4/GroovydocManager.java | 0
.../groovy/parser/antlr4/ModifierManager.java | 0
.../apache/groovy/parser/antlr4/PositionInfo.java | 0
.../groovy/parser/antlr4/SemanticPredicates.java | 0
.../parser/antlr4/SyntaxErrorReportable.java | 0
.../antlr4/TryWithResourcesASTTransformation.java | 0
.../antlr4/internal/DescriptiveErrorStrategy.java | 0
.../antlr4/internal/atnmanager/AtnManager.java | 0
.../internal/atnmanager/LexerAtnManager.java | 0
.../internal/atnmanager/ParserAtnManager.java | 0
.../parser/antlr4/util/PositionConfigureUtils.java | 0
.../groovy/parser/antlr4/util/StringUtils.java | 0
.../java/org/codehaus/groovy/ast/ModifierNode.java | 0
.../test-resources}/bugs/BUG-GROOVY-2324.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-4438.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-4757.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-4762.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-5318.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-5652.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-6038.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8150.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8161.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8216.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8311.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8426.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8511.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8613.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8641.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8913.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-8991.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9399.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9427.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9433.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9449.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9507.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9511.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9522.groovy | 0
.../test-resources}/bugs/BUG-GROOVY-9692.groovy | 0
.../test-resources}/bugs/GROOVY-3898.groovy | 0
.../test-resources}/bugs/GROOVY-8228.groovy | 0
.../core/AnnotationDeclaration_01.groovy | 0
.../test-resources}/core/Annotation_01.groovy | 0
.../test-resources}/core/Annotation_02.groovy | 0
.../test-resources}/core/Annotation_03.groovy | 0
.../test-resources}/core/Annotation_04.groovy | 0
.../test-resources}/core/Annotation_05.groovy | 0
.../test-resources}/core/Annotation_06.groovy | 0
.../test-resources}/core/Annotation_07.groovy | 0
.../test-resources}/core/Annotation_08.groovy | 0
.../test-resources}/core/Annotation_09.groovy | 0
.../test-resources}/core/Annotation_10x.groovy | 0
.../test-resources}/core/Array_01x.groovy | 0
.../test-resources}/core/Assert_01.groovy | 0
.../test-resources}/core/Assert_02x.groovy | 0
.../test-resources}/core/Assert_03x.groovy | 0
.../test-resources}/core/Assert_04x.groovy | 0
.../test-resources}/core/Break_01.groovy | 0
.../test-resources}/core/BreakingChange_01x.groovy | 0
.../test-resources}/core/BreakingChange_02x.groovy | 0
.../test-resources}/core/BreakingChange_03x.groovy | 0
.../test-resources}/core/BreakingChange_04x.groovy | 0
.../core/ClassDeclaration_01.groovy | 0
.../core/ClassDeclaration_02.groovy | 0
.../core/ClassDeclaration_03.groovy | 0
.../core/ClassDeclaration_04.groovy | 0
.../core/ClassDeclaration_05.groovy | 0
.../core/ClassDeclaration_06.groovy | 0
.../core/ClassDeclaration_07.groovy | 0
.../core/ClassDeclaration_08.groovy | 0
.../test-resources}/core/Closure_01.groovy | 0
.../test-resources}/core/Closure_02.groovy | 0
.../test-resources}/core/Closure_03.groovy | 0
.../test-resources}/core/Closure_04.groovy | 0
.../test-resources}/core/Closure_05.groovy | 0
.../test-resources}/core/Closure_06.groovy | 0
.../test-resources}/core/Closure_07.groovy | 0
.../test-resources}/core/Closure_08.groovy | 0
.../test-resources}/core/Closure_09.groovy | 0
.../test-resources}/core/Closure_10.groovy | 0
.../test-resources}/core/CodeBlock_01x.groovy | 0
.../test-resources}/core/Command_01.groovy | 0
.../test-resources}/core/Command_02.groovy | 0
.../test-resources}/core/Command_03.groovy | 0
.../test-resources}/core/Command_04.groovy | 0
.../test-resources}/core/Command_05.groovy | 0
.../test-resources}/core/Command_06x.groovy | 0
.../test-resources}/core/Comments_01.groovy | 0
.../test-resources}/core/Comments_02.groovy | 0
.../test-resources}/core/Comments_03x.groovy | 0
.../test-resources}/core/DefaultMethod_01x.groovy | 0
.../test-resources}/core/DefaultMethod_02x.groovy | 0
.../test-resources}/core/DoWhile_01x.groovy | 0
.../test-resources}/core/DoWhile_02x.groovy | 0
.../test-resources}/core/DoWhile_03x.groovy | 0
.../test-resources}/core/DoWhile_04x.groovy | 0
.../core/ElvisAssignment_01x.groovy | 0
.../test-resources}/core/EnumDeclaration_01.groovy | 0
.../test-resources}/core/EnumDeclaration_02.groovy | 0
.../test-resources}/core/EnumDeclaration_03.groovy | 0
.../test-resources}/core/EnumDeclaration_04.groovy | 0
.../test-resources}/core/EnumDeclaration_05.groovy | 0
.../test-resources}/core/Expression_01.groovy | 0
.../test-resources}/core/Expression_02.groovy | 0
.../test-resources}/core/Expression_03.groovy | 0
.../test-resources}/core/Expression_04.groovy | 0
.../test-resources}/core/Expression_05.groovy | 0
.../test-resources}/core/Expression_06.groovy | 0
.../test-resources}/core/Expression_07.groovy | 0
.../test-resources}/core/Expression_08.groovy | 0
.../test-resources}/core/Expression_09.groovy | 0
.../test-resources}/core/Expression_10.groovy | 0
.../test-resources}/core/Expression_11.groovy | 0
.../test-resources}/core/Expression_12.groovy | 0
.../test-resources}/core/Expression_13.groovy | 0
.../test-resources}/core/Expression_14.groovy | 0
.../test-resources}/core/Expression_15.groovy | 0
.../test-resources}/core/Expression_16.groovy | 0
.../test-resources}/core/Expression_17.groovy | 0
.../test-resources}/core/Expression_18.groovy | 0
.../test-resources}/core/Expression_19.groovy | 0
.../test-resources}/core/Expression_20.groovy | 0
.../test-resources}/core/Expression_21x.groovy | 0
.../test-resources}/core/Expression_22x.groovy | 0
.../test-resources}/core/Expression_23x.groovy | 0
.../core/FieldDeclaration_01x.groovy | 0
.../test-resources}/core/For_01.groovy | 0
.../test-resources}/core/For_02.groovy | 0
.../test-resources}/core/For_03.groovy | 0
.../test-resources}/core/For_04x.groovy | 0
.../test-resources}/core/For_05x.groovy | 0
.../test-resources}/core/GString_01.groovy | 0
.../test-resources}/core/GString_02.groovy | 0
.../test-resources}/core/GString_03.groovy | 0
.../test-resources}/core/GString_04.groovy | 0
.../test-resources}/core/GString_05.groovy | 0
.../test-resources}/core/GString_06.groovy | 0
.../test-resources}/core/Groovydoc_01x.groovy | 0
.../test-resources}/core/IdenticalOp_01x.groovy | 0
.../test-resources}/core/IfElse_01.groovy | 0
.../core/ImportDeclaration_01.groovy | 0
.../core/ImportDeclaration_02.groovy | 0
.../core/ImportDeclaration_03.groovy | 0
.../core/ImportDeclaration_04.groovy | 0
.../core/ImportDeclaration_05.groovy | 0
.../core/ImportDeclaration_06.groovy | 0
.../core/ImportDeclaration_07.groovy | 0
.../core/ImportDeclaration_08.groovy | 0
.../core/InterfaceDeclaration_01.groovy | 0
.../core/InterfaceDeclaration_02.groovy | 0
.../core/InterfaceDeclaration_03.groovy | 0
.../test-resources}/core/Label_01.groovy | 0
.../test-resources}/core/Lambda_01x.groovy | 0
.../test-resources}/core/List_01.groovy | 0
.../test-resources}/core/Literal_01.groovy | 0
.../test-resources}/core/Literal_02.groovy | 0
.../test-resources}/core/Literal_03.groovy | 0
.../core/LocalVariableDeclaration_01.groovy | 0
.../core/LocalVariableDeclaration_02x.groovy | 0
.../test-resources}/core/Map_01.groovy | 0
.../test-resources}/core/Map_02x.groovy | 0
.../core/MethodDeclaration_01.groovy | 0
.../core/MethodDeclaration_02.groovy | 0
.../test-resources}/core/MethodPointer_01x.groovy | 0
.../core/MethodReference_01x.groovy | 0
.../core/NegativeRelationalOperators_01x.groovy | 0
.../core/NegativeRelationalOperators_02x.groovy | 0
.../test-resources}/core/NonStaticClass_01x.groovy | 0
.../test-resources}/core/Number_01x.groovy | 0
.../core/PackageDeclaration_01.groovy | 0
.../core/PackageDeclaration_02.groovy | 0
.../core/PackageDeclaration_03.groovy | 0
.../core/PackageDeclaration_04.groovy | 0
.../core/PackageDeclaration_05.groovy | 0
.../core/PackageDeclaration_06.groovy | 0
.../test-resources}/core/Return_01.groovy | 0
.../test-resources}/core/SafeChainOperator.groovy | 0
.../test-resources}/core/SafeIndex_01x.groovy | 0
.../test-resources}/core/SafeIndex_02x.groovy | 0
.../test-resources}/core/SafeIndex_03x.groovy | 0
.../test-resources}/core/SafeIndex_04x.groovy | 0
.../test-resources}/core/Script_01x.groovy | 0
.../test-resources}/core/String_01x.groovy | 0
.../test-resources}/core/Switch_01.groovy | 0
.../test-resources}/core/Synchronized_01.groovy | 0
.../test-resources}/core/Throw_01.groovy | 0
.../core/TraitDeclaration_01.groovy | 0
.../core/TraitDeclaration_02.groovy | 0
.../core/TraitDeclaration_03.groovy | 0
.../core/TraitDeclaration_04.groovy | 0
.../core/TraitDeclaration_05.groovy | 0
.../test-resources}/core/TryCatch_01.groovy | 0
.../core/TryWithResources_01x.groovy | 0
.../core/TryWithResources_02x.groovy | 0
.../test-resources}/core/Unicode_01.groovy | 0
.../test-resources}/core/Var_01x.groovy | 0
.../test-resources}/core/While_01.groovy | 0
.../test-resources}/core/While_02x.groovy | 0
.../test-resources}/fail/AbstractMethod_01x.groovy | 0
.../test-resources}/fail/AbstractMethod_02x.groovy | 0
.../test-resources}/fail/AbstractMethod_03x.groovy | 0
.../test-resources}/fail/AbstractMethod_04x.groovy | 0
.../test-resources}/fail/AbstractMethod_05x.groovy | 0
.../test-resources}/fail/AbstractMethod_06x.groovy | 0
.../fail/AnnotationDeclaration_01x.groovy | 0
.../test-resources}/fail/Array_01x.groovy | 0
.../test-resources}/fail/Array_02x.groovy | 0
.../test-resources}/fail/Assert_01x.groovy | 0
.../test-resources}/fail/Break_01x.groovy | 0
.../test-resources}/fail/Break_02x.groovy | 0
.../fail/ClassDeclaration_02x.groovy | 0
.../fail/ClosureListExpression_01.groovy | 0
.../fail/ClosureListExpression_02.groovy | 0
.../fail/ClosureListExpression_03.groovy | 0
.../fail/ClosureListExpression_04.groovy | 0
.../fail/CommandExpression_01x.groovy | 0
.../fail/ConstructorDeclaration_01.groovy | 0
.../test-resources}/fail/Continue_01x.groovy | 0
.../test-resources}/fail/Continue_02x.groovy | 0
.../test-resources}/fail/DoWhile_01x.groovy | 0
.../fail/DuplicatedNamedParameter_01x.groovy | 0
.../fail/DuplicatedNamedParameter_02x.groovy | 0
.../test-resources}/fail/Expression_01.groovy | 0
.../test-resources}/fail/Expression_02.groovy | 0
.../test-resources}/fail/Expression_03.groovy | 0
.../test-resources}/fail/Expression_04.groovy | 0
.../test-resources}/fail/Expression_05.groovy | 0
.../test-resources}/fail/Expression_06.groovy | 0
.../test-resources}/fail/Expression_07.groovy | 0
.../test-resources}/fail/Expression_08.groovy | 0
.../test-resources}/fail/Expression_09.groovy | 0
.../fail/FieldDeclaration_01x.groovy | 0
.../fail/FieldDeclaration_02x.groovy | 0
.../fail/FieldDeclaration_03x.groovy | 0
.../fail/FieldDeclaration_04x.groovy | 0
.../test-resources}/fail/For_01.groovy | 0
.../test-resources}/fail/For_02.groovy | 0
.../test-resources}/fail/Import_01x.groovy | 0
.../test-resources}/fail/Import_02x.groovy | 0
.../fail/InterfaceDeclaration_01.groovy | 0
.../test-resources}/fail/List_01.groovy | 0
.../fail/LocalVariableDeclaration_01.groovy | 0
.../test-resources}/fail/MethodCall_01x.groovy | 0
.../fail/MethodDeclaration_01.groovy | 0
.../fail/MethodDeclaration_02x.groovy | 0
.../fail/MethodDeclaration_03x.groovy | 0
.../fail/MethodDeclaration_04x.groovy | 0
.../fail/MethodDeclaration_05x.groovy | 0
.../test-resources}/fail/Modifier_01x.groovy | 0
.../test-resources}/fail/Modifier_02x.groovy | 0
.../test-resources}/fail/Modifier_03x.groovy | 0
.../test-resources}/fail/Modifier_04x.groovy | 0
.../test-resources}/fail/Modifier_05x.groovy | 0
.../test-resources}/fail/Modifier_07.groovy | 0
.../test-resources}/fail/NonStaticClass_01x.groovy | 0
.../test-resources}/fail/Number_01x.groovy | 0
.../test-resources}/fail/Number_02x.groovy | 0
.../test-resources}/fail/Number_03x.groovy | 0
.../test-resources}/fail/Number_04x.groovy | 0
.../test-resources}/fail/Number_05x.groovy | 0
.../test-resources}/fail/ParExpression_01x.groovy | 0
.../test-resources}/fail/ParExpression_02x.groovy | 0
.../test-resources}/fail/ParExpression_03x.groovy | 0
.../test-resources}/fail/Parentheses_01.groovy | 0
.../test-resources}/fail/String_01x.groovy | 0
.../test-resources}/fail/String_02x.groovy | 0
.../test-resources}/fail/String_03.groovy | 0
.../test-resources}/fail/String_04.groovy | 0
.../test-resources}/fail/Super_01x.groovy | 0
.../test-resources}/fail/Switch_01.groovy | 0
.../test-resources}/fail/This_01x.groovy | 0
.../test-resources}/fail/ThreadSafe_01x.groovy | 0
.../test-resources}/fail/Trait_01.groovy | 0
.../test-resources}/fail/UnaryOperator_01x.groovy | 0
.../test-resources}/fail/UnaryOperator_02x.groovy | 0
.../fail/UnexpectedCharacter_01x.groovy | 0
.../fail/VarArgParameter_01x.groovy | 0
.../test-resources}/fail/Var_01x.groovy | 0
.../test-resources}/fail/Var_02x.groovy | 0
.../test-resources}/fail/Void_01x.groovy | 0
.../test-resources}/fail/Void_02x.groovy | 0
.../groovy/parser/antlr4/GroovyParserTest.groovy | 0
.../groovy/parser/antlr4/SyntaxErrorTest.groovy | 0
.../apache/groovy/parser/antlr4/TestUtils.groovy | 2 +-
.../antlr4/util/ASTComparatorCategory.groovy | 0
.../groovy/parser/antlr4/util/AstDumper.groovy | 0
subprojects/groovy-binary/build.gradle | 3 -
subprojects/parser-antlr4/build.gradle | 74 ----------------------
297 files changed, 38 insertions(+), 82 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0ffab12..60e3463 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,6 +113,9 @@ dependencies {
implementation "org.ow2.asm:asm-tree:${versions.asm}"
implementation "org.ow2.asm:asm-util:${versions.asm}"
implementation "com.googlecode:openbeans:${versions.openbeans}"
+ implementation "com.tunnelvisionlabs:antlr4-runtime:${versions.antlr4}"
+
+ antlr "com.tunnelvisionlabs:antlr4:${versions.antlr4}"
loggingImplementation "org.fusesource.jansi:jansi:${versions.jansi}"
@@ -179,9 +182,6 @@ configurations {
}
}
-// TODO: This should probably be a different source set in the main groovy project
-apply from: 'subprojects/parser-antlr4/build.gradle'
-
tasks.named('jar') {
metaInf {
from("$projectDir/licenses/LICENSE-JARJAR")
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
index 1a460d4..d91d5a1 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
@@ -27,6 +27,7 @@ plugins {
id 'org.apache.groovy-base'
id 'org.apache.groovy-published-library'
id 'org.apache.groovy-documented'
+ id 'antlr'
}
project.extensions.create('groovyCore', CoreExtension, sourceSets)
@@ -52,6 +53,9 @@ sourceSets {
exclude '**/vm9/*'
}
}
+ antlr {
+ srcDirs = ['src/antlr']
+ }
resources {
srcDirs = ['src/resources']
}
@@ -157,4 +161,33 @@ tasks.named('javadoc') {
groovyCore.excludedFromJavadocs.each {
exclude it
}
-}
\ No newline at end of file
+}
+
+tasks.withType(Test).configureEach {
+ jvmArgs /*"-Dgroovy.attach.groovydoc=true", "-Dgroovy.attach.runtime.groovydoc=true",*/ "-Dgroovy.antlr4.cache.threshold=100"
+}
+
+tasks.named("generateGrammarSource") {
+ maxHeapSize = '1g'
+ outputs.cacheIf { true }
+ outputDirectory = file("${buildDir}/generated/sources/antlr4")
+ sourceSets.main.java.srcDirs += outputDirectory
+
+ final PARSER_PACKAGE_NAME = 'org.apache.groovy.parser.antlr4'
+ arguments += ["-visitor", "-no-listener", "-package", PARSER_PACKAGE_NAME]
+
+ doLast {
+ def parserFilePattern = 'Groovy*'
+ def outputPath = generateGrammarSource.outputDirectory.canonicalPath
+ def parserPackagePath = "${outputPath}/${PARSER_PACKAGE_NAME.replace('.', '/')}"
+ file(parserPackagePath).mkdirs()
+ copy {
+ from outputPath
+ into parserPackagePath
+ include parserFilePattern
+ }
+ delete fileTree(outputPath) {
+ include parserFilePattern
+ }
+ }
+}
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AbstractLexer.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/AbstractLexer.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AbstractLexer.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/AbstractLexer.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AbstractParser.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/AbstractParser.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AbstractParser.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/AbstractParser.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/AstBuilder.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/AstBuilder.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovyLangLexer.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/GroovyLangLexer.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovyLangLexer.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/GroovyLangLexer.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovyLangParser.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/GroovyLangParser.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovyLangParser.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/GroovyLangParser.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovySyntaxError.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/GroovySyntaxError.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovySyntaxError.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/GroovySyntaxError.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/GroovydocManager.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/GroovydocManager.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/ModifierManager.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/ModifierManager.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/PositionInfo.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/PositionInfo.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/SemanticPredicates.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/SemanticPredicates.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SyntaxErrorReportable.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/SyntaxErrorReportable.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SyntaxErrorReportable.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/SyntaxErrorReportable.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/TryWithResourcesASTTransformation.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/internal/DescriptiveErrorStrategy.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/internal/atnmanager/AtnManager.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/LexerAtnManager.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/internal/atnmanager/LexerAtnManager.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/LexerAtnManager.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/internal/atnmanager/LexerAtnManager.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/ParserAtnManager.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/internal/atnmanager/ParserAtnManager.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/internal/atnmanager/ParserAtnManager.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/internal/atnmanager/ParserAtnManager.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/PositionConfigureUtils.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/util/PositionConfigureUtils.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/PositionConfigureUtils.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/util/PositionConfigureUtils.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java b/src/main/java/org/apache/apache/groovy/parser/antlr4/util/StringUtils.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java
rename to src/main/java/org/apache/apache/groovy/parser/antlr4/util/StringUtils.java
diff --git a/subprojects/parser-antlr4/src/main/java/org/codehaus/groovy/ast/ModifierNode.java b/src/main/java/org/codehaus/groovy/ast/ModifierNode.java
similarity index 100%
rename from subprojects/parser-antlr4/src/main/java/org/codehaus/groovy/ast/ModifierNode.java
rename to src/main/java/org/codehaus/groovy/ast/ModifierNode.java
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-2324.groovy b/src/test-resources/bugs/BUG-GROOVY-2324.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-2324.groovy
rename to src/test-resources/bugs/BUG-GROOVY-2324.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4438.groovy b/src/test-resources/bugs/BUG-GROOVY-4438.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4438.groovy
rename to src/test-resources/bugs/BUG-GROOVY-4438.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4757.groovy b/src/test-resources/bugs/BUG-GROOVY-4757.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4757.groovy
rename to src/test-resources/bugs/BUG-GROOVY-4757.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4762.groovy b/src/test-resources/bugs/BUG-GROOVY-4762.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-4762.groovy
rename to src/test-resources/bugs/BUG-GROOVY-4762.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-5318.groovy b/src/test-resources/bugs/BUG-GROOVY-5318.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-5318.groovy
rename to src/test-resources/bugs/BUG-GROOVY-5318.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-5652.groovy b/src/test-resources/bugs/BUG-GROOVY-5652.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-5652.groovy
rename to src/test-resources/bugs/BUG-GROOVY-5652.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-6038.groovy b/src/test-resources/bugs/BUG-GROOVY-6038.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-6038.groovy
rename to src/test-resources/bugs/BUG-GROOVY-6038.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8150.groovy b/src/test-resources/bugs/BUG-GROOVY-8150.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8150.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8150.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8161.groovy b/src/test-resources/bugs/BUG-GROOVY-8161.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8161.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8161.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8216.groovy b/src/test-resources/bugs/BUG-GROOVY-8216.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8216.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8216.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8311.groovy b/src/test-resources/bugs/BUG-GROOVY-8311.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8311.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8311.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8426.groovy b/src/test-resources/bugs/BUG-GROOVY-8426.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8426.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8426.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8511.groovy b/src/test-resources/bugs/BUG-GROOVY-8511.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8511.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8511.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8613.groovy b/src/test-resources/bugs/BUG-GROOVY-8613.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8613.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8613.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy b/src/test-resources/bugs/BUG-GROOVY-8641.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8641.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8913.groovy b/src/test-resources/bugs/BUG-GROOVY-8913.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8913.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8913.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8991.groovy b/src/test-resources/bugs/BUG-GROOVY-8991.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8991.groovy
rename to src/test-resources/bugs/BUG-GROOVY-8991.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9399.groovy b/src/test-resources/bugs/BUG-GROOVY-9399.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9399.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9399.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9427.groovy b/src/test-resources/bugs/BUG-GROOVY-9427.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9427.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9427.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9433.groovy b/src/test-resources/bugs/BUG-GROOVY-9433.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9433.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9433.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9449.groovy b/src/test-resources/bugs/BUG-GROOVY-9449.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9449.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9449.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9507.groovy b/src/test-resources/bugs/BUG-GROOVY-9507.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9507.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9507.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9511.groovy b/src/test-resources/bugs/BUG-GROOVY-9511.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9511.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9511.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9522.groovy b/src/test-resources/bugs/BUG-GROOVY-9522.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9522.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9522.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9692.groovy b/src/test-resources/bugs/BUG-GROOVY-9692.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-9692.groovy
rename to src/test-resources/bugs/BUG-GROOVY-9692.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/GROOVY-3898.groovy b/src/test-resources/bugs/GROOVY-3898.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/GROOVY-3898.groovy
rename to src/test-resources/bugs/GROOVY-3898.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/GROOVY-8228.groovy b/src/test-resources/bugs/GROOVY-8228.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/bugs/GROOVY-8228.groovy
rename to src/test-resources/bugs/GROOVY-8228.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/AnnotationDeclaration_01.groovy b/src/test-resources/core/AnnotationDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/AnnotationDeclaration_01.groovy
rename to src/test-resources/core/AnnotationDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_01.groovy b/src/test-resources/core/Annotation_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_01.groovy
rename to src/test-resources/core/Annotation_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_02.groovy b/src/test-resources/core/Annotation_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_02.groovy
rename to src/test-resources/core/Annotation_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_03.groovy b/src/test-resources/core/Annotation_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_03.groovy
rename to src/test-resources/core/Annotation_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_04.groovy b/src/test-resources/core/Annotation_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_04.groovy
rename to src/test-resources/core/Annotation_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_05.groovy b/src/test-resources/core/Annotation_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_05.groovy
rename to src/test-resources/core/Annotation_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_06.groovy b/src/test-resources/core/Annotation_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_06.groovy
rename to src/test-resources/core/Annotation_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_07.groovy b/src/test-resources/core/Annotation_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_07.groovy
rename to src/test-resources/core/Annotation_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_08.groovy b/src/test-resources/core/Annotation_08.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_08.groovy
rename to src/test-resources/core/Annotation_08.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_09.groovy b/src/test-resources/core/Annotation_09.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_09.groovy
rename to src/test-resources/core/Annotation_09.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Annotation_10x.groovy b/src/test-resources/core/Annotation_10x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Annotation_10x.groovy
rename to src/test-resources/core/Annotation_10x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Array_01x.groovy b/src/test-resources/core/Array_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Array_01x.groovy
rename to src/test-resources/core/Array_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Assert_01.groovy b/src/test-resources/core/Assert_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Assert_01.groovy
rename to src/test-resources/core/Assert_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Assert_02x.groovy b/src/test-resources/core/Assert_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Assert_02x.groovy
rename to src/test-resources/core/Assert_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Assert_03x.groovy b/src/test-resources/core/Assert_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Assert_03x.groovy
rename to src/test-resources/core/Assert_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Assert_04x.groovy b/src/test-resources/core/Assert_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Assert_04x.groovy
rename to src/test-resources/core/Assert_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Break_01.groovy b/src/test-resources/core/Break_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Break_01.groovy
rename to src/test-resources/core/Break_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/BreakingChange_01x.groovy b/src/test-resources/core/BreakingChange_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/BreakingChange_01x.groovy
rename to src/test-resources/core/BreakingChange_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/BreakingChange_02x.groovy b/src/test-resources/core/BreakingChange_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/BreakingChange_02x.groovy
rename to src/test-resources/core/BreakingChange_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/BreakingChange_03x.groovy b/src/test-resources/core/BreakingChange_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/BreakingChange_03x.groovy
rename to src/test-resources/core/BreakingChange_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/BreakingChange_04x.groovy b/src/test-resources/core/BreakingChange_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/BreakingChange_04x.groovy
rename to src/test-resources/core/BreakingChange_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_01.groovy b/src/test-resources/core/ClassDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_01.groovy
rename to src/test-resources/core/ClassDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_02.groovy b/src/test-resources/core/ClassDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_02.groovy
rename to src/test-resources/core/ClassDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_03.groovy b/src/test-resources/core/ClassDeclaration_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_03.groovy
rename to src/test-resources/core/ClassDeclaration_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_04.groovy b/src/test-resources/core/ClassDeclaration_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_04.groovy
rename to src/test-resources/core/ClassDeclaration_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_05.groovy b/src/test-resources/core/ClassDeclaration_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_05.groovy
rename to src/test-resources/core/ClassDeclaration_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_06.groovy b/src/test-resources/core/ClassDeclaration_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_06.groovy
rename to src/test-resources/core/ClassDeclaration_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_07.groovy b/src/test-resources/core/ClassDeclaration_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_07.groovy
rename to src/test-resources/core/ClassDeclaration_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_08.groovy b/src/test-resources/core/ClassDeclaration_08.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ClassDeclaration_08.groovy
rename to src/test-resources/core/ClassDeclaration_08.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_01.groovy b/src/test-resources/core/Closure_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_01.groovy
rename to src/test-resources/core/Closure_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_02.groovy b/src/test-resources/core/Closure_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_02.groovy
rename to src/test-resources/core/Closure_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_03.groovy b/src/test-resources/core/Closure_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_03.groovy
rename to src/test-resources/core/Closure_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_04.groovy b/src/test-resources/core/Closure_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_04.groovy
rename to src/test-resources/core/Closure_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_05.groovy b/src/test-resources/core/Closure_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_05.groovy
rename to src/test-resources/core/Closure_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_06.groovy b/src/test-resources/core/Closure_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_06.groovy
rename to src/test-resources/core/Closure_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_07.groovy b/src/test-resources/core/Closure_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_07.groovy
rename to src/test-resources/core/Closure_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_08.groovy b/src/test-resources/core/Closure_08.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_08.groovy
rename to src/test-resources/core/Closure_08.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_09.groovy b/src/test-resources/core/Closure_09.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_09.groovy
rename to src/test-resources/core/Closure_09.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Closure_10.groovy b/src/test-resources/core/Closure_10.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Closure_10.groovy
rename to src/test-resources/core/Closure_10.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/CodeBlock_01x.groovy b/src/test-resources/core/CodeBlock_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/CodeBlock_01x.groovy
rename to src/test-resources/core/CodeBlock_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Command_01.groovy b/src/test-resources/core/Command_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Command_01.groovy
rename to src/test-resources/core/Command_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Command_02.groovy b/src/test-resources/core/Command_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Command_02.groovy
rename to src/test-resources/core/Command_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Command_03.groovy b/src/test-resources/core/Command_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Command_03.groovy
rename to src/test-resources/core/Command_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Command_04.groovy b/src/test-resources/core/Command_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Command_04.groovy
rename to src/test-resources/core/Command_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Command_05.groovy b/src/test-resources/core/Command_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Command_05.groovy
rename to src/test-resources/core/Command_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Command_06x.groovy b/src/test-resources/core/Command_06x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Command_06x.groovy
rename to src/test-resources/core/Command_06x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Comments_01.groovy b/src/test-resources/core/Comments_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Comments_01.groovy
rename to src/test-resources/core/Comments_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Comments_02.groovy b/src/test-resources/core/Comments_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Comments_02.groovy
rename to src/test-resources/core/Comments_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Comments_03x.groovy b/src/test-resources/core/Comments_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Comments_03x.groovy
rename to src/test-resources/core/Comments_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/DefaultMethod_01x.groovy b/src/test-resources/core/DefaultMethod_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/DefaultMethod_01x.groovy
rename to src/test-resources/core/DefaultMethod_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/DefaultMethod_02x.groovy b/src/test-resources/core/DefaultMethod_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/DefaultMethod_02x.groovy
rename to src/test-resources/core/DefaultMethod_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_01x.groovy b/src/test-resources/core/DoWhile_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/DoWhile_01x.groovy
rename to src/test-resources/core/DoWhile_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_02x.groovy b/src/test-resources/core/DoWhile_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/DoWhile_02x.groovy
rename to src/test-resources/core/DoWhile_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy b/src/test-resources/core/DoWhile_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/DoWhile_03x.groovy
rename to src/test-resources/core/DoWhile_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/DoWhile_04x.groovy b/src/test-resources/core/DoWhile_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/DoWhile_04x.groovy
rename to src/test-resources/core/DoWhile_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ElvisAssignment_01x.groovy b/src/test-resources/core/ElvisAssignment_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ElvisAssignment_01x.groovy
rename to src/test-resources/core/ElvisAssignment_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_01.groovy b/src/test-resources/core/EnumDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_01.groovy
rename to src/test-resources/core/EnumDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_02.groovy b/src/test-resources/core/EnumDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_02.groovy
rename to src/test-resources/core/EnumDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_03.groovy b/src/test-resources/core/EnumDeclaration_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_03.groovy
rename to src/test-resources/core/EnumDeclaration_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_04.groovy b/src/test-resources/core/EnumDeclaration_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_04.groovy
rename to src/test-resources/core/EnumDeclaration_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_05.groovy b/src/test-resources/core/EnumDeclaration_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/EnumDeclaration_05.groovy
rename to src/test-resources/core/EnumDeclaration_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_01.groovy b/src/test-resources/core/Expression_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_01.groovy
rename to src/test-resources/core/Expression_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_02.groovy b/src/test-resources/core/Expression_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_02.groovy
rename to src/test-resources/core/Expression_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_03.groovy b/src/test-resources/core/Expression_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_03.groovy
rename to src/test-resources/core/Expression_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_04.groovy b/src/test-resources/core/Expression_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_04.groovy
rename to src/test-resources/core/Expression_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_05.groovy b/src/test-resources/core/Expression_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_05.groovy
rename to src/test-resources/core/Expression_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_06.groovy b/src/test-resources/core/Expression_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_06.groovy
rename to src/test-resources/core/Expression_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_07.groovy b/src/test-resources/core/Expression_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_07.groovy
rename to src/test-resources/core/Expression_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_08.groovy b/src/test-resources/core/Expression_08.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_08.groovy
rename to src/test-resources/core/Expression_08.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_09.groovy b/src/test-resources/core/Expression_09.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_09.groovy
rename to src/test-resources/core/Expression_09.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_10.groovy b/src/test-resources/core/Expression_10.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_10.groovy
rename to src/test-resources/core/Expression_10.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_11.groovy b/src/test-resources/core/Expression_11.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_11.groovy
rename to src/test-resources/core/Expression_11.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_12.groovy b/src/test-resources/core/Expression_12.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_12.groovy
rename to src/test-resources/core/Expression_12.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_13.groovy b/src/test-resources/core/Expression_13.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_13.groovy
rename to src/test-resources/core/Expression_13.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_14.groovy b/src/test-resources/core/Expression_14.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_14.groovy
rename to src/test-resources/core/Expression_14.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_15.groovy b/src/test-resources/core/Expression_15.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_15.groovy
rename to src/test-resources/core/Expression_15.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_16.groovy b/src/test-resources/core/Expression_16.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_16.groovy
rename to src/test-resources/core/Expression_16.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_17.groovy b/src/test-resources/core/Expression_17.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_17.groovy
rename to src/test-resources/core/Expression_17.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_18.groovy b/src/test-resources/core/Expression_18.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_18.groovy
rename to src/test-resources/core/Expression_18.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_19.groovy b/src/test-resources/core/Expression_19.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_19.groovy
rename to src/test-resources/core/Expression_19.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_20.groovy b/src/test-resources/core/Expression_20.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_20.groovy
rename to src/test-resources/core/Expression_20.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_21x.groovy b/src/test-resources/core/Expression_21x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_21x.groovy
rename to src/test-resources/core/Expression_21x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_22x.groovy b/src/test-resources/core/Expression_22x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_22x.groovy
rename to src/test-resources/core/Expression_22x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Expression_23x.groovy b/src/test-resources/core/Expression_23x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Expression_23x.groovy
rename to src/test-resources/core/Expression_23x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/FieldDeclaration_01x.groovy b/src/test-resources/core/FieldDeclaration_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/FieldDeclaration_01x.groovy
rename to src/test-resources/core/FieldDeclaration_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/For_01.groovy b/src/test-resources/core/For_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/For_01.groovy
rename to src/test-resources/core/For_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/For_02.groovy b/src/test-resources/core/For_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/For_02.groovy
rename to src/test-resources/core/For_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/For_03.groovy b/src/test-resources/core/For_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/For_03.groovy
rename to src/test-resources/core/For_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/For_04x.groovy b/src/test-resources/core/For_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/For_04x.groovy
rename to src/test-resources/core/For_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/For_05x.groovy b/src/test-resources/core/For_05x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/For_05x.groovy
rename to src/test-resources/core/For_05x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_01.groovy b/src/test-resources/core/GString_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/GString_01.groovy
rename to src/test-resources/core/GString_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy b/src/test-resources/core/GString_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy
rename to src/test-resources/core/GString_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_03.groovy b/src/test-resources/core/GString_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/GString_03.groovy
rename to src/test-resources/core/GString_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_04.groovy b/src/test-resources/core/GString_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/GString_04.groovy
rename to src/test-resources/core/GString_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_05.groovy b/src/test-resources/core/GString_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/GString_05.groovy
rename to src/test-resources/core/GString_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy b/src/test-resources/core/GString_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy
rename to src/test-resources/core/GString_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy b/src/test-resources/core/Groovydoc_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Groovydoc_01x.groovy
rename to src/test-resources/core/Groovydoc_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy b/src/test-resources/core/IdenticalOp_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/IdenticalOp_01x.groovy
rename to src/test-resources/core/IdenticalOp_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/IfElse_01.groovy b/src/test-resources/core/IfElse_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/IfElse_01.groovy
rename to src/test-resources/core/IfElse_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_01.groovy b/src/test-resources/core/ImportDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_01.groovy
rename to src/test-resources/core/ImportDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_02.groovy b/src/test-resources/core/ImportDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_02.groovy
rename to src/test-resources/core/ImportDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_03.groovy b/src/test-resources/core/ImportDeclaration_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_03.groovy
rename to src/test-resources/core/ImportDeclaration_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_04.groovy b/src/test-resources/core/ImportDeclaration_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_04.groovy
rename to src/test-resources/core/ImportDeclaration_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_05.groovy b/src/test-resources/core/ImportDeclaration_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_05.groovy
rename to src/test-resources/core/ImportDeclaration_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_06.groovy b/src/test-resources/core/ImportDeclaration_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_06.groovy
rename to src/test-resources/core/ImportDeclaration_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_07.groovy b/src/test-resources/core/ImportDeclaration_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_07.groovy
rename to src/test-resources/core/ImportDeclaration_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_08.groovy b/src/test-resources/core/ImportDeclaration_08.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/ImportDeclaration_08.groovy
rename to src/test-resources/core/ImportDeclaration_08.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/InterfaceDeclaration_01.groovy b/src/test-resources/core/InterfaceDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/InterfaceDeclaration_01.groovy
rename to src/test-resources/core/InterfaceDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/InterfaceDeclaration_02.groovy b/src/test-resources/core/InterfaceDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/InterfaceDeclaration_02.groovy
rename to src/test-resources/core/InterfaceDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/InterfaceDeclaration_03.groovy b/src/test-resources/core/InterfaceDeclaration_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/InterfaceDeclaration_03.groovy
rename to src/test-resources/core/InterfaceDeclaration_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Label_01.groovy b/src/test-resources/core/Label_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Label_01.groovy
rename to src/test-resources/core/Label_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy b/src/test-resources/core/Lambda_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Lambda_01x.groovy
rename to src/test-resources/core/Lambda_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/List_01.groovy b/src/test-resources/core/List_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/List_01.groovy
rename to src/test-resources/core/List_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Literal_01.groovy b/src/test-resources/core/Literal_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Literal_01.groovy
rename to src/test-resources/core/Literal_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Literal_02.groovy b/src/test-resources/core/Literal_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Literal_02.groovy
rename to src/test-resources/core/Literal_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy b/src/test-resources/core/Literal_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy
rename to src/test-resources/core/Literal_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_01.groovy b/src/test-resources/core/LocalVariableDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_01.groovy
rename to src/test-resources/core/LocalVariableDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy b/src/test-resources/core/LocalVariableDeclaration_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/LocalVariableDeclaration_02x.groovy
rename to src/test-resources/core/LocalVariableDeclaration_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Map_01.groovy b/src/test-resources/core/Map_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Map_01.groovy
rename to src/test-resources/core/Map_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Map_02x.groovy b/src/test-resources/core/Map_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Map_02x.groovy
rename to src/test-resources/core/Map_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/MethodDeclaration_01.groovy b/src/test-resources/core/MethodDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/MethodDeclaration_01.groovy
rename to src/test-resources/core/MethodDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/MethodDeclaration_02.groovy b/src/test-resources/core/MethodDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/MethodDeclaration_02.groovy
rename to src/test-resources/core/MethodDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/MethodPointer_01x.groovy b/src/test-resources/core/MethodPointer_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/MethodPointer_01x.groovy
rename to src/test-resources/core/MethodPointer_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/MethodReference_01x.groovy b/src/test-resources/core/MethodReference_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/MethodReference_01x.groovy
rename to src/test-resources/core/MethodReference_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/NegativeRelationalOperators_01x.groovy b/src/test-resources/core/NegativeRelationalOperators_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/NegativeRelationalOperators_01x.groovy
rename to src/test-resources/core/NegativeRelationalOperators_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/NegativeRelationalOperators_02x.groovy b/src/test-resources/core/NegativeRelationalOperators_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/NegativeRelationalOperators_02x.groovy
rename to src/test-resources/core/NegativeRelationalOperators_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/NonStaticClass_01x.groovy b/src/test-resources/core/NonStaticClass_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/NonStaticClass_01x.groovy
rename to src/test-resources/core/NonStaticClass_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Number_01x.groovy b/src/test-resources/core/Number_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Number_01x.groovy
rename to src/test-resources/core/Number_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_01.groovy b/src/test-resources/core/PackageDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_01.groovy
rename to src/test-resources/core/PackageDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_02.groovy b/src/test-resources/core/PackageDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_02.groovy
rename to src/test-resources/core/PackageDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_03.groovy b/src/test-resources/core/PackageDeclaration_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_03.groovy
rename to src/test-resources/core/PackageDeclaration_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_04.groovy b/src/test-resources/core/PackageDeclaration_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_04.groovy
rename to src/test-resources/core/PackageDeclaration_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_05.groovy b/src/test-resources/core/PackageDeclaration_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_05.groovy
rename to src/test-resources/core/PackageDeclaration_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_06.groovy b/src/test-resources/core/PackageDeclaration_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/PackageDeclaration_06.groovy
rename to src/test-resources/core/PackageDeclaration_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Return_01.groovy b/src/test-resources/core/Return_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Return_01.groovy
rename to src/test-resources/core/Return_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/SafeChainOperator.groovy b/src/test-resources/core/SafeChainOperator.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/SafeChainOperator.groovy
rename to src/test-resources/core/SafeChainOperator.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy b/src/test-resources/core/SafeIndex_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/SafeIndex_01x.groovy
rename to src/test-resources/core/SafeIndex_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_02x.groovy b/src/test-resources/core/SafeIndex_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/SafeIndex_02x.groovy
rename to src/test-resources/core/SafeIndex_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_03x.groovy b/src/test-resources/core/SafeIndex_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/SafeIndex_03x.groovy
rename to src/test-resources/core/SafeIndex_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/SafeIndex_04x.groovy b/src/test-resources/core/SafeIndex_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/SafeIndex_04x.groovy
rename to src/test-resources/core/SafeIndex_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Script_01x.groovy b/src/test-resources/core/Script_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Script_01x.groovy
rename to src/test-resources/core/Script_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/String_01x.groovy b/src/test-resources/core/String_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/String_01x.groovy
rename to src/test-resources/core/String_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Switch_01.groovy b/src/test-resources/core/Switch_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Switch_01.groovy
rename to src/test-resources/core/Switch_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Synchronized_01.groovy b/src/test-resources/core/Synchronized_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Synchronized_01.groovy
rename to src/test-resources/core/Synchronized_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Throw_01.groovy b/src/test-resources/core/Throw_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Throw_01.groovy
rename to src/test-resources/core/Throw_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_01.groovy b/src/test-resources/core/TraitDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_01.groovy
rename to src/test-resources/core/TraitDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_02.groovy b/src/test-resources/core/TraitDeclaration_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_02.groovy
rename to src/test-resources/core/TraitDeclaration_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_03.groovy b/src/test-resources/core/TraitDeclaration_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_03.groovy
rename to src/test-resources/core/TraitDeclaration_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_04.groovy b/src/test-resources/core/TraitDeclaration_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_04.groovy
rename to src/test-resources/core/TraitDeclaration_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_05.groovy b/src/test-resources/core/TraitDeclaration_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TraitDeclaration_05.groovy
rename to src/test-resources/core/TraitDeclaration_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TryCatch_01.groovy b/src/test-resources/core/TryCatch_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TryCatch_01.groovy
rename to src/test-resources/core/TryCatch_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TryWithResources_01x.groovy b/src/test-resources/core/TryWithResources_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TryWithResources_01x.groovy
rename to src/test-resources/core/TryWithResources_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/TryWithResources_02x.groovy b/src/test-resources/core/TryWithResources_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/TryWithResources_02x.groovy
rename to src/test-resources/core/TryWithResources_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Unicode_01.groovy b/src/test-resources/core/Unicode_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Unicode_01.groovy
rename to src/test-resources/core/Unicode_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/Var_01x.groovy b/src/test-resources/core/Var_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/Var_01x.groovy
rename to src/test-resources/core/Var_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/While_01.groovy b/src/test-resources/core/While_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/While_01.groovy
rename to src/test-resources/core/While_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/core/While_02x.groovy b/src/test-resources/core/While_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/core/While_02x.groovy
rename to src/test-resources/core/While_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_01x.groovy b/src/test-resources/fail/AbstractMethod_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_01x.groovy
rename to src/test-resources/fail/AbstractMethod_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_02x.groovy b/src/test-resources/fail/AbstractMethod_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_02x.groovy
rename to src/test-resources/fail/AbstractMethod_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_03x.groovy b/src/test-resources/fail/AbstractMethod_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_03x.groovy
rename to src/test-resources/fail/AbstractMethod_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_04x.groovy b/src/test-resources/fail/AbstractMethod_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_04x.groovy
rename to src/test-resources/fail/AbstractMethod_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_05x.groovy b/src/test-resources/fail/AbstractMethod_05x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_05x.groovy
rename to src/test-resources/fail/AbstractMethod_05x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_06x.groovy b/src/test-resources/fail/AbstractMethod_06x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AbstractMethod_06x.groovy
rename to src/test-resources/fail/AbstractMethod_06x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/AnnotationDeclaration_01x.groovy b/src/test-resources/fail/AnnotationDeclaration_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/AnnotationDeclaration_01x.groovy
rename to src/test-resources/fail/AnnotationDeclaration_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Array_01x.groovy b/src/test-resources/fail/Array_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Array_01x.groovy
rename to src/test-resources/fail/Array_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Array_02x.groovy b/src/test-resources/fail/Array_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Array_02x.groovy
rename to src/test-resources/fail/Array_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Assert_01x.groovy b/src/test-resources/fail/Assert_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Assert_01x.groovy
rename to src/test-resources/fail/Assert_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Break_01x.groovy b/src/test-resources/fail/Break_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Break_01x.groovy
rename to src/test-resources/fail/Break_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Break_02x.groovy b/src/test-resources/fail/Break_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Break_02x.groovy
rename to src/test-resources/fail/Break_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ClassDeclaration_02x.groovy b/src/test-resources/fail/ClassDeclaration_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ClassDeclaration_02x.groovy
rename to src/test-resources/fail/ClassDeclaration_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_01.groovy b/src/test-resources/fail/ClosureListExpression_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_01.groovy
rename to src/test-resources/fail/ClosureListExpression_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_02.groovy b/src/test-resources/fail/ClosureListExpression_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_02.groovy
rename to src/test-resources/fail/ClosureListExpression_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_03.groovy b/src/test-resources/fail/ClosureListExpression_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_03.groovy
rename to src/test-resources/fail/ClosureListExpression_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_04.groovy b/src/test-resources/fail/ClosureListExpression_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ClosureListExpression_04.groovy
rename to src/test-resources/fail/ClosureListExpression_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/CommandExpression_01x.groovy b/src/test-resources/fail/CommandExpression_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/CommandExpression_01x.groovy
rename to src/test-resources/fail/CommandExpression_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ConstructorDeclaration_01.groovy b/src/test-resources/fail/ConstructorDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ConstructorDeclaration_01.groovy
rename to src/test-resources/fail/ConstructorDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Continue_01x.groovy b/src/test-resources/fail/Continue_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Continue_01x.groovy
rename to src/test-resources/fail/Continue_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Continue_02x.groovy b/src/test-resources/fail/Continue_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Continue_02x.groovy
rename to src/test-resources/fail/Continue_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/DoWhile_01x.groovy b/src/test-resources/fail/DoWhile_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/DoWhile_01x.groovy
rename to src/test-resources/fail/DoWhile_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/DuplicatedNamedParameter_01x.groovy b/src/test-resources/fail/DuplicatedNamedParameter_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/DuplicatedNamedParameter_01x.groovy
rename to src/test-resources/fail/DuplicatedNamedParameter_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/DuplicatedNamedParameter_02x.groovy b/src/test-resources/fail/DuplicatedNamedParameter_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/DuplicatedNamedParameter_02x.groovy
rename to src/test-resources/fail/DuplicatedNamedParameter_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_01.groovy b/src/test-resources/fail/Expression_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_01.groovy
rename to src/test-resources/fail/Expression_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_02.groovy b/src/test-resources/fail/Expression_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_02.groovy
rename to src/test-resources/fail/Expression_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_03.groovy b/src/test-resources/fail/Expression_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_03.groovy
rename to src/test-resources/fail/Expression_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_04.groovy b/src/test-resources/fail/Expression_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_04.groovy
rename to src/test-resources/fail/Expression_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_05.groovy b/src/test-resources/fail/Expression_05.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_05.groovy
rename to src/test-resources/fail/Expression_05.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_06.groovy b/src/test-resources/fail/Expression_06.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_06.groovy
rename to src/test-resources/fail/Expression_06.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_07.groovy b/src/test-resources/fail/Expression_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_07.groovy
rename to src/test-resources/fail/Expression_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_08.groovy b/src/test-resources/fail/Expression_08.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_08.groovy
rename to src/test-resources/fail/Expression_08.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Expression_09.groovy b/src/test-resources/fail/Expression_09.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Expression_09.groovy
rename to src/test-resources/fail/Expression_09.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_01x.groovy b/src/test-resources/fail/FieldDeclaration_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_01x.groovy
rename to src/test-resources/fail/FieldDeclaration_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_02x.groovy b/src/test-resources/fail/FieldDeclaration_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_02x.groovy
rename to src/test-resources/fail/FieldDeclaration_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_03x.groovy b/src/test-resources/fail/FieldDeclaration_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_03x.groovy
rename to src/test-resources/fail/FieldDeclaration_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_04x.groovy b/src/test-resources/fail/FieldDeclaration_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/FieldDeclaration_04x.groovy
rename to src/test-resources/fail/FieldDeclaration_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/For_01.groovy b/src/test-resources/fail/For_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/For_01.groovy
rename to src/test-resources/fail/For_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/For_02.groovy b/src/test-resources/fail/For_02.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/For_02.groovy
rename to src/test-resources/fail/For_02.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Import_01x.groovy b/src/test-resources/fail/Import_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Import_01x.groovy
rename to src/test-resources/fail/Import_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Import_02x.groovy b/src/test-resources/fail/Import_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Import_02x.groovy
rename to src/test-resources/fail/Import_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/InterfaceDeclaration_01.groovy b/src/test-resources/fail/InterfaceDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/InterfaceDeclaration_01.groovy
rename to src/test-resources/fail/InterfaceDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/List_01.groovy b/src/test-resources/fail/List_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/List_01.groovy
rename to src/test-resources/fail/List_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/LocalVariableDeclaration_01.groovy b/src/test-resources/fail/LocalVariableDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/LocalVariableDeclaration_01.groovy
rename to src/test-resources/fail/LocalVariableDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/MethodCall_01x.groovy b/src/test-resources/fail/MethodCall_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/MethodCall_01x.groovy
rename to src/test-resources/fail/MethodCall_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_01.groovy b/src/test-resources/fail/MethodDeclaration_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_01.groovy
rename to src/test-resources/fail/MethodDeclaration_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_02x.groovy b/src/test-resources/fail/MethodDeclaration_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_02x.groovy
rename to src/test-resources/fail/MethodDeclaration_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_03x.groovy b/src/test-resources/fail/MethodDeclaration_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_03x.groovy
rename to src/test-resources/fail/MethodDeclaration_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_04x.groovy b/src/test-resources/fail/MethodDeclaration_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_04x.groovy
rename to src/test-resources/fail/MethodDeclaration_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_05x.groovy b/src/test-resources/fail/MethodDeclaration_05x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/MethodDeclaration_05x.groovy
rename to src/test-resources/fail/MethodDeclaration_05x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Modifier_01x.groovy b/src/test-resources/fail/Modifier_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Modifier_01x.groovy
rename to src/test-resources/fail/Modifier_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Modifier_02x.groovy b/src/test-resources/fail/Modifier_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Modifier_02x.groovy
rename to src/test-resources/fail/Modifier_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Modifier_03x.groovy b/src/test-resources/fail/Modifier_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Modifier_03x.groovy
rename to src/test-resources/fail/Modifier_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Modifier_04x.groovy b/src/test-resources/fail/Modifier_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Modifier_04x.groovy
rename to src/test-resources/fail/Modifier_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Modifier_05x.groovy b/src/test-resources/fail/Modifier_05x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Modifier_05x.groovy
rename to src/test-resources/fail/Modifier_05x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Modifier_07.groovy b/src/test-resources/fail/Modifier_07.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Modifier_07.groovy
rename to src/test-resources/fail/Modifier_07.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/NonStaticClass_01x.groovy b/src/test-resources/fail/NonStaticClass_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/NonStaticClass_01x.groovy
rename to src/test-resources/fail/NonStaticClass_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Number_01x.groovy b/src/test-resources/fail/Number_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Number_01x.groovy
rename to src/test-resources/fail/Number_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Number_02x.groovy b/src/test-resources/fail/Number_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Number_02x.groovy
rename to src/test-resources/fail/Number_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Number_03x.groovy b/src/test-resources/fail/Number_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Number_03x.groovy
rename to src/test-resources/fail/Number_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Number_04x.groovy b/src/test-resources/fail/Number_04x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Number_04x.groovy
rename to src/test-resources/fail/Number_04x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Number_05x.groovy b/src/test-resources/fail/Number_05x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Number_05x.groovy
rename to src/test-resources/fail/Number_05x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ParExpression_01x.groovy b/src/test-resources/fail/ParExpression_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ParExpression_01x.groovy
rename to src/test-resources/fail/ParExpression_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ParExpression_02x.groovy b/src/test-resources/fail/ParExpression_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ParExpression_02x.groovy
rename to src/test-resources/fail/ParExpression_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ParExpression_03x.groovy b/src/test-resources/fail/ParExpression_03x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ParExpression_03x.groovy
rename to src/test-resources/fail/ParExpression_03x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Parentheses_01.groovy b/src/test-resources/fail/Parentheses_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Parentheses_01.groovy
rename to src/test-resources/fail/Parentheses_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/String_01x.groovy b/src/test-resources/fail/String_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/String_01x.groovy
rename to src/test-resources/fail/String_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/String_02x.groovy b/src/test-resources/fail/String_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/String_02x.groovy
rename to src/test-resources/fail/String_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/String_03.groovy b/src/test-resources/fail/String_03.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/String_03.groovy
rename to src/test-resources/fail/String_03.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/String_04.groovy b/src/test-resources/fail/String_04.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/String_04.groovy
rename to src/test-resources/fail/String_04.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Super_01x.groovy b/src/test-resources/fail/Super_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Super_01x.groovy
rename to src/test-resources/fail/Super_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Switch_01.groovy b/src/test-resources/fail/Switch_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Switch_01.groovy
rename to src/test-resources/fail/Switch_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/This_01x.groovy b/src/test-resources/fail/This_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/This_01x.groovy
rename to src/test-resources/fail/This_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/ThreadSafe_01x.groovy b/src/test-resources/fail/ThreadSafe_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/ThreadSafe_01x.groovy
rename to src/test-resources/fail/ThreadSafe_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Trait_01.groovy b/src/test-resources/fail/Trait_01.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Trait_01.groovy
rename to src/test-resources/fail/Trait_01.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/UnaryOperator_01x.groovy b/src/test-resources/fail/UnaryOperator_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/UnaryOperator_01x.groovy
rename to src/test-resources/fail/UnaryOperator_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/UnaryOperator_02x.groovy b/src/test-resources/fail/UnaryOperator_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/UnaryOperator_02x.groovy
rename to src/test-resources/fail/UnaryOperator_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/UnexpectedCharacter_01x.groovy b/src/test-resources/fail/UnexpectedCharacter_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/UnexpectedCharacter_01x.groovy
rename to src/test-resources/fail/UnexpectedCharacter_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/VarArgParameter_01x.groovy b/src/test-resources/fail/VarArgParameter_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/VarArgParameter_01x.groovy
rename to src/test-resources/fail/VarArgParameter_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Var_01x.groovy b/src/test-resources/fail/Var_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Var_01x.groovy
rename to src/test-resources/fail/Var_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Var_02x.groovy b/src/test-resources/fail/Var_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Var_02x.groovy
rename to src/test-resources/fail/Var_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Void_01x.groovy b/src/test-resources/fail/Void_01x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Void_01x.groovy
rename to src/test-resources/fail/Void_01x.groovy
diff --git a/subprojects/parser-antlr4/src/test/resources/fail/Void_02x.groovy b/src/test-resources/fail/Void_02x.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/resources/fail/Void_02x.groovy
rename to src/test-resources/fail/Void_02x.groovy
diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy b/src/test/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
rename to src/test/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy
diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/SyntaxErrorTest.groovy b/src/test/org/apache/groovy/parser/antlr4/SyntaxErrorTest.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/SyntaxErrorTest.groovy
rename to src/test/org/apache/groovy/parser/antlr4/SyntaxErrorTest.groovy
diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy b/src/test/org/apache/groovy/parser/antlr4/TestUtils.groovy
similarity index 98%
rename from subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy
rename to src/test/org/apache/groovy/parser/antlr4/TestUtils.groovy
index 135a180..3310447 100644
--- a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy
+++ b/src/test/org/apache/groovy/parser/antlr4/TestUtils.groovy
@@ -57,7 +57,7 @@ final class TestUtils {
public static final List<Class> COMMON_IGNORE_CLASS_LIST = [AssertStatement, BreakStatement, ConstructorNode, ContinueStatement, ExpressionStatement, FieldNode, ForStatement, GenericsType, IfStatement, MethodNode, PackageNode, Parameter, PropertyNode, ReturnStatement, ThrowStatement, Token, WhileStatement].asUnmodifiable()
- public static final String RESOURCES_PATH = Optional.of('subprojects/parser-antlr4/src/test/resources').filter(path -> new File(path).exists()).orElse('src/test/resources')
+ public static final String RESOURCES_PATH = Optional.of('src/test-resources').filter(path -> new File(path).exists()).orElse('src/test/resources')
static doTest(String path, Collection<Class> ignoreSourcePosition) {
doTest(path, addIgnore(ignoreSourcePosition, ASTComparatorCategory.LOCATION_IGNORE_LIST))
diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/util/ASTComparatorCategory.groovy b/src/test/org/apache/groovy/parser/antlr4/util/ASTComparatorCategory.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/util/ASTComparatorCategory.groovy
rename to src/test/org/apache/groovy/parser/antlr4/util/ASTComparatorCategory.groovy
diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/util/AstDumper.groovy b/src/test/org/apache/groovy/parser/antlr4/util/AstDumper.groovy
similarity index 100%
rename from subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/util/AstDumper.groovy
rename to src/test/org/apache/groovy/parser/antlr4/util/AstDumper.groovy
diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index a90a99b..5325a0c 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -147,9 +147,6 @@ distribution {
}
}
}
- into('subprojects/parser-antlr4') {
- from(file("${project.projectDir}/subprojects/parser-antlr4"))
- }
['xdocs',
'config',
'buildSrc',
diff --git a/subprojects/parser-antlr4/build.gradle b/subprojects/parser-antlr4/build.gradle
deleted file mode 100644
index c6a51ee..0000000
--- a/subprojects/parser-antlr4/build.gradle
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-apply plugin: 'antlr'
-
-sourceSets {
- main {
- antlr {
- srcDirs = ['src/antlr']
- }
- }
-}
-
-def srcBase = "subprojects/parser-antlr4/src"
-def srcMain = "$srcBase/main"
-def srcTest = "$srcBase/test"
-
-tasks.named("generateGrammarSource") {
- maxHeapSize = '1g'
- outputs.cacheIf { true }
- outputDirectory = file("${buildDir}/generated/sources/antlr4")
- sourceSets.main.java.srcDirs += outputDirectory
-
- final PARSER_PACKAGE_NAME = 'org.apache.groovy.parser.antlr4'
- arguments += ["-visitor", "-no-listener", "-package", PARSER_PACKAGE_NAME]
-
- doLast {
- def parserFilePattern = 'Groovy*'
- def outputPath = generateGrammarSource.outputDirectory.canonicalPath
- def parserPackagePath = "${outputPath}/${PARSER_PACKAGE_NAME.replace('.', '/')}"
- file(parserPackagePath).mkdirs()
- copy {
- from outputPath
- into parserPackagePath
- include parserFilePattern
- }
- delete fileTree(outputPath) {
- include parserFilePattern
- }
- }
-}
-
-dependencies {
- antlr "com.tunnelvisionlabs:antlr4:${versions.antlr4}"
- implementation "com.tunnelvisionlabs:antlr4-runtime:${versions.antlr4}"
- testImplementation project(':groovy-test')
-}
-
-sourceSets.main.java.srcDirs += file("$srcMain/java")
-sourceSets.main.groovy.srcDirs += file("$srcMain/groovy")
-sourceSets.main.resources.srcDirs += file("$srcMain/resources")
-sourceSets.test.java.srcDirs += file("$srcTest/java")
-sourceSets.test.groovy.srcDirs += file("$srcTest/groovy")
-sourceSets.test.resources.srcDirs += file("$srcTest/resources")
-
-tasks.withType(Test).configureEach {
- jvmArgs /*"-Dgroovy.attach.groovydoc=true", "-Dgroovy.attach.runtime.groovydoc=true",*/ "-Dgroovy.antlr4.cache.threshold=100"
-}