From e0c4f78469aa1750fc082114d943cf029d2b94c0 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Wed, 10 Apr 2024 11:06:34 +0100
Subject: [PATCH] Dependency management updates for security and
 vulnerabilities fixes.

Issue-ID: POLICY-4945
Change-Id: Ie827d95f46875fe2256c3447c21f2b7ea5384300
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 integration/pom.xml | 120 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 108 insertions(+), 12 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index 93c3e6e4..c0e5a4ed 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -44,11 +44,14 @@
         <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
         <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
         <!-- Dependency Versions -->
+        <version.beanutils>1.9.4</version.beanutils>
         <version.ccsdk>1.5.3</version.ccsdk>
         <version.cucumber>7.15.0</version.cucumber>
         <version.docker-java>3.3.2</version.docker-java>
         <version.drools>8.40.1.Final</version.drools>
         <version.frontend.maven>1.13.4</version.frontend.maven>
+        <version.guava>33.0.0-jre</version.guava>
+        <version.httpclient>5.3.1</version.httpclient>
         <version.io.prometheus>0.16.0</version.io.prometheus>
         <version.jackson>2.16.1</version.jackson>
         <version.jacoco>0.8.11</version.jacoco>
@@ -57,7 +60,7 @@
         <version.jetty>11.0.20</version.jetty>
         <version.jupiter>5.10.2</version.jupiter>
         <version.kafka>3.6.1</version.kafka>
-        <version.kotlin>1.9.22</version.kotlin>
+        <version.kotlin>1.9.23</version.kotlin>
         <version.log4j>2.23.1</version.log4j>
         <version.logback>1.4.14</version.logback>
         <version.maven-remote-resources-plugin>3.1.0</version.maven-remote-resources-plugin>
@@ -68,15 +71,17 @@
         <version.netty>4.1.100.Final</version.netty>
         <version.nsa-cambria>1.2.1-oss</version.nsa-cambria>
         <version.nsa-sa-client>1.3.0-oss</version.nsa-sa-client>
+        <version.opentel>1.25.0</version.opentel>
         <version.plexus>3.5.0</version.plexus>
         <version.sdc-dist>2.1.1</version.sdc-dist>
         <version.sdc-tosca>1.9.0</version.sdc-tosca>
         <version.slf4j>2.0.12</version.slf4j>
-        <version.spring>6.0.17</version.spring>
-        <version.springboot>3.1.9</version.springboot>
-        <version.spring-security>6.1.7</version.spring-security>
+        <version.spring>6.0.18</version.spring>
+        <version.springboot>3.1.10</version.springboot>
+        <version.spring-security>6.1.8</version.spring-security>
         <version.swagger.codegen.v3>3.0.52</version.swagger.codegen.v3>
         <version.swagger.core.v3>2.2.20</version.swagger.core.v3>
+        <version.tomcat>10.1.19</version.tomcat>
         <surefireArgLine>
             --add-opens java.base/java.time=ALL-UNNAMED
             --add-opens java.base/java.util=ALL-UNNAMED
@@ -103,11 +108,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.containers</groupId>
                 <artifactId>jersey-container-servlet</artifactId>
                 <version>${version.jersey}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.inject</groupId>
+                <artifactId>jersey-hk2</artifactId>
+                <version>${version.jersey}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
@@ -163,7 +178,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>33.0.0-jre</version>
+                <version>${version.guava}</version>
             </dependency>
 
             <!-- Jakarta dependencies -->
@@ -223,6 +238,11 @@
                 <artifactId>jakarta.inject-api</artifactId>
                 <version>2.0.1</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.persistence</groupId>
+                <artifactId>jakarta.persistence-api</artifactId>
+                <version>3.1.0</version>
+            </dependency>
             <!-- Swagger -->
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
@@ -273,7 +293,17 @@
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>
                 <artifactId>httpclient5</artifactId>
-                <version>5.3.1</version>
+                <version>${version.httpclient}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.4.16</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.14</version>
             </dependency>
 
             <!-- JSON marshalling and unmarshalling -->
@@ -651,7 +681,7 @@
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
-                <version>1.9.4</version>
+                <version>${version.beanutils}</version>
             </dependency>
             <!-- Github -->
             <dependency>
@@ -670,13 +700,23 @@
             <dependency>
                 <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-core</artifactId>
-                <version>6.3.0.CR1</version>
+                <version>6.3.2.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-core-jakarta</artifactId>
                 <version>5.6.15.Final</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.common</groupId>
+                <artifactId>hibernate-commons-annotations</artifactId>
+                <version>6.0.6.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.validator</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>8.0.1.Final</version>
+            </dependency>
 
             <!-- Spring -->
             <dependency>
@@ -684,6 +724,11 @@
                 <artifactId>spring-core</artifactId>
                 <version>${version.spring}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${version.spring}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
@@ -719,6 +764,26 @@
                 <artifactId>spring-webflux</artifactId>
                 <version>${version.spring}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aspects</artifactId>
+                <version>${version.spring}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-orm</artifactId>
+                <version>${version.spring}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-tx</artifactId>
+                <version>${version.spring}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>${version.spring}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-web</artifactId>
@@ -746,6 +811,21 @@
                 <artifactId>spring-boot-starter-security</artifactId>
                 <version>${version.springboot}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+                <version>${version.spring-security}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-config</artifactId>
+                <version>${version.spring-security}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-test</artifactId>
+                <version>${version.spring-security}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-validation</artifactId>
@@ -818,17 +898,17 @@
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
                 <artifactId>opentelemetry-kafka-clients-2.6</artifactId>
-                <version>1.25.0-alpha</version>
+                <version>${version.opentel}-alpha</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-exporter-otlp</artifactId>
-                <version>1.25.0</version>
+                <version>${version.opentel}</version>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
-                <version>1.25.0-alpha</version>
+                <version>${version.opentel}-alpha</version>
             </dependency>
             <dependency>
                 <groupId>io.micrometer</groupId>
@@ -838,7 +918,12 @@
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-sdk-extension-jaeger-remote-sampler</artifactId>
-                <version>1.25.0</version>
+                <version>${version.opentel}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry</groupId>
+                <artifactId>opentelemetry-context</artifactId>
+                <version>${version.opentel}</version>
             </dependency>
 
             <!-- Kotlin dependencies -->
@@ -852,11 +937,22 @@
                 <artifactId>kotlin-stdlib-jdk8</artifactId>
                 <version>${version.kotlin}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk7</artifactId>
+                <version>${version.kotlin}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-reflect</artifactId>
                 <version>${version.kotlin}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-common</artifactId>
+                <version>${version.kotlin}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
     <scm>
-- 
2.16.6