Skip to content

Commit

Permalink
Complete conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Feb 3, 2025
1 parent e847398 commit 431a997
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions jr-retrofit2/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
}
4 changes: 0 additions & 4 deletions jr-stree/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ has no other dependencies.
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
</plugin>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>de.jjohannes</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
15 changes: 15 additions & 0 deletions jr-stree/src/test/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit 431a997

Please sign in to comment.