Skip to content

Commit

Permalink
JDOM2, Commons-CLI, JLine and Micrometer now have module-info
Browse files Browse the repository at this point in the history
  • Loading branch information
ar committed Oct 12, 2024
1 parent 6727d06 commit d1d44b4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 8 additions & 0 deletions gradle/modules.properties
Original file line number Diff line number Diff line change
@@ -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


9 changes: 2 additions & 7 deletions jpos/build.gradle
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion jpos/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d1d44b4

Please sign in to comment.