1 files changed, 40 insertions, 7 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index a2d2eda..c543344 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import net.ltgt.gradle.errorprone.errorprone
+import net.ltgt.gradle.nullaway.nullaway
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -7,22 +9,26 @@ plugins {
     war
     id("org.springframework.boot") version "3.5.7"
     id("io.spring.dependency-management") version "1.1.7"
-    kotlin("jvm") version "1.9.25"
-    kotlin("plugin.spring") version "1.9.25"
+    id("com.diffplug.spotless") version "8.0.0"
+    id("net.ltgt.errorprone") version "4.3.0"
+    id("net.ltgt.nullaway") version "2.3.0"
+    kotlin("jvm") version "2.2.10"
+    kotlin("plugin.spring") version "2.2.10"
     jacoco
 }
 
 group = "dev.dnpm"
-version = "0.11.3"
+version = "0.12.0-SNAPSHOT"
 
 var versions = mapOf(
     "mtb-dto" to "0.1.0-SNAPSHOT",
-    "hapi-fhir" to "7.6.1",
-    "mockito-kotlin" to "5.4.0",
-    "archunit" to "1.3.0",
+    "hapi-fhir" to "8.4.0",
+    "apache-cxf" to "4.1.3",
+    "mockito-kotlin" to "6.1.0",
+    "archunit" to "1.4.1",
     // Webjars
     "webjars-locator" to "0.52",
-    "echarts" to "5.4.3",
+    "echarts" to "6.0.0",
     "htmx.org" to "1.9.12"
 )
 
@@ -88,8 +94,12 @@ dependencies {
     implementation("org.webjars:webjars-locator:${versions["webjars-locator"]}")
     implementation("org.webjars.npm:echarts:${versions["echarts"]}")
     implementation("org.webjars.npm:htmx.org:${versions["htmx.org"]}")
+    implementation("org.jspecify:jspecify:1.0.0")
     // Fix for CVE-2025-48924
     implementation("org.apache.commons:commons-lang3:3.18.0")
+    // gPAS via Soap
+    implementation("org.apache.cxf:cxf-rt-frontend-jaxws:${versions["apache-cxf"]}")
+    implementation("org.apache.cxf:cxf-rt-transports-http:${versions["apache-cxf"]}")
 
     runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
     runtimeOnly("org.postgresql:postgresql")
@@ -113,6 +123,20 @@ dependencies {
     integrationTestImplementation("org.springframework:spring-webflux")
     // Fix for CVE-2024-25710
     integrationTestImplementation("org.apache.commons:commons-compress:1.27.1")
+
+    errorprone("com.google.errorprone:error_prone_core:2.43.0")
+    errorprone("com.uber.nullaway:nullaway:0.12.11")
+}
+
+tasks.withType<JavaCompile> {
+    options.errorprone.nullaway {
+        error()
+        annotatedPackages.add("dev.dnpm.etl")
+    }
+    options.errorprone.disableAllChecks = true
+    options.errorprone {
+        disableAllWarnings = true
+    }
 }
 
 tasks.withType<KotlinCompile> {
@@ -127,6 +151,7 @@ tasks.withType<Test> {
     testLogging {
         events(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED)
     }
+    dependsOn(tasks.spotlessCheck)
 }
 
 tasks.register<Test>("integrationTest") {
@@ -171,3 +196,11 @@ tasks.named<BootBuildImage>("bootBuildImage") {
         "BP_OCI_DESCRIPTION" to "ETL Processor for MV § 64e and DNPM:DIP"
     ))
 }
+
+spotless {
+    java {
+        importOrder()
+        removeUnusedImports()
+        googleJavaFormat()
+    }
+}
\ No newline at end of file