Modularize the project

.github/workflows/ci.yml

@@ -9,15 +9,14 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         jdk-distribution: [temurin, adopt-openj9]
-        jdk-version: [17, 21, 25]
     steps:
     - name: Configure runner - Linux
       if: contains(matrix.os, 'ubuntu')
@@ -31,15 +30,19 @@ jobs:
         echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
       shell: cmd
     - uses: actions/checkout@v6
-    - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
+    - name: Set up JDKs
       uses: actions/setup-java@v5
       with:
         distribution: ${{ matrix.jdk-distribution }}
-        java-version: ${{ matrix.jdk-version }}
+        java-version: |
+          11
+          17
+          21
+          25
     - name: Run Tests
-      run: mvn -ntp -U -B -fae clean install
+      run: mvn -ntp -U -B -fae clean install '-Djava11.home=${{env.JAVA_HOME_11_X64}}' '-Djava17.home=${{env.JAVA_HOME_17_X64}}' '-Djava21.home=${{env.JAVA_HOME_21_X64}}' '-Djava25.home=${{env.JAVA_HOME_25_X64}}'
     - uses: actions/upload-artifact@v6
       if: failure()
       with:
-        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
+        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.os }}
         path: '**/surefire-reports/*.txt'

pom.xml

@@ -59,13 +59,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemProperties>
-                        <property>
-                            <name>java.util.logging.manager</name>
-                            <value>org.jboss.logmanager.LogManager</value>
-                        </property>
-                    </systemProperties>
-                    <forkMode>always</forkMode>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -103,14 +99,23 @@
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                    <excludes>**/*$logger.java,**/*$bundle.java</excludes>
+                    <excludes>**/*$logger.java,**/*$bundle.java,**/module-info.java</excludes>
                     <useFile></useFile>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                            <version>${version.org.jboss.logging.jboss-logging-processor}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
 
             <plugin>
@@ -183,9 +188,10 @@
 
         <dependency>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
+            <artifactId>jboss-logging-annotations</artifactId>
             <version>${version.org.jboss.logging.jboss-logging-processor}</version>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

src/main/java/module-info.java

@@ -0,0 +1,12 @@
+module org.wildfly.client.config {
+    requires java.xml;
+
+    requires org.jboss.logging;
+    requires static org.jboss.logging.annotations;
+
+    requires org.wildfly.common;
+
+    exports org.wildfly.client.config;
+
+    uses org.wildfly.client.config.ResolverProvider;
+}

src/main/java/org/wildfly/client/config/_private/ConfigMessages.java

@@ -18,6 +18,8 @@
 
 package org.wildfly.client.config._private;
 
+import static java.lang.invoke.MethodHandles.*;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -40,7 +42,7 @@
 @MessageBundle(projectCode = "CONF", length = 4)
 public interface ConfigMessages {
 
-    ConfigMessages msg = Messages.getBundle(ConfigMessages.class);
+    ConfigMessages msg = Messages.getBundle(lookup(), ConfigMessages.class);
 
     @Message(id = 1, value = "An unspecified XML parse error occurred")
     String parseError();