From 27718c0baf9f44030e6c2a96ea3869309c03eb33 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Wed, 9 Oct 2024 11:57:29 +0200
Subject: [PATCH] Full Java Platform Module System support for Java 9+ (#2846)

As much as automatic modules do the job for now, jlink requires explicit module definition.
---
 pom.xml                      | 10 ++++++++--
 vavr-benchmark/pom.xml       |  2 +-
 vavr-match-processor/pom.xml | 36 +++++++++++++++++++++++++++--------
 vavr-match/pom.xml           | 33 ++++++++++++++++++++++++--------
 vavr-test/pom.xml            | 34 +++++++++++++++++++++++++--------
 vavr/pom.xml                 | 37 ++++++++++++++++++++++++++++--------
 6 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8cf0b0c40..33baedecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
     </parent>
     <groupId>io.vavr</groupId>
     <artifactId>vavr-parent</artifactId>
-    <version>0.10.4</version>
+    <version>0.10.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Vavr Parent</name>
     <description>Vavr (formerly called Javaslang) is an object-functional language extension to Java 8+.</description>
@@ -49,7 +49,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
         <connection>scm:git:git@github.com:vavr-io/vavr.git</connection>
         <developerConnection>scm:git:git@github.com:vavr-io/vavr.git</developerConnection>
         <url>git@github.com:vavr-io/vavr.git</url>
-        <tag>v0.10.4</tag>
+        <tag>HEAD</tag>
     </scm>
     <developers>
         <developer>
@@ -86,6 +86,7 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
         <maven.surefire.version>3.5.1</maven.surefire.version>
         <maven.source.version>3.3.1</maven.source.version>
         <maven.exec.version>3.4.1</maven.exec.version>
+        <moditect.version>1.2.2.Final</moditect.version>
         <scala.maven.version>4.9.2</scala.maven.version>
         <scala.version>3.5.1</scala.version>
     </properties>
@@ -160,6 +161,11 @@ We use these goals frequently to keep the dependencies and plugins up-to-date:
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.moditect</groupId>
+                    <artifactId>moditect-maven-plugin</artifactId>
+                    <version>${moditect.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
diff --git a/vavr-benchmark/pom.xml b/vavr-benchmark/pom.xml
index d12e68bc4..8f4df9c22 100644
--- a/vavr-benchmark/pom.xml
+++ b/vavr-benchmark/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.vavr</groupId>
         <artifactId>vavr-parent</artifactId>
-        <version>0.10.4</version>
+        <version>0.10.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vavr-benchmark</artifactId>
diff --git a/vavr-match-processor/pom.xml b/vavr-match-processor/pom.xml
index 4c0900ce9..428aa1847 100644
--- a/vavr-match-processor/pom.xml
+++ b/vavr-match-processor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.vavr</groupId>
         <artifactId>vavr-parent</artifactId>
-        <version>0.10.4</version>
+        <version>0.10.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vavr-match-processor</artifactId>
@@ -53,13 +53,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>io.vavr.match.processor</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -69,6 +62,33 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfoSource>
+                                    module io.vavr.match.processor {
+                                        exports io.vavr.match;
+                                        exports io.vavr.match.generator;
+                                        exports io.vavr.match.model;
+                                        requires io.vavr.match;
+                                    }
+                                </moduleInfoSource>
+                            </module>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/vavr-match/pom.xml b/vavr-match/pom.xml
index 115bafc22..800d700d8 100644
--- a/vavr-match/pom.xml
+++ b/vavr-match/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.vavr</groupId>
         <artifactId>vavr-parent</artifactId>
-        <version>0.10.4</version>
+        <version>0.10.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vavr-match</artifactId>
@@ -24,13 +24,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>io.vavr.match</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -44,6 +37,30 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfoSource>
+                                    module io.vavr.match {
+                                        exports io.vavr.match.annotation;
+                                    }
+                                </moduleInfoSource>
+                            </module>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/vavr-test/pom.xml b/vavr-test/pom.xml
index ab5988cb3..15f283d8e 100644
--- a/vavr-test/pom.xml
+++ b/vavr-test/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.vavr</groupId>
         <artifactId>vavr-parent</artifactId>
-        <version>0.10.4</version>
+        <version>0.10.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vavr-test</artifactId>
@@ -60,13 +60,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>io.vavr.test</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -76,6 +69,31 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfoSource>
+                                    module io.vavr.test {
+                                        exports io.vavr.test;
+                                        requires io.vavr;
+                                    }
+                                </moduleInfoSource>
+                            </module>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/vavr/pom.xml b/vavr/pom.xml
index f784059a8..9ad0703b2 100644
--- a/vavr/pom.xml
+++ b/vavr/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.vavr</groupId>
         <artifactId>vavr-parent</artifactId>
-        <version>0.10.4</version>
+        <version>0.10.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vavr</artifactId>
@@ -75,13 +75,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>io.vavr</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -91,6 +84,34 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <jvmVersion>9</jvmVersion>
+                            <module>
+                                <moduleInfoSource>
+                                    module io.vavr {
+                                        exports io.vavr;
+                                        exports io.vavr.collection;
+                                        exports io.vavr.control;
+                                        exports io.vavr.concurrent;
+                                        requires io.vavr.match;
+                                    }
+                                </moduleInfoSource>
+                            </module>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>