diff --git a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts index 447e61ca..29b5aec8 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -12,12 +12,12 @@ plugins { description = "redaction-service-server-v1" -val layoutParserVersion = "0.181.0" +val layoutParserVersion = "0.191.0" val jacksonVersion = "2.15.2" val droolsVersion = "9.44.0.Final" val pdfBoxVersion = "3.0.0" val persistenceServiceVersion = "2.628.0-RED9472.0" -val llmServiceVersion = "1.11.0" +val llmServiceVersion = "1.20.0-RED10072.2" val springBootStarterVersion = "3.1.5" val springCloudVersion = "4.0.4" val testContainersVersion = "1.19.7" @@ -31,21 +31,15 @@ configurations { } } -configurations.all { - resolutionStrategy { - force("com.google.protobuf:protobuf-java:4.27.1") - } -} - dependencies { - implementation(project(":document")) + implementation(project(":redaction-service-api-v1")) { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") } + implementation(project(":document")) implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") { exclude(group = "org.springframework.boot") } implementation("com.iqser.red.service:persistence-service-shared-mongo-v1:${persistenceServiceVersion}") { exclude(group = "com.knecon.fforesight", module = "tenant-commons") } - implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}") implementation("com.knecon.fforesight:llm-service-api:${llmServiceVersion}") implementation("com.iqser.red.commons:spring-commons:6.2.0") @@ -62,7 +56,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}") - implementation("org.ahocorasick:ahocorasick:0.6.3") + implementation("org.ahocorasick:ahocorasick:0.9.0") implementation("com.hankcs:aho-corasick-double-array-trie:1.2.2") implementation("com.github.roklenarcic:aho-corasick:1.2") @@ -71,7 +65,6 @@ dependencies { implementation("org.drools:drools-engine:${droolsVersion}") implementation("org.drools:drools-mvel:${droolsVersion}") implementation("org.kie:kie-spring:7.74.1.Final") - implementation("com.google.protobuf:protobuf-java:4.27.1") implementation("org.locationtech.jts:jts-core:1.19.0") @@ -87,7 +80,6 @@ dependencies { implementation("net.logstash.logback:logstash-logback-encoder:7.4") api("ch.qos.logback:logback-classic") - api("com.knecon.fforesight:swagger-commons:0.7.0") implementation("org.reflections:reflections:0.10.2") @@ -134,6 +126,7 @@ tasks.named("bootBuildImage") { "BPE_APPEND_JAVA_TOOL_OPTIONS", "-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 -Dkie.repository.project.cache.size=50 -Dkie.repository.project.versions.cache.size=5" ) + environment.put("BPE_DEFAULT_LANG", "en_US.utf8") // java.text.Normalizer does not care for file.encoding imageName.set("nexus.knecon.com:5001/red/${project.name}")// must build image with same name always, otherwise the builder will not know which image to use as cache. DO NOT CHANGE! if (project.hasProperty("buildbootDockerHostNetwork")) { @@ -188,10 +181,15 @@ tasks.register("generateJavaDoc", Javadoc::class) { dependsOn("compileJava") dependsOn("delombok") classpath = project.sourceSets["main"].runtimeClasspath - source = fileTree("${buildDir}/generated/sources/delombok/java/main") { + val documentFiles = fileTree("${project(":document").layout.buildDirectory.get()}/generated/sources/delombok/java/main") { include(droolsImports) } - destinationDir = file(project.findProperty("javadocDestinationDir")?.toString() ?: "") + val mainFiles = fileTree("${layout.buildDirectory.get()}/generated/sources/delombok/java/main") { + include(droolsImports) + } + source = documentFiles + mainFiles + + setDestinationDir(file(project.findProperty("javadocDestinationDir")?.toString() ?: "")) options.memberLevel = JavadocMemberLevel.PUBLIC (options as StandardJavadocDocletOptions).apply {