Add jakarta jaxb adapters

mizosoft · Feb 11, 2024 · 82d969c · 82d969c
1 parent eac78ae
commit 82d969c
Show file tree

Hide file tree

Showing 32 changed files with 1,377 additions and 235 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,10 @@ okhttp = "5.0.0-alpha.7"
 jmh = "1.37"
 reactor = "3.6.2"
 nullaway-core = "0.10.21"
-jaxb = "2.3.1"
+jaxb-api = "2.3.1"
+jaxb-impl = "2.3.8"
+jaxb-jakarta-api = "4.0.1"
+jaxb-jakarta-impl = "4.0.3"
 moxy = "2.7.14"
 jsoup = "1.17.2"
 testng = "7.9.0"
@@ -61,7 +64,10 @@ okhttp-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref = "okhttp
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "reactor" }
 nullaway = { module = "com.uber.nullaway:nullaway", version.ref = "nullaway-core" }
-jaxb-api = { module = "javax.xml.bind:jaxb-api", version.ref = "jaxb" }
+jaxb-api = { module = "javax.xml.bind:jaxb-api", version.ref = "jaxb-api" }
+jaxb-impl = { module = "com.sun.xml.bind:jaxb-impl", version.ref = "jaxb-impl" }
+jaxb-jakarta-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jaxb-jakarta-api" }
+jaxb-jakarta-impl = { module = "com.sun.xml.bind:jaxb-impl", version.ref = "jaxb-jakarta-impl" }
 moxy = { module = "org.eclipse.persistence:org.eclipse.persistence.moxy", version.ref = "moxy" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 testng = { module = "org.testng:testng", version.ref = "testng" }

diff --git a/methanol-blackbox/build.gradle.kts b/methanol-blackbox/build.gradle.kts
@@ -13,13 +13,15 @@ dependencies {
   testImplementation(project(":methanol-jackson-flux"))
   testImplementation(project(":methanol-protobuf"))
   testImplementation(project(":methanol-jaxb"))
+  testImplementation(project(":methanol-jaxb-jakarta"))
   testImplementation(project(":methanol-brotli"))
   testImplementation(project(":methanol-testing"))
   testImplementation(libs.reactor.core)
   testImplementation(libs.mockwebserver)
   testImplementation(libs.brotli.dec)
   testImplementation(libs.reactivestreams)
   testImplementation(libs.moxy)
+  testImplementation(libs.jaxb.jakarta.impl)
 }
 
 tasks.test {
@@ -30,7 +32,7 @@ tasks.test {
 }
 
 extraJavaModuleInfo {
-  failOnMissingModuleInfo.set(false)
+  failOnMissingModuleInfo = false
   automaticModule(libs.moxy.get().module.toString(), "org.eclipse.persistence.moxy")
 }