Fix local testing (#27)

* rename for consistency

* fix build order

* fix remaining v4 names

* fix test sources dir

antlr5-maven-plugin/pom.xml

@@ -110,7 +110,7 @@
         <directory>resources</directory>
       </resource>
     </resources>
-    <testSourceDirectory>src/test</testSourceDirectory>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
     <testResources>
       <testResource>
         <directory>src/test/resources</directory>

antlr5-maven-plugin/src/main/java/org/antlr/mojo/antlr5/Antlr5Mojo.java

@@ -46,7 +46,7 @@
 import java.util.Set;
 
 /**
- * Parses ANTLR 4 grammar files {@code *.g4} and transforms them into Java
+ * Parses ANTLR 5 grammar files {@code *.g4} and transforms them into Java
  * source files.
  *
  * @author Sam Harwell

antlr5-maven-plugin/src/site/apt/examples/libraries.apt.vm

@@ -35,7 +35,7 @@ Libraries
                 <goals>
                     <goal>antlr5</goal>
                 </goals>
-                <libDirectory>src/main/antlr4_imports</libDirectory>
+                <libDirectory>src/main/antlr5_imports</libDirectory>
             </configuration>
         </execution>
     </executions>

antlr5-maven-plugin/src/site/apt/index.apt

@@ -1,12 +1,12 @@
          -------------
-         ANTLR v4 Maven Plugin
+         ANTLR v5 Maven Plugin
          -------------
          Jim Idle
          -------------
          March 2009
          -------------
 
-ANTLR v4 Maven plugin
+ANTLR v5 Maven plugin
 
  The ANTLR v4 Maven plugin is completely re-written as of version 4.0; if you are familiar
  with prior versions, you should note that there are some behavioral differences that make

antlr5-maven-plugin/src/site/apt/usage.apt.vm

@@ -1,6 +1,6 @@
 Usage
 
- The ANTLR 4 plugin for Maven can generate parsers for any number of grammars in
+ The ANTLR 5 plugin for Maven can generate parsers for any number of grammars in
  your project.
 
 * Compiling Grammars into Parsers

antlr5-maven-plugin/src/site/site.xml

@@ -6,7 +6,7 @@
   ~ can be found in the LICENSE.txt file in the project root.
   -->
 
-<project name="ANTLR v4 Maven plugin">
+<project name="ANTLR v5 Maven plugin">
 
   <publishDate position="left"/>
   <version position="left"/>

antlr5-maven-plugin/src/test/java/org/antlr/mojo/antlr5/Antlr5MojoTest.java

@@ -330,7 +330,7 @@ public void processWhenDependencyRemoved() throws Exception {
             Files.delete(baseGrammar);
 
             thrown.expect(MojoExecutionException.class);
-            thrown.expectMessage("ANTLR 4 caught 1 build errors.");
+            thrown.expectMessage("ANTLR 5 caught 1 build errors.");
 
             maven.executeMojo(session, project, exec);
         }

pom.xml

@@ -78,11 +78,11 @@
 
 	<modules>
 		<module>runtime/Java</module>
+        <module>runtime/Kotlin</module>
 		<module>tool</module>
 		<module>antlr5-maven-plugin</module>
 		<module>tool-testsuite</module>
 		<module>runtime-testsuite</module>
-        <module>runtime/Kotlin</module>
 	</modules>
 
 	<properties>

runtime-testsuite/test/org/antlr/v5/test/runtime/kotlin/commonTest/org/antlr/v4/kotlinruntime/BitSetTest.kt → runtime-testsuite/test/org/antlr/v5/test/runtime/kotlin/commonTest/org/antlr/v5/runtime/kotlin/BitSetTest.kt

@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.test.runtime.kotlin.commonTest.org.antlr.v4.kotlinruntime
+package org.antlr.v5.test.runtime.kotlin.commonTest.org.antlr.v5.runtime.kotlin
 
 import org.antlr.v5.runtime.kotlin.jvm.BitSet
 import org.junit.jupiter.api.Test