From a9c4c58fdb558ddb4ef11581c001f44b3954ab4d Mon Sep 17 00:00:00 2001
From: Bruno Sakoto <bruno.sakoto@bell.ca>
Date: Wed, 2 Mar 2022 14:12:27 -0500
Subject: Update dependencies as recommended by SECCOM

See also https://wiki.onap.org/display/SV/Jakarta+CPS

Issue-ID: CPS-815
Change-Id: I88b82da5b7e93adfd106fe0a64287ff3afee26fa
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
---
 cps-tbdmt-dependencies/pom.xml | 48 ++++++++++++++++++++++++++++++++++++++++++
 cps-tbdmt-rest/pom.xml         | 25 ++--------------------
 cps-tbdmt-service/pom.xml      |  2 +-
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/cps-tbdmt-dependencies/pom.xml b/cps-tbdmt-dependencies/pom.xml
index 2a87140..3aa4b05 100644
--- a/cps-tbdmt-dependencies/pom.xml
+++ b/cps-tbdmt-dependencies/pom.xml
@@ -70,6 +70,54 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-jetty</artifactId>
+                <version>2.5.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-io</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-servlets</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-http</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.glassfish</groupId>
+                        <artifactId>jakarta.el</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>11.0.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlets</artifactId>
+                <version>11.0.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>11.0.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bitbucket.dunglv90</groupId>
+                <artifactId>dp-utility</artifactId>
+                <version>1.0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.8.9</version>
+            </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
diff --git a/cps-tbdmt-rest/pom.xml b/cps-tbdmt-rest/pom.xml
index 57fa0f3..f1e6cb8 100644
--- a/cps-tbdmt-rest/pom.xml
+++ b/cps-tbdmt-rest/pom.xml
@@ -46,40 +46,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
-            <version>2.5.2</version>
-             <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-io</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-servlets</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-http</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>jakarta.el</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>9.4.40.v20210413</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
-            <version>9.4.40.v20210413</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>9.4.40.v20210413</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -92,4 +71,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/cps-tbdmt-service/pom.xml b/cps-tbdmt-service/pom.xml
index 27ded92..884b385 100644
--- a/cps-tbdmt-service/pom.xml
+++ b/cps-tbdmt-service/pom.xml
@@ -37,7 +37,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <spring.version>5.3.7</spring.version>
+        <spring.version>5.3.13</spring.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
     </properties>
 
-- 
cgit 1.2.3-korg