diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd65f916..e22730a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: ['17', '21'] + java_version: ['17', '21', '23'] os: ['ubuntu-22.04'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" diff --git a/jr-retrofit2/src/main/java/module-info.java b/jr-retrofit2/src/main/java/module-info.java index 353539a3..01bdbc3a 100644 --- a/jr-retrofit2/src/main/java/module-info.java +++ b/jr-retrofit2/src/main/java/module-info.java @@ -1,9 +1,9 @@ +// Jackson-jr Retrofit 2 module Main artifact Module descriptor module tools.jackson.jr.retrofit2 { - requires transitive tools.jackson.jr.ob; - // 11-Mar-2019, tatu: These are probably not right... - requires transitive okhttp3; - requires transitive retrofit2; + requires tools.jackson.jr.ob; + requires okhttp3; + requires retrofit2; exports tools.jackson.jr.retrofit2; } diff --git a/jr-stree/pom.xml b/jr-stree/pom.xml index 2134b453..452eec5f 100644 --- a/jr-stree/pom.xml +++ b/jr-stree/pom.xml @@ -50,10 +50,6 @@ has no other dependencies. com.google.code.maven-replacer-plugin replacer - - org.moditect - moditect-maven-plugin - de.jjohannes gradle-module-metadata-maven-plugin diff --git a/jr-stree/src/moditect/module-info.java b/jr-stree/src/main/java/module-info.java similarity index 61% rename from jr-stree/src/moditect/module-info.java rename to jr-stree/src/main/java/module-info.java index 4efdf1d5..53f46cac 100644 --- a/jr-stree/src/moditect/module-info.java +++ b/jr-stree/src/main/java/module-info.java @@ -1,4 +1,6 @@ -module tools.jackson.jr.stree { +// Jackson-jr Simple Tree module Main artifact Module descriptor +module tools.jackson.jr.stree +{ requires transitive tools.jackson.core; requires tools.jackson.jr.ob; diff --git a/jr-stree/src/test/java/module-info.java b/jr-stree/src/test/java/module-info.java new file mode 100644 index 00000000..e9b21e9a --- /dev/null +++ b/jr-stree/src/test/java/module-info.java @@ -0,0 +1,15 @@ +// Jackson-jr Simple Tree module Test artifact descriptor +module tools.jackson.jr.stree +{ + // Since we are not split from Main artifact, will not + // need to depend on Main artifact -- but need its dependencies + requires tools.jackson.core; + requires tools.jackson.jr.ob; + + // Additional test lib/framework dependencies + requires org.junit.jupiter.api; // JUnit 5 + + // Further, need to open up test packages for JUnit et al + opens tools.jackson.jr.stree; + opens tools.jackson.jr.stree.util; +}