From faade24e9792ba1beab06d08c295899778b2786e Mon Sep 17 00:00:00 2001 From: ajashank Date: Tue, 17 Mar 2026 17:07:23 +0530 Subject: [PATCH] Fix for conflicting dependencies Issue-ID: CCSDK-4141 Change-Id: I46f29567e8d7459b3e31e71013f5ee56c070e089 Signed-off-by: PeukerL@telekom.de Signed-off-by: ajashank --- .../media/cds-bp-processor-api-swagger.json | 48 +++---- ms/blueprintsprocessor/application/pom.xml | 10 +- ms/blueprintsprocessor/functions/pom.xml | 4 + .../modules/commons/message-lib/pom.xml | 8 +- .../modules/commons/nats-lib/pom.xml | 6 + .../modules/commons/ssh-lib/pom.xml | 2 +- .../modules/inbounds/selfservice-api/pom.xml | 14 +- .../modules/services/execution-service/pom.xml | 14 ++ .../modules/services/workflow-service/pom.xml | 14 ++ ms/blueprintsprocessor/parent/pom.xml | 154 ++++++++++++++++++++- ms/error-catalog/core/pom.xml | 1 + ms/error-catalog/pom.xml | 51 +++++++ ms/error-catalog/services/pom.xml | 19 +++ ms/sdclistener/parent/pom.xml | 59 +++++++- pom.xml | 82 ++++++++++- 15 files changed, 444 insertions(+), 42 deletions(-) diff --git a/docs/api-reference/media/cds-bp-processor-api-swagger.json b/docs/api-reference/media/cds-bp-processor-api-swagger.json index db1c3381a..c80a77d9e 100644 --- a/docs/api-reference/media/cds-bp-processor-api-swagger.json +++ b/docs/api-reference/media/cds-bp-processor-api-swagger.json @@ -1967,16 +1967,19 @@ "bigInteger" : { "type" : "boolean" }, - "pojo" : { + "textual" : { "type" : "boolean" }, - "textual" : { + "pojo" : { "type" : "boolean" }, "nodeType" : { "type" : "string", "enum" : [ "ARRAY", "BINARY", "BOOLEAN", "MISSING", "NULL", "NUMBER", "OBJECT", "POJO", "STRING" ] }, + "short" : { + "type" : "boolean" + }, "array" : { "type" : "boolean" }, @@ -1989,6 +1992,9 @@ "number" : { "type" : "boolean" }, + "object" : { + "type" : "boolean" + }, "boolean" : { "type" : "boolean" }, @@ -2001,14 +2007,8 @@ "long" : { "type" : "boolean" }, - "short" : { - "type" : "boolean" - }, "binary" : { "type" : "boolean" - }, - "object" : { - "type" : "boolean" } } }, @@ -2167,10 +2167,13 @@ "bigInteger" : { "type" : "boolean" }, + "textual" : { + "type" : "boolean" + }, "pojo" : { "type" : "boolean" }, - "textual" : { + "short" : { "type" : "boolean" }, "array" : { @@ -2185,6 +2188,9 @@ "number" : { "type" : "boolean" }, + "object" : { + "type" : "boolean" + }, "boolean" : { "type" : "boolean" }, @@ -2197,14 +2203,8 @@ "long" : { "type" : "boolean" }, - "short" : { - "type" : "boolean" - }, "binary" : { "type" : "boolean" - }, - "object" : { - "type" : "boolean" } } }, @@ -2252,6 +2252,9 @@ "last" : { "type" : "boolean" }, + "first" : { + "type" : "boolean" + }, "size" : { "type" : "integer", "format" : "int32" @@ -2269,9 +2272,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, "empty" : { "type" : "boolean" } @@ -2298,6 +2298,9 @@ "last" : { "type" : "boolean" }, + "first" : { + "type" : "boolean" + }, "size" : { "type" : "integer", "format" : "int32" @@ -2315,9 +2318,6 @@ "sort" : { "$ref" : "#/definitions/Sort" }, - "first" : { - "type" : "boolean" - }, "empty" : { "type" : "boolean" } @@ -2609,14 +2609,14 @@ "Sort" : { "type" : "object", "properties" : { - "sorted" : { - "type" : "boolean" - }, "unsorted" : { "type" : "boolean" }, "empty" : { "type" : "boolean" + }, + "sorted" : { + "type" : "boolean" } } }, diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index ad174c508..3b71dfd15 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -126,6 +126,14 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions config-snapshots + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + org.onap.ccsdk.cds.blueprintsprocessor.functions k8s-connection-plugin @@ -169,7 +177,7 @@ org.scala-lang scala-library - 2.13.9 + 2.13.16 com.nhaarman.mockitokotlin2 diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index 0d640004d..eb990085b 100755 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -70,6 +70,10 @@ commons-collections commons-collections + + com.sun.xml.bind + jaxb-impl + diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml index f24c8384e..2ec9f6ec7 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml @@ -41,7 +41,7 @@ org.scala-lang scala-library - 2.13.9 + 2.13.16 org.springframework.kafka @@ -65,6 +65,12 @@ org.springframework.kafka spring-kafka-test test + + + commons-collections + commons-collections + + diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml index b73665ec4..efe60d4e0 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml @@ -38,6 +38,12 @@ io.nats java-nats-streaming + + + io.nats + jnats + + org.onap.ccsdk.cds.blueprintsprocessor.modules diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml index a07f5aea0..2cd0d297c 100644 --- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml @@ -46,7 +46,7 @@ org.scala-lang scala-library - 2.13.9 + 2.13.16 diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index cb6609a95..e010a05c7 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -74,17 +74,29 @@ org.scala-lang scala-library - 2.13.9 + 2.13.16 org.springframework.kafka spring-kafka-test test + + + commons-collections + commons-collections + + commons-beanutils commons-beanutils 1.11.0 + + + commons-collections + commons-collections + + diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml index e2874ec3a..61b484aec 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml @@ -63,6 +63,20 @@ org.onap.ccsdk.sli.core sli-provider + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + + javax.xml.bind + jaxb-api + + io.grpc diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml index 7c5606103..724da4660 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml @@ -43,6 +43,20 @@ org.onap.ccsdk.sli.core sli-provider-base ${ccsdk.sli.core.version} + + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index 95bba5a6d..a6150d0e4 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -51,15 +51,63 @@ 2.7.0 33.0.0-jre 1.9 - 2.4.9 + 2.5.2 - 2.14.0 + 2.17.0 1.26.0 4.4 + 1.11.0 + 1.10.0 + + 1.15.3 + 2.13.16 + 23.0.0 + 3.0.2 + + com.google.errorprone + error_prone_annotations + 2.41.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactive + 1.9.0 + + + + org.glassfish.jaxb + jaxb-bom + 4.0.5 + pom + import + + + + commons-logging + commons-logging + 1.3.5 + + + + com.fasterxml.woodstox + woodstox-core + 7.1.1 + + + + org.antlr + antlr4-runtime + 4.13.0 + org.springframework.boot @@ -133,6 +181,70 @@ jython-standalone ${jython.version} + + net.minidev + json-smart + ${json-smart.version} + + + + commons-beanutils + commons-beanutils + ${commons-beanutils-version} + + + org.apache.commons + commons-text + ${commons-text-version} + + + + + org.jsoup + jsoup + ${jsoup-version} + + + + com.google.protobuf + protobuf-java + ${protobuff.java.utils.version} + + + com.google.protobuf + protobuf-java-util + ${protobuff.java.utils.version} + + + + org.apache.httpcomponents + httpclient + ${apache.httpcomponents.client.version} + + + + org.scala-lang + scala-library + ${scala-version} + + + org.scala-lang + scala-reflect + ${scala-version} + + + + + org.jetbrains + annotations + ${jetbrains-annotations-version} + + + + com.google.code.findbugs + jsr305 + ${jsr305-version} + @@ -571,6 +683,7 @@ org.apache.commons commons-lang3 + 3.17.0 org.apache.commons @@ -580,6 +693,7 @@ commons-io commons-io + 2.17.0 com.jayway.jsonpath @@ -617,14 +731,32 @@ org.jetbrains.kotlin kotlin-script-util 1.8.22 + + + org.jetbrains.kotlin + kotlin-stdlib + + org.jetbrains.kotlinx kotlinx-coroutines-core + + + org.jetbrains.kotlin + kotlin-stdlib + + org.jetbrains.kotlinx kotlinx-coroutines-reactor + + + org.jetbrains.kotlin + kotlin-stdlib + + com.fasterxml.jackson.module @@ -696,10 +828,18 @@ org.onap.ccsdk.cds.error.catalog error-catalog-core - + - jakarta.xml.bind - jakarta.xml.bind-api + org.glassfish.jaxb + jaxb-bom + 4.0.5 + pom + import + + + org.springframework.boot spring-boot-starter-validation diff --git a/ms/error-catalog/core/pom.xml b/ms/error-catalog/core/pom.xml index 3e1a8d997..80464286e 100644 --- a/ms/error-catalog/core/pom.xml +++ b/ms/error-catalog/core/pom.xml @@ -45,6 +45,7 @@ org.apache.commons commons-lang3 + 3.17.0 jakarta.persistence diff --git a/ms/error-catalog/pom.xml b/ms/error-catalog/pom.xml index 7dee56697..ebe27448a 100644 --- a/ms/error-catalog/pom.xml +++ b/ms/error-catalog/pom.xml @@ -54,6 +54,57 @@ error-catalog-services ${error-catalog.version} + + + + org.apache.commons + commons-text + 1.10.0 + + + + org.jetbrains + annotations + 23.0.0 + + + + org.jsoup + jsoup + 1.15.3 + + + com.fasterxml.jackson + jackson-bom + 2.19.2 + pom + import + + + org.antlr + antlr4-runtime + 4.13.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactive + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactor + 1.9.0 + diff --git a/ms/error-catalog/services/pom.xml b/ms/error-catalog/services/pom.xml index 93a79ac5d..b31296725 100644 --- a/ms/error-catalog/services/pom.xml +++ b/ms/error-catalog/services/pom.xml @@ -57,15 +57,34 @@ org.jetbrains.kotlinx kotlinx-coroutines-core + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlinx kotlinx-coroutines-reactor + + + org.jetbrains.kotlin + kotlin-stdlib + + org.jetbrains.kotlin kotlin-script-util 1.8.22 + + + org.jetbrains.kotlin + kotlin-stdlib + + diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index 10795567d..f517e8ba8 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -43,10 +43,44 @@ 3.3.1 1.49 3.2.6.RELEASE + + 1.15.3 + 23.0.0 + 2.41.0 + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactor + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.9.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactive + 1.9.0 + + + com.fasterxml.woodstox + woodstox-core + 7.1.1 + + + org.apache.httpcomponents + httpclient + 4.5.14 + org.springframework.boot @@ -60,7 +94,7 @@ org.apache.commons commons-lang3 - 3.2.1 + 3.17.0 org.apache.commons @@ -70,7 +104,7 @@ commons-io commons-io - 2.14.0 + 2.17.0 org.apache.commons @@ -145,6 +179,25 @@ + + + com.google.errorprone + error_prone_annotations + ${error-prone-annotations-version} + + + + org.jetbrains + annotations + ${jetbrains-annotations-version} + + + + org.jsoup + jsoup + ${jsoup-version} + + io.grpc @@ -193,7 +246,7 @@ org.jetbrains.kotlin kotlin-compiler-embeddable - 1.7.0 + 1.9.25 diff --git a/pom.xml b/pom.xml index 1fe35584f..db2c14ade 100644 --- a/pom.xml +++ b/pom.xml @@ -77,13 +77,13 @@ limitations under the License. 1.5.2 ${project.version} - 1.9.0 + 1.9.25 1.9.0 1.9.0 1.11.0 4.5.14 - 1.14.17 + 1.17.7 1.29.0 2.0.70.Final 3.25.8 @@ -106,9 +106,8 @@ limitations under the License. org.yaml snakeyaml - 2.0 + 2.4 - @@ -349,6 +348,81 @@ limitations under the License. org.apache.maven.plugins maven-compiler-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + enforce + validate + + enforce + + + true + + + + + Dependency convergence failure: multiple versions detected. + + + + + + true + + + com.sun.xml.bind:jaxb-impl + com.sun.xml.bind:jaxb-core + + + commons-collections:commons-collections:[3.0,4.0) + + + commons-beanutils:commons-beanutils:[1.8,1.9) + + + commons-beanutils:commons-beanutils:[1.9.0] + + org.hsqldb:hsqldb:1.* + + + io.netty:netty-*: [4.1.50,4.1.60) + + + org.jetbrains.kotlin:kotlin-stdlib:(,1.9.25),(1.9.25,) + + + jakarta.xml.bind:jakarta.xml.bind-api:(,4.0.2),(4.0.2,) + + + + Forbidden dependency detected — remove or upgrade to compliant version. + + + + + + + Version conflict detected — upper bound rule violated. + + + + + + [17,) + + Java 17+ is required to build ccsdk-cds. + + + + + + + -- 2.16.6