fix: support maven-archetype-plugin 3.3.1+ (#1267)

* fix: support maven-archetype-plugin 3.3.1+
* fix: update grovy to 4.0.x
* fix: update archetype plugin version in GH workflows

Author: buuhuu

.github/workflows/maven-deploy-cm.yml

@@ -72,7 +72,7 @@ jobs:
       # Create new project
       - name: Create new project with the archetype
         run: |
-          mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
+          mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.3.1:generate \
            -D archetypeGroupId=com.adobe.aem \
            -D archetypeArtifactId=aem-project-archetype \
            -D archetypeVersion=${ARCHETYPE_VERSION} \

.github/workflows/maven-sdk-update.yml

@@ -67,7 +67,7 @@ jobs:
       # Create new project
       - name: Create new project with the archetype
         run: |
-          mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
+          mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.3.1:generate \
            -D archetypeGroupId=com.adobe.aem \
            -D archetypeArtifactId=aem-project-archetype \
            -D archetypeVersion=${ARCHETYPE_VERSION} \

README.md

@@ -53,7 +53,7 @@ To generate a project, adjust the following command line to your needs:
 * Lookup the list of available properties to see if there's more you want to adjust.
 
 ```
-mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
+mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.3.1:generate \
  -D archetypeGroupId=com.adobe.aem \
  -D archetypeArtifactId=aem-project-archetype \
  -D archetypeVersion=52\
@@ -62,7 +62,7 @@ mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
  -D groupId="com.mysite"
 ```
 
-**Note**: Make sure you use at least 3.1.0+ of maven-archetype-plugin ([#400](https://github.com/adobe/aem-project-archetype/issues/400))
+**Note**: Make sure you use at least 3.3.1+ of maven-archetype-plugin ([#400](https://github.com/adobe/aem-project-archetype/issues/400))
 
 **Note**: To run above command with older versions, you have to use the old `archetypeGroupId`: `-D archetypeGroupId=com.adobe.granite.archetype`
 

pom.xml

@@ -48,7 +48,8 @@
     </developers>
 
     <properties>
-        <maven.archetype.version>3.2.1</maven.archetype.version>
+        <maven.archetype.version>3.3.1</maven.archetype.version>
+        <groovy.version>4.0.22</groovy.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -106,10 +107,9 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-all</artifactId>
-                        <version>3.0.24</version>
-                        <type>pom</type> <!-- required JUST since Groovy 2.5.0 -->
+                        <groupId>org.apache.groovy</groupId>
+                        <artifactId>groovy</artifactId>
+                        <version>${groovy.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

src/main/resources/META-INF/archetype-post-generate.groovy

@@ -1,5 +1,5 @@
 import static groovy.io.FileType.*
-import groovy.util.XmlSlurper
+import groovy.xml.XmlSlurper
 import java.nio.file.Path
 import java.util.regex.Pattern