From d1d44b478d4e6618aea96a2cca686dea999348d7 Mon Sep 17 00:00:00 2001
From: Alejandro Revilla <apr@jpos.org>
Date: Sat, 12 Oct 2024 18:10:24 -0300
Subject: [PATCH] JDOM2, Commons-CLI, JLine and Micrometer now have module-info

---
 build.gradle                        | 9 +++++----
 gradle/modules.properties           | 8 ++++++++
 jpos/build.gradle                   | 9 ++-------
 jpos/src/main/java/module-info.java | 2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 gradle/modules.properties

diff --git a/build.gradle b/build.gradle
index 522cb9920d..d234448066 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,11 +29,12 @@ subprojects {
     }
 
     tasks.withType(JavaCompile) {
-        options.compilerArgs += '--enable-preview'
-    }
-    tasks.withType(Test) {
-        jvmArgs += '--enable-preview'
+        // options.compilerArgs += '--enable-preview'
+        options.release = JavaVersion.VERSION_23.ordinal()
     }
+    //tasks.withType(Test) {
+    //    jvmArgs += '--enable-preview'
+    //}
 
     repositories {
         mavenCentral()
diff --git a/gradle/modules.properties b/gradle/modules.properties
new file mode 100644
index 0000000000..cb24996f0f
--- /dev/null
+++ b/gradle/modules.properties
@@ -0,0 +1,8 @@
+org.apache.commons.cli=commons-cli:commons-cli
+org.jdom2=org.jdom:jdom2
+org.jline=org.jline:jline
+micrometer.core=io.micrometer:micrometer-core
+micrometer.registry.prometheus=io.micrometer:micrometer-registry-prometheus
+org.apache.sshd=org.apache.sshd:sshd-core
+
+
diff --git a/jpos/build.gradle b/jpos/build.gradle
index c60000c9fa..253e0d5216 100644
--- a/jpos/build.gradle
+++ b/jpos/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-   id "org.gradlex.extra-java-module-info" version "1.4.1"
+   id "org.gradlex.extra-java-module-info" version "1.9"
    id "org.gradlex.java-module-dependencies" version "1.6"
    id "org.owasp.dependencycheck" version "8.3.1"
 
@@ -10,18 +10,13 @@ extraJavaModuleInfo {
     failOnMissingModuleInfo.set(false)
     def sshdVersion = ((String) libs.sshd.orNull).split(":")[-1] // there has to be a better way to get the version
 
-    automaticModule ('org.jdom:jdom2', 'org.jdom2')
-    automaticModule ('commons-cli:commons-cli', 'org.apache.commons.cli')
     automaticModule ('org.javatuples:javatuples', 'org.javatuples')
     automaticModule ('org.hdrhistogram:HdrHistogram', 'org.hdrhistogram.HdrHistogram')
-    automaticModule ('org.jline:jline', 'org.jline')
     automaticModule ('org.apache-extras.beanshell:bsh', 'bsh')
     automaticModule ('com.sleepycat:je', 'com.sleepycat.je')
     automaticModule ('jdbm:jdbm', 'org.jdbm')
-    automaticModule ('io.micrometer:micrometer-core', "micrometer.core")
-    automaticModule ('io.micrometer:micrometer-registry-prometheus', "micrometer.registry.prometheus")
 
-    module ('org.apache.sshd:sshd-core',  'org.apache.sshd', "${sshdVersion}") {
+    module ('org.apache.sshd:sshd-core',  'org.apache.sshd.core', "${sshdVersion}") {
         mergeJar('org.apache.sshd:sshd-common')
         mergeJar('net.i2p.crypto:eddsa')
 
diff --git a/jpos/src/main/java/module-info.java b/jpos/src/main/java/module-info.java
index bf301fc14d..694d5cc30d 100644
--- a/jpos/src/main/java/module-info.java
+++ b/jpos/src/main/java/module-info.java
@@ -16,7 +16,7 @@
     requires jdk.httpserver;
     requires micrometer.core;
     requires micrometer.registry.prometheus;
-    requires org.apache.sshd;
+    requires org.apache.sshd.core;
     requires com.fasterxml.jackson.annotation;
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.datatype.jsr310;