Use the new groovy console version

samples/groovy-package/README.md

@@ -4,18 +4,17 @@
 
 - executing Groovy scripts within an AEM environment
 - the provided context includes many helper methods, Groovy extension methods and a DSL to create content
-- see [https://github.com/Citytechinc/cq-groovy-console] for a complete list of features
+- see [https://github.com/orbinson/aem-groovy-console] for a complete list of features
 
 ## Dependencies
 
-This execution uses one of the following dependencies in any version greater or equals then 7 
+This execution uses one of the following dependencies in any version greater or equals then 18 
 
-- `com.citytechinc.aem.groovy.console:aem-groovy-console`
-- `com.icfolson.aem.groovy.console:aem-groovy-console`
+- `be.orbinson.aem:aem-groovy-console`
 
 Make sure the included bundles are installed and activated correctly and the `GroovyConsoleService` is active.
 
-Because of Groovy Console's compatibility and it's package naming changes, for AEM 6.0/6.1 branch [groovy-console-v8](https://github.com/Netcentric/vault-upgrade-hook/tree/groovy-console-v8]groovy-console-v8) should be used.
+This version is only supported in AEM 6.5 or AEMaaCS
 
 ## Usage
 

vault-upgrade-hook/pom.xml

@@ -113,17 +113,10 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.icfolson.aem.groovy.console</groupId>
-            <artifactId>aem-groovy-console</artifactId>
-            <version>15.1.0</version>
+            <groupId>be.orbinson.aem</groupId>
+            <artifactId>aem-groovy-console-api</artifactId>
+            <version>18.0.3</version>
             <optional>true</optional>
-            <!-- some of the transitive dependencies are provided in non publically available versions -->
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

vault-upgrade-hook/src/main/java/biz/netcentric/vlt/upgrade/handler/groovy/GroovyConsoleHandler.java

@@ -15,9 +15,9 @@
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
+import be.orbinson.aem.groovy.console.GroovyConsoleService;
 import org.apache.jackrabbit.vault.packaging.InstallContext;
 
-import com.icfolson.aem.groovy.console.GroovyConsoleService;
 
 import biz.netcentric.vlt.upgrade.UpgradeAction;
 import biz.netcentric.vlt.upgrade.UpgradeInfo;

vault-upgrade-hook/src/main/java/biz/netcentric/vlt/upgrade/handler/groovy/GroovyScript.java

@@ -11,12 +11,12 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import be.orbinson.aem.groovy.console.GroovyConsoleService;
+import be.orbinson.aem.groovy.console.api.context.ScriptContext;
+import be.orbinson.aem.groovy.console.response.RunScriptResponse;
 import org.apache.jackrabbit.vault.packaging.InstallContext;
 import org.apache.jackrabbit.vault.packaging.InstallContext.Phase;
 
-import com.icfolson.aem.groovy.console.GroovyConsoleService;
-import com.icfolson.aem.groovy.console.api.context.ScriptContext;
-import com.icfolson.aem.groovy.console.response.RunScriptResponse;
 
 import biz.netcentric.vlt.upgrade.UpgradeAction;
 import biz.netcentric.vlt.upgrade.handler.OsgiUtil.ServiceWrapper;

vault-upgrade-hook/src/main/java/biz/netcentric/vlt/upgrade/handler/groovy/UpgradeHookScriptContext.java

@@ -3,9 +3,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
+import be.orbinson.aem.groovy.console.api.context.ScriptContext;
 import org.apache.sling.api.resource.ResourceResolver;
 
-import com.icfolson.aem.groovy.console.api.context.ScriptContext;
 
 public class UpgradeHookScriptContext implements ScriptContext {
 

vault-upgrade-hook/src/test/java/biz/netcentric/vlt/upgrade/handler/groovy/GroovyConsoleHandlerTest.java

@@ -19,6 +19,7 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import be.orbinson.aem.groovy.console.GroovyConsoleService;
 import org.apache.jackrabbit.vault.packaging.impl.InstallContextImpl;
 import org.apache.sling.testing.mock.sling.ResourceResolverType;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -29,8 +30,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 
-import com.icfolson.aem.groovy.console.GroovyConsoleService;
-
 import biz.netcentric.vlt.upgrade.UpgradeAction;
 import biz.netcentric.vlt.upgrade.UpgradeInfo;
 import biz.netcentric.vlt.upgrade.handler.OsgiUtil;