diff --git a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts index 3c05f811..87ec3822 100644 --- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts @@ -4,12 +4,11 @@ plugins { } description = "redaction-service-api-v1" -val persistenceServiceVersion = "2.651.0-RED9472.0" +val persistenceServiceVersion = "2.631.0" dependencies { implementation("org.springframework:spring-web:6.0.12") implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") - api("com.knecon.fforesight:swagger-commons:0.7.0") } publishing { 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 89e92e1f..f5f0d918 100644 --- a/redaction-service-v1/redaction-service-server-v1/build.gradle.kts +++ b/redaction-service-v1/redaction-service-server-v1/build.gradle.kts @@ -16,7 +16,7 @@ val layoutParserVersion = "0.193.0" val jacksonVersion = "2.15.2" val droolsVersion = "9.44.0.Final" val pdfBoxVersion = "3.0.0" -val persistenceServiceVersion = "2.641.0" +val persistenceServiceVersion = rootProject.extra.get("persistenceServiceVersion") val llmServiceVersion = "1.20.0-RED10072.2" val springBootStarterVersion = "3.1.5" val springCloudVersion = "4.0.4" @@ -191,7 +191,7 @@ tasks.register("generateJavaDoc", Javadoc::class) { } source = documentFiles + mainFiles - setDestinationDir(file(project.findProperty("javadocDestinationDir")?.toString() ?: "")) + setDestinationDir(file(project.findProperty("javadocDestinationDir")?.toString() ?: "javadoc")) options.memberLevel = JavadocMemberLevel.PUBLIC (options as StandardJavadocDocletOptions).apply { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta index 57e6e0dd..5705cc07 160000 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit 57e6e0dd3c08a3a65ec59b5dfb70f0f77ebcc7c7 +Subproject commit 5705cc0782605fdca5dfff134b436f7143c9e421 diff --git a/redaction-service-v1/rules-management/build.gradle.kts b/redaction-service-v1/rules-management/build.gradle.kts index b005ed7e..2aaea40c 100644 --- a/redaction-service-v1/rules-management/build.gradle.kts +++ b/redaction-service-v1/rules-management/build.gradle.kts @@ -27,10 +27,10 @@ sourceSets { } dependencies { - implementation(project(mapOf("path" to ":redaction-service-server-v1"))) + implementation(project(":redaction-service-server-v1")) testImplementation(platform("org.junit:junit-bom:5.10.0")) testImplementation("org.junit.jupiter:junit-jupiter") - implementation(project(":redaction-service-server-v1")) + implementation("com.github.javaparser:javaparser-core:3.25.3") implementation("org.drools:drools-drl-parser:8.41.0.Final") implementation("org.apache.commons:commons-csv:1.10.0")