You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/10/05 13:15:52 UTC
(maven-archetype) 01/01: [ARCHETYPE-679] Add additional modules for groovy
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch ARCHETYPE-679
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 1f870f7a81ca204af80a473a1591874edb4bd8ef
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Oct 5 15:15:39 2024 +0200
[ARCHETYPE-679] Add additional modules for groovy
- groovy-templates
- groovy-xml
- groovy-yaml
---
archetype-common/pom.xml | 16 ++++++++++++++++
.../archetype.properties | 0
.../archetype/pom.xml | 4 ++--
.../resources/META-INF/archetype-post-generate.groovy | 8 +++++++-
.../main/resources/META-INF/maven/archetype-metadata.xml | 0
.../src/main/resources/archetype-resources/pom.xml | 0
.../invoker.properties | 0
.../pom.xml | 2 +-
.../project.properties | 2 +-
.../verify.groovy | 0
10 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 22966a5d..5c0b482d 100644
--- 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/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype.properties
similarity index 100%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype.properties
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype.properties
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/pom.xml b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/pom.xml
similarity index 93%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/pom.xml
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/pom.xml
index f351a8c2..43363aeb 100644
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-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/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
similarity index 83%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
index 41b6e7b7..0ac8bc08 100644
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
+++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/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/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/archetype-resources/pom.xml b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/archetype/src/main/resources/archetype-resources/pom.xml
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/invoker.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/invoker.properties
similarity index 100%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/invoker.properties
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/invoker.properties
diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/pom.xml b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/pom.xml
similarity index 97%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/pom.xml
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/pom.xml
index ce11999e..0f7c776b 100644
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/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/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/project.properties b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/project.properties
similarity index 95%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/project.properties
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/project.properties
index 7e165742..652e1ec3 100644
--- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/project.properties
+++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-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/maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/verify.groovy b/maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/verify.groovy
similarity index 100%
rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-565_groovy-json/verify.groovy
rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-679_groovy-modules/verify.groovy