svn commit: r1767008 - in /jackrabbit/oak/trunk/oak-run: pom.xml src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy

[ch...@apache.org]

Author: chetanm
Date: Fri Oct 28 11:47:58 2016
New Revision: 1767008

URL: http://svn.apache.org/viewvc?rev=1767008&view=rev
Log:
OAK-5032 - Update Groovy version in oak-run to 2.4.7

-- Switched to gmaven-plus plugin as gmaven does not work with new Groovy version
-- Switched to 'indy' release to make use of invokedynamic support
-- Updated jline to latest release

Modified:
    jackrabbit/oak/trunk/oak-run/pom.xml
    jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy

Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1767008&r1=1767007&r2=1767008&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Fri Oct 28 11:47:58 2016
@@ -32,7 +32,7 @@
 
   <properties>
     <jetty.version>8.1.2.v20120308</jetty.version>
-    <groovy.version>2.3.1</groovy.version>
+    <groovy.version>2.4.7</groovy.version>
   </properties>
 
   <build>
@@ -52,31 +52,23 @@
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <version>1.4</version>
-        <!--suppress MavenModelInspection -->
-        <configuration>
-          <providerSelection>2.0</providerSelection>
-          <sourceEncoding>UTF-8</sourceEncoding>
-        </configuration>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.5</version>
         <executions>
           <execution>
             <goals>
+              <goal>addSources</goal>
+              <goal>addTestSources</goal>
               <goal>generateStubs</goal>
               <goal>compile</goal>
-              <goal>generateTestStubs</goal>
+              <goal>testGenerateStubs</goal>
               <goal>testCompile</goal>
+              <goal>removeStubs</goal>
+              <goal>removeTestStubs</goal>
             </goals>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>${groovy.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -362,11 +354,12 @@
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
       <version>${groovy.version}</version>
+      <classifier>indy</classifier>
     </dependency>
     <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
-      <version>2.11</version>
+      <version>2.14.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

Modified: jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy?rev=1767008&r1=1767007&r2=1767008&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy Fri Oct 28 11:47:58 2016
@@ -65,7 +65,7 @@ class GroovyConsole {
     }
 
     int run(){
-        shell.run()
+        shell.run(null, null)
     }
 
     int execute(List<String> args){
@@ -139,14 +139,13 @@ class GroovyConsole {
 
     private class OakSh extends Groovysh {
         private boolean colored = false
-        private final AnsiRenderer prompt = new AnsiRenderer()
 
         OakSh(ClassLoader classLoader, Binding binding, IO io, Closure registrar) {
             super(classLoader, binding, io, registrar)
         }
 
         public String renderPrompt() {
-            return prompt.render( buildPrompt() )
+            return AnsiRenderer.render( buildPrompt() )
         }
 
         //Following methods are copied because they are private in parent however
@@ -179,8 +178,8 @@ class GroovyConsole {
         }
 
         @CompileStatic(TypeCheckingMode.SKIP)
-        private void maybeRecordError(Throwable cause) {
-            def record = registry[RecordCommand.COMMAND_NAME]
+        protected void maybeRecordError(Throwable cause) {
+            RecordCommand record = registry[RecordCommand.COMMAND_NAME]
 
             if (record != null) {
                 boolean sanitize = Preferences.sanitizeStackTrace
@@ -226,8 +225,7 @@ class GroovyConsole {
                     // Setup the interactive runner
                     runner = new InteractiveShellRunner(
                             this,
-                            this.&renderPrompt as Closure,
-                            Integer.valueOf(Preferences.get(METACLASS_COMPLETION_PREFIX_LENGTH_PREFERENCE_KEY, '3')))
+                            this.&renderPrompt as Closure)
 
                     // Setup the history
                     File histFile = new File(userStateDirectory, 'groovysh.history')