From aa8f3448bab8a457ca96a43c3f0b0d615bdd871b Mon Sep 17 00:00:00 2001
From: hekeguang <hekeguang@chinamobile.com>
Date: Sun, 27 Feb 2022 20:32:33 +0800
Subject: PACKAGES UPGRADES IN DIRECT DEPENDENCIES FOR JAKARTA.

Issue-ID: USECASEUI-635
Change-Id: I0ec38a1445e6b8499a53cb9378acde0c74abbd8c
Signed-off-by: hekeguang <hekeguang@chinamobile.com>
---
 server/pom.xml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/server/pom.xml b/server/pom.xml
index 3352835e..3e3a1a7b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -112,9 +112,9 @@
         </dependency>
         <!-- postgresql  dependency-->
         <dependency>
-            <groupId>postgresql</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.3-1102.jdbc4</version>
+            <version>42.3.1</version>
         </dependency>
 
 	<dependency>
@@ -181,17 +181,17 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>9.4.14.v20181114</version>
+            <version>11.0.7</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.17.v20190418</version>
+            <version>11.0.7</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-            <version>5.2.9.RELEASE</version>
+            <version>5.3.13</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.2.9.RELEASE</version>
+            <version>5.3.13</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -211,7 +211,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.2.14.RELEASE</version>
+            <version>5.3.13</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.2.9.RELEASE</version>
+            <version>5.3.13</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.6</version>
+            <version>2.8.9</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <dependency>
@@ -303,11 +303,6 @@
             <version>1.2.74</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>2.6.9</version>
-        </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.jtosca</groupId>
             <artifactId>jtosca</artifactId>
@@ -346,7 +341,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
         </dependency>
         <dependency>
             <groupId>org.jmockit</groupId>
@@ -388,7 +383,13 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.10.0</version>
+            <version>1.10.12</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
-- 
cgit 1.2.3-korg