From da2759acbb6fd7fe32d24943e221b79d77b60e2c Mon Sep 17 00:00:00 2001
From: Pablo Ilardi <pilardi@gmail.com>
Date: Wed, 21 May 2025 18:11:41 -0400
Subject: [PATCH] Added support for multi modules projects

---
 pom.xml                                       | 40 ++++++++++++-------
 .../github/johnpoth/jshell/JShellMojo.java    | 14 +++++++
 src/main/java/module-info.java                | 12 ------
 3 files changed, 39 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/java/module-info.java

diff --git a/pom.xml b/pom.xml
index f49fafb..0d621c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,9 @@
             <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
         </license>
     </licenses>
+    <prerequisites>
+        <maven>3.6.3</maven>
+    </prerequisites>
 
     <developers>
         <developer>
@@ -53,20 +56,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>3.9.4</version>
+            <artifactId>maven-core</artifactId>
+            <version>3.9.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.9.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>3.9.4</version>
+            <version>3.15.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -77,7 +74,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.1.1</version>
                     <configuration>
                         <arguments>-Prelease</arguments>
                     </configuration>
@@ -85,7 +82,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.12.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -93,7 +90,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>8.3.1</version>
+                <version>12.1.1</version>
                 <configuration>
                     <scanPlugins>true</scanPlugins>
                 </configuration>
@@ -101,7 +98,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>9</source>
                     <target>9</target>
@@ -110,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.15.1</version>
                 <configuration>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                 </configuration>
@@ -123,6 +120,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                      <manifestEntries>
+                        <Automatic-Module-Name>com.github.johnpoth.jshell</Automatic-Module-Name>
+                      </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 
@@ -134,7 +144,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
diff --git a/src/main/java/com/github/johnpoth/jshell/JShellMojo.java b/src/main/java/com/github/johnpoth/jshell/JShellMojo.java
index 6756fb5..9f99723 100644
--- a/src/main/java/com/github/johnpoth/jshell/JShellMojo.java
+++ b/src/main/java/com/github/johnpoth/jshell/JShellMojo.java
@@ -17,6 +17,7 @@
 package com.github.johnpoth.jshell;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -86,7 +87,20 @@ public class JShellMojo extends AbstractMojo {
     @Parameter
     private Map<String, String> properties;
 
+    @Parameter(
+        defaultValue = "${session}",
+        readonly = true,
+        required = true
+    )
+    private MavenSession session;
+
+    @Override
     public void execute() throws MojoExecutionException {
+        List<String> selectedProjects = session.getRequest().getSelectedProjects();
+        if (!selectedProjects.isEmpty() && !selectedProjects.contains(session.getCurrentProject().getArtifactId())) {
+            getLog().debug("Skipping Shell for: " + session.getCurrentProject().getArtifactId());
+            return;
+        }
         Optional<Module> module = ModuleLayer.boot().findModule("jdk.jshell");
         ClassLoader classLoader = module.get().getClassLoader();
         // Until https://issues.apache.org/jira/browse/MNG-6371 is resolved
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
deleted file mode 100644
index 08f616f..0000000
--- a/src/main/java/module-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-module com.github.johnpoth.jshell {
-
-   requires jdk.jshell;
-   /**not modules yet*/
-   requires maven.plugin.api;
-   requires maven.plugin.annotations;
-   requires maven.artifact;
-
-   exports com.github.johnpoth.jshell;
-
-   uses javax.tools.Tool;
-}