Merge branch 'release/6.2.0'

valtech · Jan 31, 2023 · 131f59f · 131f59f
2 parents 3419301 + f8c026d
commit 131f59f
Show file tree

Hide file tree

Showing 39 changed files with 893 additions and 503 deletions.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -4,5 +4,4 @@ queries:
   - uses: security-and-quality
 
 paths-ignore:
-  - '**/ui.apps.groovyconsole/**/*.*'
   - '**/target/**/*.*'
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -47,3 +47,4 @@ BSD:
 
 asciitable, ascii-utf-themes, skb-interfaces, char-translation: Apache-2.0
 antlr-runtime, antlr4, stringtemplate:                          BSD
+groovy-console:                                                 Apache-2.0
diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,6 @@
+2023-01-27 6.2.0
+  - Use Orbinson Groovy Console instead of CID15 one
+
 2022-12-05 6.1.0
   - Added history search to AEM Cloud
 

diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ See COPYRIGHT for complete list of licenses.
 
 MIT License
 
-Copyright (c) 2018 - 2022 Valtech GmbH
+Copyright (c) 2018 - 2023 Valtech GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Readme.md b/Readme.md
@@ -2,7 +2,7 @@
 
 # AEM Easy Content Upgrade (AECU)
 
-AECU simplifies content migrations by executing migration scripts during package installation. It is built on top of [Groovy Console](https://github.com/CID15/aem-groovy-console).
+AECU simplifies content migrations by executing migration scripts during package installation. It is built on top of [Groovy Console](https://github.com/orbinson/aem-groovy-console).
 
 
 Features:
@@ -75,13 +75,13 @@ For AEM 6.3/6.4 please see here what versions are compatible. Groovy Console can
 
 ## AEM 6.5 and AEM Cloud
 
-AECU includes the [Groovy Console](https://github.com/OlsonDigital/aem-groovy-console) package. Please do not install
+AECU includes the [Groovy Console](https://github.com/orbinson/aem-groovy-console) package. Please do not install
 Groovy Console manually. The API is not stable and using the included version makes sure AECU and Groovy Console
 are compatible.
 
 ### AEM 6.5
 
-You can download the package from [Maven Central](https://repo1.maven.org/maven2/de/valtech/aecu/aecu.complete/) or our [releases section](https://github.com/valtech/aem-easy-content-upgrade/releases). The aecu.complete package will install the AECU software and [Groovy Console](https://github.com/OlsonDigital/aem-groovy-console).
+You can download the package from [Maven Central](https://repo1.maven.org/maven2/de/valtech/aecu/aecu.complete/) or our [releases section](https://github.com/valtech/aem-easy-content-upgrade/releases). The aecu.complete package will install the AECU software and [Groovy Console](https://github.com/orbinson/aem-groovy-console).
 
 ```xml
         <dependency>
@@ -94,7 +94,7 @@ You can download the package from [Maven Central](https://repo1.maven.org/maven2
 
 ### AEM Cloud
 
-You can download the package from [Maven Central](https://repo1.maven.org/maven2/de/valtech/aecu/aecu.complete.cloud/) or our [releases section](https://github.com/valtech/aem-easy-content-upgrade/releases). The aecu.complete package will install the AECU software and [Groovy Console](https://github.com/OlsonDigital/aem-groovy-console).
+You can download the package from [Maven Central](https://repo1.maven.org/maven2/de/valtech/aecu/aecu.complete.cloud/) or our [releases section](https://github.com/valtech/aem-easy-content-upgrade/releases). The aecu.complete package will install the AECU software and [Groovy Console](https://github.com/orbinson/aem-groovy-console).
 
 ```xml
         <dependency>
@@ -169,7 +169,7 @@ All migration scripts need to be located in:
 AEM as a Cloud Service requires the scripts to be executed automatically in /apps to avoid issues with the startup hook. Manual scripts can still be located in /conf.
 
 In this folder you can create an unlimited number of folders and files. E.g. organize your files by project or deployment.
-The content of the scripts is plain Groovy code that can be run via [Groovy Console](https://github.com/OlsonDigital/aem-groovy-console).
+The content of the scripts is plain Groovy code that can be run via [Groovy Console](https://github.com/orbinson/aem-groovy-console).
 
 If your package containing the scripts is bundled in another package please make sure that this is done using "subPackages" in pom.xml.
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.1.0</version>
+        <version>6.2.0</version>
     </parent>
 
     <artifactId>aecu.api</artifactId>

diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml
@@ -4,9 +4,9 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.1.0</version>
+        <version>6.2.0</version>
     </parent>
-    
+
     <artifactId>aecu.cloud.startup.hook</artifactId>
     <packaging>bundle</packaging>
     <name>AECU - Cloud Startup Hook</name>
@@ -28,44 +28,44 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-						            <Import-Package>
-                          javax.annotation;version=0.0.0,
-						              com.icfolson.aem.groovy.console.*;version="[15.1,17)",
-						              *
-  					            </Import-Package>
+                        <Import-Package>
+                            javax.annotation;version=0.0.0,
+                            be.orbinson.aem.groovy.console.*;version="[15.1,19)",
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <executions>
-				          <execution>
-				            <id>prepare-agent</id>
-				            <goals>
-				              <goal>prepare-agent</goal>
-				            </goals>
-				          </execution>
-				          <execution>
-				            <id>report</id>
-				            <phase>prepare-package</phase>
-				            <goals>
-				              <goal>report</goal>
-				            </goals>
-				          </execution>
-				          <execution>
-				            <id>post-unit-test</id>
-				            <phase>test</phase>
-				            <goals>
-				              <goal>report</goal>
-				            </goals>
-				          </execution>
-				        </executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
-		            <groupId>org.owasp</groupId>
-		            <artifactId>dependency-check-maven</artifactId>
-            </plugin>            
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+            </plugin>
         </plugins>
     </build>
 
@@ -80,8 +80,8 @@
             <artifactId>groovy-all</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.icfolson.aem.groovy.console</groupId>
-            <artifactId>aem-groovy-console</artifactId>
+            <groupId>be.orbinson.aem</groupId>
+            <artifactId>aem-groovy-console-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -119,11 +119,11 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.api</artifactId>
         </dependency>
-				<dependency>
-				    <groupId>javax.annotation</groupId>
-				    <artifactId>javax.annotation-api</artifactId>
-				</dependency>
-        
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bart Senn and Valtech GmbH
+ * Copyright 2022 Bart Thierens and Valtech GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
  * associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -38,7 +38,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.icfolson.aem.groovy.console.api.BindingExtensionProvider;
+import be.orbinson.aem.groovy.console.api.BindingExtensionProvider;
 
 import de.valtech.aecu.api.service.AecuException;
 import de.valtech.aecu.api.service.AecuService;
@@ -54,7 +54,7 @@ public class AecuCloudStartupService {
     private static final String STAR_IMPORT_EXTENSION_PROVIDER = "StarImportExtensionProvider";
     private static final String BINDING_EXTENSION_PROVIDER = "BindingExtensionProvider";
     private static final String DEFAULT_EXTENSION_SERVICE =
-            "com.icfolson.aem.groovy.console.extension.impl.DefaultExtensionService";
+            "be.orbinson.aem.groovy.console.extension.impl.DefaultExtensionService";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AecuCloudStartupService.class);
 
@@ -188,4 +188,3 @@ private ResourceResolver getResourceResolver() {
     }
 
 }
-
diff --git a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/RuntimeHelper.java b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/RuntimeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bart Senn and Valtech GmbH
+ * Copyright 2022 Bart Thierens and Valtech GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
  * associated documentation files (the "Software"), to deal in the Software without restriction,

diff --git a/...d.startup.hook/src/test/java/de/valtech/aecu/startuphook/AecuCloudStartupServiceTest.java b/...d.startup.hook/src/test/java/de/valtech/aecu/startuphook/AecuCloudStartupServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bart Senn and Valtech GmbH
+ * Copyright 2022 Bart Thierens and Valtech GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
  * associated documentation files (the "Software"), to deal in the Software without restriction,

diff --git a/cloud.startup.hook/src/test/java/de/valtech/aecu/startuphook/RuntimeHelperTest.java b/cloud.startup.hook/src/test/java/de/valtech/aecu/startuphook/RuntimeHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bart Senn and Valtech GmbH
+ * Copyright 2022 Bart Thierens and Valtech GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
  * associated documentation files (the "Software"), to deal in the Software without restriction,

diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.valtech.aecu</groupId>
         <artifactId>aecu</artifactId>
-        <version>6.1.0</version>
+        <version>6.2.0</version>
     </parent>
 
     <artifactId>aecu.complete.cloud</artifactId>
@@ -24,8 +24,6 @@
                 <configuration>
                     <allowIndexDefinitions>true</allowIndexDefinitions>
                     <embeddedTarget>/apps/valtech/aecu-complete/install/</embeddedTarget>
-                    <verbose>true</verbose>
-                    <failOnError>true</failOnError>
                     <group>Valtech</group>
                     <packageType>container</packageType>
                     <skipSubPackageValidation>true</skipSubPackageValidation>
@@ -51,26 +49,15 @@
                             <target>/apps/valtech/aecu-complete/install/27</target>
                         </embedded>
                         <embedded>
-                            <groupId>com.icfolson.aem.groovy.console</groupId>
-                            <artifactId>aem-groovy-console</artifactId>
-                            <type>jar</type>
-                        </embedded>
-                        <embedded>
-                            <groupId>org.codehaus.groovy</groupId>
-                            <artifactId>groovy-all</artifactId>
-                        </embedded>
-                        <embedded>
-                            <groupId>com.icfolson.aem.groovy.extension</groupId>
-                            <artifactId>aem-groovy-extension-bundle</artifactId>
+                            <groupId>be.orbinson.aem</groupId>
+                            <artifactId>aem-groovy-console-all</artifactId>
+                            <type>zip</type>
+                            <filter>true</filter>
                         </embedded>
                         <embedded>
                             <groupId>de.valtech.aecu</groupId>
                             <artifactId>aecu.ui.apps</artifactId>
                         </embedded>
-                        <embedded>
-                            <groupId>de.valtech.aecu</groupId>
-                            <artifactId>aecu.ui.apps.groovyconsole</artifactId>
-                        </embedded>
                         <embedded>
                             <groupId>de.valtech.aecu</groupId>
                             <artifactId>aecu.ui.content</artifactId>
@@ -92,34 +79,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.icfolson.aem.groovy.console</groupId>
-            <artifactId>aem-groovy-console</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.icfolson.aem.groovy.console</groupId>
-            <artifactId>aem-groovy-console</artifactId>
+            <groupId>be.orbinson.aem</groupId>
+            <artifactId>aem-groovy-console-all</artifactId>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.icfolson.aem.groovy.extension</groupId>
-            <artifactId>aem-groovy-extension-bundle</artifactId>
-        </dependency>
         <dependency>
             <groupId>de.valtech.aecu</groupId>
             <artifactId>aecu.ui.apps</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>de.valtech.aecu</groupId>
-            <artifactId>aecu.ui.apps.groovyconsole</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
         <dependency>
             <groupId>de.valtech.aecu</groupId>
             <artifactId>aecu.ui.content</artifactId>
@@ -148,4 +117,67 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <profiles>
+
+        <profile>
+            <id>autoInstallPackageCloud</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>com.day.jcr.vault</groupId>
+                            <artifactId>content-package-maven-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>install-package</id>
+                                    <goals>
+                                        <goal>install</goal>
+                                    </goals>
+                                    <configuration>
+                                        <targetURL>http://${aem.host}:${aem.port}/crx/packmgr/service.jsp</targetURL>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+        <profile>
+            <id>autoInstallPackagePublishCloud</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>com.day.jcr.vault</groupId>
+                            <artifactId>content-package-maven-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>install-package-publish</id>
+                                    <goals>
+                                        <goal>install</goal>
+                                    </goals>
+                                    <configuration>
+                                        <targetURL>http://${aem.publish.host}:${aem.publish.port}/crx/packmgr/service.jsp
+                                        </targetURL>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+
+    </profiles>
+
+
 </project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,4 @@ BSD:

		asciitable, ascii-utf-themes, skb-interfaces, char-translation: Apache-2.0
		antlr-runtime, antlr4, stringtemplate: BSD
		groovy-console: Apache-2.0