From 1b7b3c3f3bdc8ac3fdc90f79238591474fd37fc4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 1 Nov 2025 09:26:49 +0000
Subject: [PATCH 1/6] Initial plan


From f5f1f0773d1eb695e176b1802be26c5221251098 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 1 Nov 2025 09:33:21 +0000
Subject: [PATCH 2/6] Add module-info.java and configure multi-release
 compilation

Co-authored-by: slachiewicz <6705942+slachiewicz@users.noreply.github.com>
---
 pom.xml                        | 33 +++++++++++++++++++++++++++++++++
 src/main/java/module-info.java |  9 +++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/main/java/module-info.java

diff --git a/pom.xml b/pom.xml
index e064b6b..2874a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,39 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <!-- defaults for compile and testCompile -->
+        <configuration>
+          <!-- Only required when JAVA_HOME isn't at least Java 9 and when haven't configured the maven-toolchains-plugin -->
+          <jdkToolchain>
+            <version>9</version>
+          </jdkToolchain>
+          <release>8</release>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <!-- compile everything to ensure module-info contains right entries -->
+              <release>9</release>
+            </configuration>
+          </execution>
+          <execution>
+            <id>base-compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <!-- recompile everything for target VM except the module-info.java -->
+            <configuration>
+              <excludes>
+                <exclude>module-info.java</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-publish-plugin</artifactId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..7b2b0d6
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module org.codehaus.plexus.interpolation {
+    exports org.codehaus.plexus.interpolation;
+    exports org.codehaus.plexus.interpolation.fixed;
+    exports org.codehaus.plexus.interpolation.multi;
+    exports org.codehaus.plexus.interpolation.object;
+    exports org.codehaus.plexus.interpolation.os;
+    exports org.codehaus.plexus.interpolation.reflection;
+    exports org.codehaus.plexus.interpolation.util;
+}

From a5f41f810864cb92b66f963f5c66a9af177c283b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 1 Nov 2025 09:35:06 +0000
Subject: [PATCH 3/6] Explicitly set release=8 in base-compile execution for
 clarity

Co-authored-by: slachiewicz <6705942+slachiewicz@users.noreply.github.com>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 2874a5c..5791e61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
             </goals>
             <!-- recompile everything for target VM except the module-info.java -->
             <configuration>
+              <release>8</release>
               <excludes>
                 <exclude>module-info.java</exclude>
               </excludes>

From 793c2073bd9f7af257f469eedac9f2af86f00388 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 1 Nov 2025 09:47:46 +0000
Subject: [PATCH 4/6] Move module compilation to java9+ profile activated on
 JDK 9+

Co-authored-by: slawekjaranowski <3578921+slawekjaranowski@users.noreply.github.com>
---
 pom.xml | 73 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5791e61..623c41d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,40 +67,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <!-- defaults for compile and testCompile -->
-        <configuration>
-          <!-- Only required when JAVA_HOME isn't at least Java 9 and when haven't configured the maven-toolchains-plugin -->
-          <jdkToolchain>
-            <version>9</version>
-          </jdkToolchain>
-          <release>8</release>
-        </configuration>
-        <executions>
-          <execution>
-            <id>default-compile</id>
-            <configuration>
-              <!-- compile everything to ensure module-info contains right entries -->
-              <release>9</release>
-            </configuration>
-          </execution>
-          <execution>
-            <id>base-compile</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <!-- recompile everything for target VM except the module-info.java -->
-            <configuration>
-              <release>8</release>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-publish-plugin</artifactId>
@@ -132,4 +98,43 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>java9+</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-compile</id>
+                <configuration>
+                  <!-- compile everything to ensure module-info contains right entries -->
+                  <release>9</release>
+                </configuration>
+              </execution>
+              <execution>
+                <id>base-compile</id>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <!-- recompile everything for target VM except the module-info.java -->
+                <configuration>
+                  <release>8</release>
+                  <excludes>
+                    <exclude>module-info.java</exclude>
+                  </excludes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

From 37ac139441505e1774071f42192713f728693e70 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 1 Nov 2025 09:58:25 +0000
Subject: [PATCH 5/6] Move module-info.java to src/main/java9 for multi-release
 JAR

Co-authored-by: slawekjaranowski <3578921+slawekjaranowski@users.noreply.github.com>
---
 pom.xml                                   | 31 +++++++++++++----------
 src/main/{java => java9}/module-info.java |  0
 2 files changed, 18 insertions(+), 13 deletions(-)
 rename src/main/{java => java9}/module-info.java (100%)

diff --git a/pom.xml b/pom.xml
index 623c41d..aaeea09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,27 +111,32 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <executions>
               <execution>
-                <id>default-compile</id>
-                <configuration>
-                  <!-- compile everything to ensure module-info contains right entries -->
-                  <release>9</release>
-                </configuration>
-              </execution>
-              <execution>
-                <id>base-compile</id>
+                <id>compile-java9</id>
                 <goals>
                   <goal>compile</goal>
                 </goals>
-                <!-- recompile everything for target VM except the module-info.java -->
+                <phase>compile</phase>
                 <configuration>
-                  <release>8</release>
-                  <excludes>
-                    <exclude>module-info.java</exclude>
-                  </excludes>
+                  <release>9</release>
+                  <compileSourceRoots>
+                    <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                  </compileSourceRoots>
+                  <multiReleaseOutput>true</multiReleaseOutput>
                 </configuration>
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Multi-Release>true</Multi-Release>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/src/main/java/module-info.java b/src/main/java9/module-info.java
similarity index 100%
rename from src/main/java/module-info.java
rename to src/main/java9/module-info.java

From 298285e7e974e5d39272e425bc4469cc3e4d306a Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Mon, 3 Nov 2025 13:54:21 +0100
Subject: [PATCH 6/6] Remove unnecessary exports from module-info.java

Removed multiple exports from the module definition.
---
 src/main/java9/module-info.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java9/module-info.java b/src/main/java9/module-info.java
index 7b2b0d6..88bc3df 100644
--- a/src/main/java9/module-info.java
+++ b/src/main/java9/module-info.java
@@ -1,9 +1,3 @@
 module org.codehaus.plexus.interpolation {
     exports org.codehaus.plexus.interpolation;
-    exports org.codehaus.plexus.interpolation.fixed;
-    exports org.codehaus.plexus.interpolation.multi;
-    exports org.codehaus.plexus.interpolation.object;
-    exports org.codehaus.plexus.interpolation.os;
-    exports org.codehaus.plexus.interpolation.reflection;
-    exports org.codehaus.plexus.interpolation.util;
 }