[ARCHETYPE-679] Add additional modules for groovy

- groovy-templates - groovy-xml - groovy-yaml
apache · Oct 5, 2024 · 7af674d · 7af674d
1 parent e0701d2
commit 7af674d
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 5 deletions.
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
@@ -57,6 +57,22 @@
       <artifactId>groovy-json</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-templates</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-xml</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-yaml</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <!-- /additional groovy modules -->
     <dependency>
       <groupId>org.apache.ivy</groupId>
       <artifactId>ivy</artifactId>

diff --git a/...TYPE-565_groovy-json/archetype.properties → ...E-679_groovy-modules/archetype.properties b/...TYPE-565_groovy-json/archetype.properties → ...E-679_groovy-modules/archetype.properties
diff --git a/...CHETYPE-565_groovy-json/archetype/pom.xml → ...TYPE-679_groovy-modules/archetype/pom.xml b/...CHETYPE-565_groovy-json/archetype/pom.xml → ...TYPE-679_groovy-modules/archetype/pom.xml
@@ -24,10 +24,10 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven.plugins.archetype.its</groupId>
-    <artifactId>archetype565-parent</artifactId>
+    <artifactId>archetype679-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>archetype565-archetype</artifactId>
+  <artifactId>archetype679-archetype</artifactId>
   <packaging>maven-archetype</packaging>
 
   <build>

diff --git a/...s/META-INF/archetype-post-generate.groovy → ...s/META-INF/archetype-post-generate.groovy b/...s/META-INF/archetype-post-generate.groovy → ...s/META-INF/archetype-post-generate.groovy
@@ -18,7 +18,13 @@
  */
 import java.nio.file.Files
 import java.nio.file.Paths
-import groovy.json.JsonException // Should error on this line if test fails.
+
+// imports for groovy additional modules should not fail test
+
+import groovy.json.JsonSlurper
+import groovy.text.SimpleTemplateEngine
+import groovy.xml.XmlSlurper
+import groovy.yaml.YamlSlurper
 
 
 def p = Paths.get(request.getOutputDirectory(), request.getArtifactId(), 'test.txt')

diff --git a/...ces/META-INF/maven/archetype-metadata.xml → ...ces/META-INF/maven/archetype-metadata.xml b/...ces/META-INF/maven/archetype-metadata.xml → ...ces/META-INF/maven/archetype-metadata.xml
diff --git a/...ain/resources/archetype-resources/pom.xml → ...ain/resources/archetype-resources/pom.xml b/...ain/resources/archetype-resources/pom.xml → ...ain/resources/archetype-resources/pom.xml
diff --git a/...HETYPE-565_groovy-json/invoker.properties → ...YPE-679_groovy-modules/invoker.properties b/...HETYPE-565_groovy-json/invoker.properties → ...YPE-679_groovy-modules/invoker.properties
diff --git a/...rojects/ARCHETYPE-565_groovy-json/pom.xml → ...ects/ARCHETYPE-679_groovy-modules/pom.xml b/...rojects/ARCHETYPE-565_groovy-json/pom.xml → ...ects/ARCHETYPE-679_groovy-modules/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.archetype.its</groupId>
-  <artifactId>archetype565-parent</artifactId>
+  <artifactId>archetype679-parent</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 

diff --git a/...HETYPE-565_groovy-json/project.properties → ...YPE-679_groovy-modules/project.properties b/...HETYPE-565_groovy-json/project.properties → ...YPE-679_groovy-modules/project.properties
@@ -16,7 +16,7 @@
 # under the License.
 
 archetypeGroupId=org.apache.maven.plugins.archetype.its
-archetypeArtifactId=archetype565-archetype
+archetypeArtifactId=archetype679-archetype
 archetypeVersion=1.0-SNAPSHOT
 
 groupId=com.company

diff --git a/...s/ARCHETYPE-565_groovy-json/verify.groovy → ...RCHETYPE-679_groovy-modules/verify.groovy b/...s/ARCHETYPE-565_groovy-json/verify.groovy → ...RCHETYPE-679_groovy-modules/verify.groovy