From: ajashank Date: Tue, 24 Mar 2026 13:10:32 +0000 (+0530) Subject: Consolidating the maven dependency version at the cds-aggregator pom X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f50e4aa6102f0a0314644a3050ef2226292360ea;p=ccsdk%2Fcds.git Consolidating the maven dependency version at the cds-aggregator pom Issue-ID: CCSDK-4141 Change-Id: I723521cfb04e532802f2a2a16a05da3260bccf30 Signed-off-by: ajashank --- 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 c80a77d9e..00969850d 100644 --- a/docs/api-reference/media/cds-bp-processor-api-swagger.json +++ b/docs/api-reference/media/cds-bp-processor-api-swagger.json @@ -373,6 +373,12 @@ "required" : false, "type" : "string", "default" : "ASC" + }, { + "name" : "published", + "in" : "query", + "description" : "Filter by published status (true or false)", + "required" : false, + "type" : "boolean" } ], "responses" : { "200" : { @@ -1955,6 +1961,9 @@ "missingNode" : { "type" : "boolean" }, + "pojo" : { + "type" : "boolean" + }, "integralNumber" : { "type" : "boolean" }, @@ -1970,16 +1979,10 @@ "textual" : { "type" : "boolean" }, - "pojo" : { - "type" : "boolean" - }, "nodeType" : { "type" : "string", "enum" : [ "ARRAY", "BINARY", "BOOLEAN", "MISSING", "NULL", "NUMBER", "OBJECT", "POJO", "STRING" ] }, - "short" : { - "type" : "boolean" - }, "array" : { "type" : "boolean" }, @@ -1992,9 +1995,6 @@ "number" : { "type" : "boolean" }, - "object" : { - "type" : "boolean" - }, "boolean" : { "type" : "boolean" }, @@ -2007,8 +2007,14 @@ "long" : { "type" : "boolean" }, + "short" : { + "type" : "boolean" + }, "binary" : { "type" : "boolean" + }, + "object" : { + "type" : "boolean" } } }, @@ -2155,6 +2161,9 @@ "missingNode" : { "type" : "boolean" }, + "pojo" : { + "type" : "boolean" + }, "integralNumber" : { "type" : "boolean" }, @@ -2170,12 +2179,6 @@ "textual" : { "type" : "boolean" }, - "pojo" : { - "type" : "boolean" - }, - "short" : { - "type" : "boolean" - }, "array" : { "type" : "boolean" }, @@ -2188,9 +2191,6 @@ "number" : { "type" : "boolean" }, - "object" : { - "type" : "boolean" - }, "boolean" : { "type" : "boolean" }, @@ -2203,8 +2203,14 @@ "long" : { "type" : "boolean" }, + "short" : { + "type" : "boolean" + }, "binary" : { "type" : "boolean" + }, + "object" : { + "type" : "boolean" } } }, @@ -2252,9 +2258,6 @@ "last" : { "type" : "boolean" }, - "first" : { - "type" : "boolean" - }, "size" : { "type" : "integer", "format" : "int32" @@ -2272,6 +2275,9 @@ "sort" : { "$ref" : "#/definitions/Sort" }, + "first" : { + "type" : "boolean" + }, "empty" : { "type" : "boolean" } @@ -2298,9 +2304,6 @@ "last" : { "type" : "boolean" }, - "first" : { - "type" : "boolean" - }, "size" : { "type" : "integer", "format" : "int32" @@ -2318,6 +2321,9 @@ "sort" : { "$ref" : "#/definitions/Sort" }, + "first" : { + "type" : "boolean" + }, "empty" : { "type" : "boolean" } @@ -2326,10 +2332,10 @@ "Pageable" : { "type" : "object", "properties" : { - "paged" : { + "unpaged" : { "type" : "boolean" }, - "unpaged" : { + "paged" : { "type" : "boolean" }, "pageSize" : { diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index 3b71dfd15..740df7652 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -177,7 +177,6 @@ org.scala-lang scala-library - 2.13.16 com.nhaarman.mockitokotlin2 diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml index 2ec9f6ec7..05c291b14 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml @@ -41,7 +41,6 @@ org.scala-lang scala-library - 2.13.16 org.springframework.kafka diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml index 2cd0d297c..f74247900 100644 --- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml @@ -46,7 +46,6 @@ org.scala-lang scala-library - 2.13.16 diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index e010a05c7..45cf10bbe 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -74,7 +74,6 @@ org.scala-lang scala-library - 2.13.16 org.springframework.kafka diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index a6150d0e4..b84e3eb15 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -56,58 +56,11 @@ 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 @@ -181,71 +134,6 @@ 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} - - org.jetbrains.kotlin @@ -683,7 +571,6 @@ org.apache.commons commons-lang3 - 3.17.0 org.apache.commons @@ -693,7 +580,6 @@ commons-io commons-io - 2.17.0 com.jayway.jsonpath @@ -828,29 +714,6 @@ org.onap.ccsdk.cds.error.catalog error-catalog-core - - - org.glassfish.jaxb - jaxb-bom - 4.0.5 - pom - import - - - org.springframework.boot spring-boot-starter-validation diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index f517e8ba8..62f3b197e 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -44,43 +44,10 @@ 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 @@ -91,21 +58,11 @@ - - org.apache.commons - commons-lang3 - 3.17.0 - org.apache.commons commons-collections4 4.4 - - commons-io - commons-io - 2.17.0 - org.apache.commons commons-compress @@ -178,26 +135,6 @@ - - - - com.google.errorprone - error_prone_annotations - ${error-prone-annotations-version} - - - - org.jetbrains - annotations - ${jetbrains-annotations-version} - - - - org.jsoup - jsoup - ${jsoup-version} - - io.grpc diff --git a/pom.xml b/pom.xml index db2c14ade..ddf54d06d 100644 --- a/pom.xml +++ b/pom.xml @@ -89,9 +89,152 @@ limitations under the License. 3.25.8 3.25.8 1.13.12 + 1.11.0 + 1.10.0 + 1.15.3 + 2.13.16 + 23.0.0 + 3.0.2 + 1.15.3 + 2.41.0 + + + + com.google.errorprone + error_prone_annotations + 2.41.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 + + + 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} + + + org.apache.commons + commons-lang3 + 3.17.0 + + + commons-io + commons-io + 2.17.0 + + + com.fasterxml.jackson + jackson-bom + 2.19.2 + pom + import + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + ${kotlin.couroutines.version} + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactor + ${kotlin.couroutines.version} + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + ${kotlin.couroutines.version} + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactive + ${kotlin.couroutines.version} + + + ch.qos.logback @@ -369,7 +512,11 @@ limitations under the License. Dependency convergence failure: multiple versions detected. - + + + Multiple versions of the same dependency detected — align versions in dependencyManagement. + + true