Skip to content

Commit 131f59f

Browse files
gruberrolandvaltechgruberrolandvaltech
committed
Merge branch 'release/6.2.0'
2 parents 3419301 + f8c026d commit 131f59f

File tree

39 files changed

+893
-503
lines changed

39 files changed

+893
-503
lines changed

‎.github/codeql/codeql-config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ queries:
44
- uses: security-and-quality
55

66
paths-ignore:
7-
- '**/ui.apps.groovyconsole/**/*.*'
87
- '**/target/**/*.*'

‎COPYRIGHT

+1
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ BSD:
4747

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

‎HISTORY

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2023-01-27 6.2.0
2+
- Use Orbinson Groovy Console instead of CID15 one
3+
14
2022-12-05 6.1.0
25
- Added history search to AEM Cloud
36

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ See COPYRIGHT for complete list of licenses.
22

33
MIT License
44

5-
Copyright (c) 2018 - 2022 Valtech GmbH
5+
Copyright (c) 2018 - 2023 Valtech GmbH
66

77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal

‎Readme.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# AEM Easy Content Upgrade (AECU)
44

5-
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).
5+
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).
66

77

88
Features:
@@ -75,13 +75,13 @@ For AEM 6.3/6.4 please see here what versions are compatible. Groovy Console can
7575

7676
## AEM 6.5 and AEM Cloud
7777

78-
AECU includes the [Groovy Console](https://github.com/OlsonDigital/aem-groovy-console) package. Please do not install
78+
AECU includes the [Groovy Console](https://github.com/orbinson/aem-groovy-console) package. Please do not install
7979
Groovy Console manually. The API is not stable and using the included version makes sure AECU and Groovy Console
8080
are compatible.
8181

8282
### AEM 6.5
8383

84-
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).
84+
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).
8585

8686
```xml
8787
<dependency>
@@ -94,7 +94,7 @@ You can download the package from [Maven Central](https://repo1.maven.org/maven2
9494

9595
### AEM Cloud
9696

97-
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).
97+
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).
9898

9999
```xml
100100
<dependency>
@@ -169,7 +169,7 @@ All migration scripts need to be located in:
169169
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.
170170

171171
In this folder you can create an unlimited number of folders and files. E.g. organize your files by project or deployment.
172-
The content of the scripts is plain Groovy code that can be run via [Groovy Console](https://github.com/OlsonDigital/aem-groovy-console).
172+
The content of the scripts is plain Groovy code that can be run via [Groovy Console](https://github.com/orbinson/aem-groovy-console).
173173

174174
If your package containing the scripts is bundled in another package please make sure that this is done using "subPackages" in pom.xml.
175175

‎api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.valtech.aecu</groupId>
66
<artifactId>aecu</artifactId>
7-
<version>6.1.0</version>
7+
<version>6.2.0</version>
88
</parent>
99

1010
<artifactId>aecu.api</artifactId>

‎cloud.startup.hook/pom.xml

+38-38
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<parent>
55
<groupId>de.valtech.aecu</groupId>
66
<artifactId>aecu</artifactId>
7-
<version>6.1.0</version>
7+
<version>6.2.0</version>
88
</parent>
9-
9+
1010
<artifactId>aecu.cloud.startup.hook</artifactId>
1111
<packaging>bundle</packaging>
1212
<name>AECU - Cloud Startup Hook</name>
@@ -28,44 +28,44 @@
2828
<extensions>true</extensions>
2929
<configuration>
3030
<instructions>
31-
<Import-Package>
32-
javax.annotation;version=0.0.0,
33-
com.icfolson.aem.groovy.console.*;version="[15.1,17)",
34-
*
35-
</Import-Package>
31+
<Import-Package>
32+
javax.annotation;version=0.0.0,
33+
be.orbinson.aem.groovy.console.*;version="[15.1,19)",
34+
*
35+
</Import-Package>
3636
</instructions>
3737
</configuration>
3838
</plugin>
3939
<plugin>
4040
<groupId>org.jacoco</groupId>
4141
<artifactId>jacoco-maven-plugin</artifactId>
4242
<executions>
43-
<execution>
44-
<id>prepare-agent</id>
45-
<goals>
46-
<goal>prepare-agent</goal>
47-
</goals>
48-
</execution>
49-
<execution>
50-
<id>report</id>
51-
<phase>prepare-package</phase>
52-
<goals>
53-
<goal>report</goal>
54-
</goals>
55-
</execution>
56-
<execution>
57-
<id>post-unit-test</id>
58-
<phase>test</phase>
59-
<goals>
60-
<goal>report</goal>
61-
</goals>
62-
</execution>
63-
</executions>
43+
<execution>
44+
<id>prepare-agent</id>
45+
<goals>
46+
<goal>prepare-agent</goal>
47+
</goals>
48+
</execution>
49+
<execution>
50+
<id>report</id>
51+
<phase>prepare-package</phase>
52+
<goals>
53+
<goal>report</goal>
54+
</goals>
55+
</execution>
56+
<execution>
57+
<id>post-unit-test</id>
58+
<phase>test</phase>
59+
<goals>
60+
<goal>report</goal>
61+
</goals>
62+
</execution>
63+
</executions>
6464
</plugin>
6565
<plugin>
66-
<groupId>org.owasp</groupId>
67-
<artifactId>dependency-check-maven</artifactId>
68-
</plugin>
66+
<groupId>org.owasp</groupId>
67+
<artifactId>dependency-check-maven</artifactId>
68+
</plugin>
6969
</plugins>
7070
</build>
7171

@@ -80,8 +80,8 @@
8080
<artifactId>groovy-all</artifactId>
8181
</dependency>
8282
<dependency>
83-
<groupId>com.icfolson.aem.groovy.console</groupId>
84-
<artifactId>aem-groovy-console</artifactId>
83+
<groupId>be.orbinson.aem</groupId>
84+
<artifactId>aem-groovy-console-api</artifactId>
8585
</dependency>
8686
<dependency>
8787
<groupId>org.osgi</groupId>
@@ -119,11 +119,11 @@
119119
<groupId>org.apache.sling</groupId>
120120
<artifactId>org.apache.sling.models.api</artifactId>
121121
</dependency>
122-
<dependency>
123-
<groupId>javax.annotation</groupId>
124-
<artifactId>javax.annotation-api</artifactId>
125-
</dependency>
126-
122+
<dependency>
123+
<groupId>javax.annotation</groupId>
124+
<artifactId>javax.annotation-api</artifactId>
125+
</dependency>
126+
127127
<dependency>
128128
<groupId>org.apache.commons</groupId>
129129
<artifactId>commons-lang3</artifactId>

‎cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Bart Senn and Valtech GmbH
2+
* Copyright 2022 Bart Thierens and Valtech GmbH
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
55
* associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -38,7 +38,7 @@
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;
4040

41-
import com.icfolson.aem.groovy.console.api.BindingExtensionProvider;
41+
import be.orbinson.aem.groovy.console.api.BindingExtensionProvider;
4242

4343
import de.valtech.aecu.api.service.AecuException;
4444
import de.valtech.aecu.api.service.AecuService;
@@ -54,7 +54,7 @@ public class AecuCloudStartupService {
5454
private static final String STAR_IMPORT_EXTENSION_PROVIDER = "StarImportExtensionProvider";
5555
private static final String BINDING_EXTENSION_PROVIDER = "BindingExtensionProvider";
5656
private static final String DEFAULT_EXTENSION_SERVICE =
57-
"com.icfolson.aem.groovy.console.extension.impl.DefaultExtensionService";
57+
"be.orbinson.aem.groovy.console.extension.impl.DefaultExtensionService";
5858

5959
private static final Logger LOGGER = LoggerFactory.getLogger(AecuCloudStartupService.class);
6060

@@ -188,4 +188,3 @@ private ResourceResolver getResourceResolver() {
188188
}
189189

190190
}
191-

‎cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/RuntimeHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Bart Senn and Valtech GmbH
2+
* Copyright 2022 Bart Thierens and Valtech GmbH
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
55
* associated documentation files (the "Software"), to deal in the Software without restriction,

‎cloud.startup.hook/src/test/java/de/valtech/aecu/startuphook/AecuCloudStartupServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Bart Senn and Valtech GmbH
2+
* Copyright 2022 Bart Thierens and Valtech GmbH
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
55
* associated documentation files (the "Software"), to deal in the Software without restriction,

‎cloud.startup.hook/src/test/java/de/valtech/aecu/startuphook/RuntimeHelperTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Bart Senn and Valtech GmbH
2+
* Copyright 2022 Bart Thierens and Valtech GmbH
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
55
* associated documentation files (the "Software"), to deal in the Software without restriction,

‎complete-cloud/pom.xml

+70-38
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>de.valtech.aecu</groupId>
77
<artifactId>aecu</artifactId>
8-
<version>6.1.0</version>
8+
<version>6.2.0</version>
99
</parent>
1010

1111
<artifactId>aecu.complete.cloud</artifactId>
@@ -24,8 +24,6 @@
2424
<configuration>
2525
<allowIndexDefinitions>true</allowIndexDefinitions>
2626
<embeddedTarget>/apps/valtech/aecu-complete/install/</embeddedTarget>
27-
<verbose>true</verbose>
28-
<failOnError>true</failOnError>
2927
<group>Valtech</group>
3028
<packageType>container</packageType>
3129
<skipSubPackageValidation>true</skipSubPackageValidation>
@@ -51,26 +49,15 @@
5149
<target>/apps/valtech/aecu-complete/install/27</target>
5250
</embedded>
5351
<embedded>
54-
<groupId>com.icfolson.aem.groovy.console</groupId>
55-
<artifactId>aem-groovy-console</artifactId>
56-
<type>jar</type>
57-
</embedded>
58-
<embedded>
59-
<groupId>org.codehaus.groovy</groupId>
60-
<artifactId>groovy-all</artifactId>
61-
</embedded>
62-
<embedded>
63-
<groupId>com.icfolson.aem.groovy.extension</groupId>
64-
<artifactId>aem-groovy-extension-bundle</artifactId>
52+
<groupId>be.orbinson.aem</groupId>
53+
<artifactId>aem-groovy-console-all</artifactId>
54+
<type>zip</type>
55+
<filter>true</filter>
6556
</embedded>
6657
<embedded>
6758
<groupId>de.valtech.aecu</groupId>
6859
<artifactId>aecu.ui.apps</artifactId>
6960
</embedded>
70-
<embedded>
71-
<groupId>de.valtech.aecu</groupId>
72-
<artifactId>aecu.ui.apps.groovyconsole</artifactId>
73-
</embedded>
7461
<embedded>
7562
<groupId>de.valtech.aecu</groupId>
7663
<artifactId>aecu.ui.content</artifactId>
@@ -92,34 +79,16 @@
9279

9380
<dependencies>
9481
<dependency>
95-
<groupId>com.icfolson.aem.groovy.console</groupId>
96-
<artifactId>aem-groovy-console</artifactId>
97-
</dependency>
98-
<dependency>
99-
<groupId>com.icfolson.aem.groovy.console</groupId>
100-
<artifactId>aem-groovy-console</artifactId>
82+
<groupId>be.orbinson.aem</groupId>
83+
<artifactId>aem-groovy-console-all</artifactId>
10184
<type>zip</type>
10285
</dependency>
103-
<dependency>
104-
<groupId>org.codehaus.groovy</groupId>
105-
<artifactId>groovy-all</artifactId>
106-
</dependency>
107-
<dependency>
108-
<groupId>com.icfolson.aem.groovy.extension</groupId>
109-
<artifactId>aem-groovy-extension-bundle</artifactId>
110-
</dependency>
11186
<dependency>
11287
<groupId>de.valtech.aecu</groupId>
11388
<artifactId>aecu.ui.apps</artifactId>
11489
<version>${project.version}</version>
11590
<type>zip</type>
11691
</dependency>
117-
<dependency>
118-
<groupId>de.valtech.aecu</groupId>
119-
<artifactId>aecu.ui.apps.groovyconsole</artifactId>
120-
<version>${project.version}</version>
121-
<type>zip</type>
122-
</dependency>
12392
<dependency>
12493
<groupId>de.valtech.aecu</groupId>
12594
<artifactId>aecu.ui.content</artifactId>
@@ -148,4 +117,67 @@
148117
<version>${project.version}</version>
149118
</dependency>
150119
</dependencies>
120+
121+
<profiles>
122+
123+
<profile>
124+
<id>autoInstallPackageCloud</id>
125+
<activation>
126+
<activeByDefault>false</activeByDefault>
127+
</activation>
128+
<build>
129+
<pluginManagement>
130+
<plugins>
131+
<plugin>
132+
<groupId>com.day.jcr.vault</groupId>
133+
<artifactId>content-package-maven-plugin</artifactId>
134+
<executions>
135+
<execution>
136+
<id>install-package</id>
137+
<goals>
138+
<goal>install</goal>
139+
</goals>
140+
<configuration>
141+
<targetURL>http://${aem.host}:${aem.port}/crx/packmgr/service.jsp</targetURL>
142+
</configuration>
143+
</execution>
144+
</executions>
145+
</plugin>
146+
</plugins>
147+
</pluginManagement>
148+
</build>
149+
</profile>
150+
151+
<profile>
152+
<id>autoInstallPackagePublishCloud</id>
153+
<activation>
154+
<activeByDefault>false</activeByDefault>
155+
</activation>
156+
<build>
157+
<pluginManagement>
158+
<plugins>
159+
<plugin>
160+
<groupId>com.day.jcr.vault</groupId>
161+
<artifactId>content-package-maven-plugin</artifactId>
162+
<executions>
163+
<execution>
164+
<id>install-package-publish</id>
165+
<goals>
166+
<goal>install</goal>
167+
</goals>
168+
<configuration>
169+
<targetURL>http://${aem.publish.host}:${aem.publish.port}/crx/packmgr/service.jsp
170+
</targetURL>
171+
</configuration>
172+
</execution>
173+
</executions>
174+
</plugin>
175+
</plugins>
176+
</pluginManagement>
177+
</build>
178+
</profile>
179+
180+
</profiles>
181+
182+
151183
</project>

0 commit comments

Comments
 (0)