Merge pull request #527 from mattirn/groovy-commands

Groovy commands
jline · Apr 28, 2020 · f152998 · f152998
2 parents d53681a + 7f26344
commit f152998
Show file tree

Hide file tree

Showing 34 changed files with 2,126 additions and 1,319 deletions.
diff --git a/builtins/pom.xml b/builtins/pom.xml
@@ -62,33 +62,31 @@
                     <execution>
                         <id>default-compile</id>
                         <configuration>
-                            <excludes>
-                                <exclude>**/TTop.java</exclude>
-                                <exclude>**/Builtins.java</exclude>
-                            </excludes>
+                            <includes>
+                                <include>**/ConsoleEngineImpl.java</include>
+                                <include>**/TTop.java</include>
+                            </includes>
                             <compilerArgs>
                                 <arg>-Xlint:all,-options</arg>
                                 <arg>-Werror</arg>
-                                <arg>-profile</arg>  <!-- mrn 27/01/2020 -->
-                                <arg>compact3</arg>  <!-- after adding jline-groovy also TTop.java started compiling here although exclusion!! -->
-                            </compilerArgs>          <!-- changed arg compact1 to compact3 to over come compiling errors -->
+                            </compilerArgs>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>noncompact</id>
+                        <id>compact</id>
                         <goals>
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <includes>
-                                <include>**/TTop.java</include>
-                                <include>**/Builtins.java</include>
-                            </includes>
+                            <excludes>
+                                <exclude>**/ConsoleEngineImpl.java</exclude>
+                                <exclude>**/TTop.java</exclude>
+                            </excludes>
                             <compilerArgs>
                                 <arg>-Xlint:all,-options</arg>
                                 <arg>-Werror</arg>
                                 <arg>-profile</arg>
-                                <arg>compact3</arg>
+                                <arg>compact1</arg>
                             </compilerArgs>
                         </configuration>
                     </execution>