From d6e43f91cb78b3e9ac1396eb78e6f82fe3d06731 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 18:57:37 +0000
Subject: [PATCH 1/3] Initial plan


From d69be24278400310f137b3e169377b4ac88f8132 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 19:04:24 +0000
Subject: [PATCH 2/3] Initial analysis complete - planning fix for ModelloCLI
 plugin loading

Co-authored-by: slachiewicz <6705942+slachiewicz@users.noreply.github.com>
---
 META-INF/sisu/javax.inject.Named | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 META-INF/sisu/javax.inject.Named

diff --git a/META-INF/sisu/javax.inject.Named b/META-INF/sisu/javax.inject.Named
new file mode 100644
index 000000000..02ee261a3
--- /dev/null
+++ b/META-INF/sisu/javax.inject.Named
@@ -0,0 +1,7 @@
+org.codehaus.modello.core.DefaultGeneratorPluginManager
+org.codehaus.modello.core.DefaultMetadataPluginManager
+org.codehaus.modello.core.DefaultModelloCore
+org.codehaus.modello.plugin.model.ModelMetadataPlugin
+org.codehaus.plexus.build.DefaultBuildContext
+org.codehaus.plexus.component.configurator.BasicComponentConfigurator
+org.codehaus.plexus.component.configurator.MapOrientedComponentConfigurator

From d83679d0517e30b30ebf6551d80581546abb1f25 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 19:11:26 +0000
Subject: [PATCH 3/3] Add modello-cli module with all plugins for working CLI
 functionality

Co-authored-by: slachiewicz <6705942+slachiewicz@users.noreply.github.com>
---
 META-INF/sisu/javax.inject.Named |   7 --
 modello-cli/pom.xml              | 129 +++++++++++++++++++++++++++++++
 modello-core/pom.xml             |  54 -------------
 pom.xml                          |   1 +
 4 files changed, 130 insertions(+), 61 deletions(-)
 delete mode 100644 META-INF/sisu/javax.inject.Named
 create mode 100644 modello-cli/pom.xml

diff --git a/META-INF/sisu/javax.inject.Named b/META-INF/sisu/javax.inject.Named
deleted file mode 100644
index 02ee261a3..000000000
--- a/META-INF/sisu/javax.inject.Named
+++ /dev/null
@@ -1,7 +0,0 @@
-org.codehaus.modello.core.DefaultGeneratorPluginManager
-org.codehaus.modello.core.DefaultMetadataPluginManager
-org.codehaus.modello.core.DefaultModelloCore
-org.codehaus.modello.plugin.model.ModelMetadataPlugin
-org.codehaus.plexus.build.DefaultBuildContext
-org.codehaus.plexus.component.configurator.BasicComponentConfigurator
-org.codehaus.plexus.component.configurator.MapOrientedComponentConfigurator
diff --git a/modello-cli/pom.xml b/modello-cli/pom.xml
new file mode 100644
index 000000000..2d10cc4cb
--- /dev/null
+++ b/modello-cli/pom.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.codehaus.modello</groupId>
+    <artifactId>modello</artifactId>
+    <version>2.5.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>modello-cli</artifactId>
+  <name>Modello CLI</name>
+  <description>Modello CLI is a standalone executable JAR that bundles Modello Core with all plugins for command-line usage.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-core</artifactId>
+    </dependency>
+    <!-- Plugin dependencies -->
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xsd</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xdoc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xpp3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-stax</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-jackson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-dom4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-jdom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-jsonschema</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-sax</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-snakeyaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-converters</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-velocity</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.6.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.SisuIndexResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <Main-Class>org.codehaus.modello.ModelloCli</Main-Class>
+                    <Specification-Title>${project.artifactId}</Specification-Title>
+                    <Specification-Version>${project.version}</Specification-Version>
+                    <Implementation-Title>${project.artifactId}</Implementation-Title>
+                    <Implementation-Version>${project.version}</Implementation-Version>
+                    <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                    <exclude>META-INF/LICENSE</exclude>
+                    <exclude>META-INF/LICENSE.txt</exclude>
+                    <exclude>META-INF/DEPENDENCIES</exclude>
+                    <exclude>META-INF/NOTICE</exclude>
+                    <exclude>META-INF/NOTICE.txt</exclude>
+                    <exclude>**/module-info.class</exclude>
+                    <exclude>about.html</exclude>
+                    <exclude>overview.html</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/modello-core/pom.xml b/modello-core/pom.xml
index d00e5c700..590a32ecf 100644
--- a/modello-core/pom.xml
+++ b/modello-core/pom.xml
@@ -60,58 +60,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>cli</id>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <shadedClassifierName>cli</shadedClassifierName>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                <transformer implementation="org.apache.maven.plugins.shade.resource.SisuIndexResourceTransformer" />
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <manifestEntries>
-                    <Main-Class>org.codehaus.modello.ModelloCli</Main-Class>
-                    <Specification-Title>${project.artifactId}</Specification-Title>
-                    <Specification-Version>${project.version}</Specification-Version>
-                    <Implementation-Title>${project.artifactId}</Implementation-Title>
-                    <Implementation-Version>${project.version}</Implementation-Version>
-                    <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
-                  </manifestEntries>
-                </transformer>
-              </transformers>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/MANIFEST.MF</exclude>
-                    <exclude>META-INF/LICENSE</exclude>
-                    <exclude>META-INF/LICENSE.txt</exclude>
-                    <exclude>META-INF/DEPENDENCIES</exclude>
-                    <exclude>META-INF/NOTICE</exclude>
-                    <exclude>META-INF/NOTICE.txt</exclude>
-                    <exclude>**/module-info.class</exclude>
-                    <exclude>about.html</exclude>
-                    <exclude>overview.html</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index aadac5999..8f516957f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
     <module>modello-core</module>
     <module>modello-test</module>
     <module>modello-plugins</module>
+    <module>modello-cli</module>
   </modules>
 
   <scm>