Consolidating the maven dependency version at the cds-aggregator pom

Issue-ID: CCSDK-4141
Change-Id: I723521cfb04e532802f2a2a16a05da3260bccf30
Signed-off-by: ajashank <ajay.shankar@capgemini.com>

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 c80a77d..0096985 100644 (file)
--- 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 3b71dfd..740df76 100755 (executable)
--- a/ms/blueprintsprocessor/application/pom.xml
+++ b/ms/blueprintsprocessor/application/pom.xml
@@ -177,7 +177,6 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.13.16</version>
         </dependency>
         <dependency>
             <groupId>com.nhaarman.mockitokotlin2</groupId>

diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml
index 2ec9f6e..05c291b 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml
@@ -41,7 +41,6 @@
          <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.13.16</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>

diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml
index 2cd0d29..f742479 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.13.16</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
index e010a05..45cf10b 100755 (executable)
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
@@ -74,7 +74,6 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.13.16</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index a6150d0..b84e3eb 100755 (executable)
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -56,58 +56,11 @@
         <commons-io-version>2.17.0</commons-io-version>
         <commons-compress-version>1.26.0</commons-compress-version>
         <commons-collections-version>4.4</commons-collections-version>
-        <commons-beanutils-version>1.11.0</commons-beanutils-version>
-        <commons-text-version>1.10.0</commons-text-version>
 
-        <jsoup-version>1.15.3</jsoup-version>
-        <scala-version>2.13.16</scala-version>
-        <jetbrains-annotations-version>23.0.0</jetbrains-annotations-version>
-        <jsr305-version>3.0.2</jsr305-version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.google.errorprone</groupId>
-                <artifactId>error_prone_annotations</artifactId>
-                <version>2.41.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-core-jvm</artifactId>
-                <version>1.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-reactive</artifactId>
-                <version>1.9.0</version>
-            </dependency>
-            <!-- Import Jakarta JAXB BOM -->
-            <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-bom</artifactId>
-                <version>4.0.5</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- Commons Logging: resolve 1.2 vs 1.3.5 -->
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <!-- Woodstox: match jackson-dataformat-xml expectation -->
-            <dependency>
-                <groupId>com.fasterxml.woodstox</groupId>
-                <artifactId>woodstox-core</artifactId>
-                <version>7.1.1</version>
-            </dependency>
-            <!-- ANTLR: unify to 4.13.0 referenced by Hibernate chain -->
-            <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-runtime</artifactId>
-                <version>4.13.0</version>
-            </dependency>
             <!-- Spring Boot -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -181,71 +134,6 @@
                 <artifactId>jython-standalone</artifactId>
                 <version>${jython.version}</version>
             </dependency>
-            <dependency>
-                <groupId>net.minidev</groupId>
-                <artifactId>json-smart</artifactId>
-                <version>${json-smart.version}</version>
-            </dependency>
-            <!-- commons-beanutils Dependency -->
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>${commons-beanutils-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-text</artifactId>
-                <version>${commons-text-version}</version>
-            </dependency>
-
-            <!-- jsoup Dependency -->
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>${jsoup-version}</version>
-            </dependency>
-            <!-- protobuf-java and protobuf-java-utils -->
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>${protobuff.java.utils.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java-util</artifactId>
-                <version>${protobuff.java.utils.version}</version>
-            </dependency>
-            <!-- httpclient Dependency -->
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${apache.httpcomponents.client.version}</version>
-            </dependency>
-            <!-- scala Dependencies -->
-            <dependency>
-                <groupId>org.scala-lang</groupId>
-                <artifactId>scala-library</artifactId>
-                <version>${scala-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang</groupId>
-                <artifactId>scala-reflect</artifactId>
-                <version>${scala-version}</version>
-            </dependency>
-
-            <!-- JetBrains annotations -->
-            <dependency>
-                <groupId>org.jetbrains</groupId>
-                <artifactId>annotations</artifactId>
-                <version>${jetbrains-annotations-version}</version>
-            </dependency>
-            <!-- jsr305 Dependency -->
-            <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>jsr305</artifactId>
-                <version>${jsr305-version}</version>
-            </dependency>
-
             <!-- Kotlin Dependencies -->
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -683,7 +571,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -693,7 +580,6 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
@@ -828,29 +714,6 @@
             <groupId>org.onap.ccsdk.cds.error.catalog</groupId>
             <artifactId>error-catalog-core</artifactId>
         </dependency>
-        <!-- Import Jakarta JAXB BOM -->
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-bom</artifactId>
-            <version>4.0.5</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-        <!-- required for java 11 -->
-        <!--<dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>4.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
-        </dependency> -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>

diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml
index f517e8b..62f3b19 100755 (executable)
--- a/ms/sdclistener/parent/pom.xml
+++ b/ms/sdclistener/parent/pom.xml
@@ -44,43 +44,10 @@
         <jmockit.version>1.49</jmockit.version>
         <reactorcore.version>3.2.6.RELEASE</reactorcore.version>
 
-        <jsoup-version>1.15.3</jsoup-version>
-        <jetbrains-annotations-version>23.0.0</jetbrains-annotations-version>
-        <error-prone-annotations-version>2.41.0</error-prone-annotations-version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-core</artifactId>
-                <version>1.9.0</version>
-            </dependency>
-            <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactor</artifactId>
-            <version>1.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-core-jvm</artifactId>
-                <version>1.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlinx</groupId>
-                <artifactId>kotlinx-coroutines-reactive</artifactId>
-                <version>1.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.woodstox</groupId>
-                <artifactId>woodstox-core</artifactId>
-                <version>7.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>4.5.14</version>
-            </dependency>
             <!-- Spring Boot -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -91,21 +58,11 @@
             </dependency>
 
             <!-- Common Utils Dependencies -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.17.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
                 <version>4.4</version>
             </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.17.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
@@ -178,26 +135,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
-            <!-- error_prone_annotation Dependency -->
-            <dependency>
-                <groupId>com.google.errorprone</groupId>
-                <artifactId>error_prone_annotations</artifactId>
-                <version>${error-prone-annotations-version}</version>
-            </dependency>
-            <!-- JetBrains annotations Dependency -->
-            <dependency>
-                <groupId>org.jetbrains</groupId>
-                <artifactId>annotations</artifactId>
-                <version>${jetbrains-annotations-version}</version>
-            </dependency>
-            <!-- jsoup Dependency -->
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>${jsoup-version}</version>
-            </dependency>
-
             <!-- Test Dependency -->
             <dependency>
                 <groupId>io.grpc</groupId>

diff --git a/pom.xml b/pom.xml
index db2c14a..ddf54d0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -89,9 +89,152 @@ limitations under the License.
         <protobuff.java.version>3.25.8</protobuff.java.version>
         <protobuff.java.utils.version>3.25.8</protobuff.java.utils.version>
         <mockk.version>1.13.12</mockk.version>
+        <commons-beanutils-version>1.11.0</commons-beanutils-version>
+        <commons-text-version>1.10.0</commons-text-version>
+        <jsoup-version>1.15.3</jsoup-version>
+        <scala-version>2.13.16</scala-version>
+        <jetbrains-annotations-version>23.0.0</jetbrains-annotations-version>
+        <jsr305-version>3.0.2</jsr305-version>
+        <jsoup-version>1.15.3</jsoup-version>
+        <error-prone-annotations-version>2.41.0</error-prone-annotations-version>
 
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>2.41.0</version>
+            </dependency>
+            <!-- Import Jakarta JAXB BOM -->
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-bom</artifactId>
+                <version>4.0.5</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Commons Logging: resolve 1.2 vs 1.3.5 -->
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.3.5</version>
+            </dependency>
+            <!-- Woodstox: match jackson-dataformat-xml expectation -->
+            <dependency>
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
+                <version>7.1.1</version>
+            </dependency>
+            <!-- ANTLR: unify to 4.13.0 referenced by Hibernate chain -->
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>4.13.0</version>
+            </dependency>
+            <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>${json-smart.version}</version>
+            </dependency>
+            <!-- commons-beanutils Dependency -->
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>${commons-beanutils-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>${commons-text-version}</version>
+            </dependency>
+            <!-- jsoup Dependency -->
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>${jsoup-version}</version>
+            </dependency>
+            <!-- protobuf-java and protobuf-java-utils -->
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuff.java.utils.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>${protobuff.java.utils.version}</version>
+            </dependency>
+            <!-- httpclient Dependency -->
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${apache.httpcomponents.client.version}</version>
+            </dependency>
+            <!-- scala Dependencies -->
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>${scala-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-reflect</artifactId>
+                <version>${scala-version}</version>
+            </dependency>
+
+            <!-- JetBrains annotations -->
+            <dependency>
+                <groupId>org.jetbrains</groupId>
+                <artifactId>annotations</artifactId>
+                <version>${jetbrains-annotations-version}</version>
+            </dependency>
+            <!-- jsr305 Dependency -->
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>${jsr305-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.17.0</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.17.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.19.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-core</artifactId>
+                <version>${kotlin.couroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-reactor</artifactId>
+                <version>${kotlin.couroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+                <version>${kotlin.couroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-reactive</artifactId>
+                <version>${kotlin.couroutines.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -369,7 +512,11 @@ limitations under the License.
                                         Dependency convergence failure: multiple versions detected.
                                     </message>
                                 </dependencyConvergence>
-
+                                <requireSameVersions>
+                                    <message>
+                                        Multiple versions of the same dependency detected — align versions in dependencyManagement.
+                                    </message>
+                                </requireSameVersions>
                                 <!-- Ban legacy/broken or security-vulnerable dependencies -->
                                 <bannedDependencies>
                                     <searchTransitive>true</searchTransitive>