Merge pull request #792 from bowbahdoe/master

Add explicit module info
belaban · Apr 30, 2024 · fba6747 · fba6747
2 parents 38fde8d + 7fc9bba
commit fba6747
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 7 deletions.
diff --git a/build.xml b/build.xml
@@ -148,9 +148,20 @@
 
     <target name="compile" depends="prepare" description="Compiles all Java files">
         <javac destdir="${compile.dir}" release="11"
-               classpathref="jg.classpath" includeantruntime="false" debug="on"
+               classpathref="jg.classpath"
+               modulepathref="jg.classpath"
+               includeantruntime="false"
+               debug="on"
                includes="org/jgroups/**">
             <src path="${src.dir}"/>
+        </javac>
+
+        <javac destdir="${compile.dir}" release="11"
+               classpathref="jg.classpath"
+               modulepathref="jg.classpath"
+               includeantruntime="false"
+               debug="on"
+               includes="org/jgroups/**">
             <src path="${other.dir}"/>
             <src path="${junit.dir}"/>
             <src path="${junit-functional.dir}"/>
@@ -166,11 +177,14 @@
             description="Compiles sources plus selected tests (e.g. perftests) shipped with JGroups">
         <javac srcdir="${src.dir}" destdir="${compile.dir}"
                release="11" classpathref="jg.classpath"
+               modulepathref="jg.classpath"
                includeantruntime="false" debug="on"
                includes="org/jgroups/**">
         </javac>
         <javac destdir="${compile.dir}" release="11"
-               classpathref="jg.classpath" includeantruntime="false" debug="on"
+               classpathref="jg.classpath"
+               modulepathref="jg.classpath"
+               includeantruntime="false" debug="on"
                includes="org/jgroups/tests/**">
             <src path="${tests.dir}/perf"/>
             <src path="${tests.dir}/other"/>

diff --git a/pom.xml b/pom.xml
@@ -192,7 +192,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <useIncrementalCompilation>false</useIncrementalCompilation>
                     <excludes>
@@ -337,12 +337,9 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                             <addBuildEnvironmentEntries>true</addBuildEnvironmentEntries>
                             <!--addClasspath>true</addClasspath-->
-                            <!--classpathPrefix>libs/</classpathPrefix-->
+                            <!-- classpathPrefix>libs/</classpathPrefix-->
                             <mainClass>org.jgroups.Version</mainClass>
                         </manifest>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.jgroups</Automatic-Module-Name>
-                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

diff --git a/src/module-info.java b/src/module-info.java
@@ -0,0 +1,36 @@
+module org.jgroups {
+    requires java.xml;
+    requires java.naming;
+    requires java.logging;
+    requires java.sql;
+    requires java.management;
+    requires java.security.jgss;
+    requires java.scripting;
+
+    // Only used in Demos
+    requires static java.desktop;
+
+    // Logging defaults to java.logging
+    requires static org.slf4j;
+    requires static org.apache.logging.log4j;
+    requires static org.apache.logging.log4j.core;
+
+    exports org.jgroups;
+    exports org.jgroups.annotations;
+    exports org.jgroups.auth;
+    exports org.jgroups.blocks;
+    exports org.jgroups.blocks.atomic;
+    exports org.jgroups.blocks.cs;
+    exports org.jgroups.client;
+    exports org.jgroups.conf;
+    exports org.jgroups.demos;
+    exports org.jgroups.fork;
+    exports org.jgroups.jmx;
+    exports org.jgroups.logging;
+    exports org.jgroups.nio;
+    exports org.jgroups.protocols;
+    exports org.jgroups.protocols.dns;
+    exports org.jgroups.protocols.pbcast;
+    exports org.jgroups.protocols.relay;
+    exports org.jgroups.protocols.relay.config;
+}