dokka v2 upgrade

Author: ekoby

gradle/libs.versions.toml

@@ -78,7 +78,7 @@ clikt = { module = "com.github.ajalt:clikt", version.ref = "clikt" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+dokka = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
 nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
 semver-git = { id = "io.wusa.semver-git-plugin", version.ref = "semver-git" }
 openapi = { id = "org.openapi.generator", version.ref = "openapi-gen" }

ziti-netty/build.gradle.kts

@@ -46,9 +46,9 @@ java {
 }
 
 tasks.register<Jar>("dokkaJar") {
-    dependsOn(tasks.dokkaJavadoc)
+    dependsOn(tasks.dokkaGenerateModuleJavadoc)
     archiveClassifier.set("javadoc")
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+    from(tasks.dokkaGenerateModuleJavadoc.flatMap { it.outputDirectory })
 }
 
 publishing {

ziti-springboot-client/build.gradle.kts

@@ -49,9 +49,9 @@ java {
 }
 
 tasks.register<Jar>("dokkaJar") {
-    dependsOn(tasks.dokkaJavadoc)
+    dependsOn(tasks.dokkaGenerateModuleJavadoc)
     archiveClassifier.set("javadoc")
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+    from(tasks.dokkaGenerateModuleJavadoc.flatMap { it.outputDirectory })
 }
 
 

ziti-springboot/build.gradle.kts

@@ -47,9 +47,9 @@ java {
 }
 
 tasks.register<Jar>("dokkaJar") {
-    dependsOn(tasks.dokkaJavadoc)
+    dependsOn(tasks.dokkaGenerateModuleJavadoc)
     archiveClassifier.set("javadoc")
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+    from(tasks.dokkaGenerateModuleJavadoc.flatMap { it.outputDirectory })
 }
 
 publishing {

ziti-vertx/build.gradle.kts

@@ -51,9 +51,9 @@ dependencies {
 }
 
 tasks.register<Jar>("dokkaJar") {
-    dependsOn(tasks.dokkaJavadoc)
+    dependsOn(tasks.dokkaGenerateModuleJavadoc)
     archiveClassifier.set("javadoc")
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+    from(tasks.dokkaGenerateModuleJavadoc.flatMap { it.outputDirectory })
 }
 
 publishing {

ziti/build.gradle.kts

@@ -121,9 +121,9 @@ tasks.named<ShadowJar>("shadowJar") {
 }
 
 tasks.register<Jar>("dokkaJar") {
-    dependsOn(tasks.dokkaJavadoc)
+    dependsOn(tasks.dokkaGenerateModuleJavadoc)
     archiveClassifier.set("javadoc")
-    from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+    from(tasks.dokkaGenerateModuleJavadoc.flatMap { it.outputDirectory })
 }
 
 @Suppress("UnstableApiUsage")

ziti/src/main/kotlin/org/openziti/api/types.kt

@@ -52,7 +52,7 @@ data class InterceptConfig(
     val addresses: Set<InterceptAddress>,
     val portRanges: SortedSet<PortRange>,
     val dialOptions: Map<String,Any> = emptyMap(),
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @field:JsonInclude(JsonInclude.Include.NON_EMPTY)
     val sourceIp: String? = null
 ) {
     override fun toString(): String {