From 444a804b8dc56fd0606c327d522fa6339a6635ca Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 17:44:08 +0800
Subject: [PATCH 1/9] update version of 3rd.

---
 pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ae40ad..9391d4d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
         <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
         <spring-security-oauth2-autoconfigure.version>2.2.2.RELEASE</spring-security-oauth2-autoconfigure.version>
         <log4j.version>2.17.1</log4j.version>
+        <tomcat.embed.version>9.0.56</tomcat.embed.version>
     </properties>
 
     <dependencyManagement>
@@ -54,6 +55,54 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <artifactId>tomcat-embed-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tomcat-annotations-api</artifactId>
+                    <groupId>org.apache.tomcat</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <version>${tomcat.embed.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tomcat-embed-core</artifactId>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                </exclusion>
+            </exclusions>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <version>${tomcat.embed.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>${tomcat.embed.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>5.2.19.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>5.2.19.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>5.3.25.Final</version>
+        </dependency>
         <dependency>
             <artifactId>netty-common</artifactId>
             <groupId>io.netty</groupId>
@@ -221,7 +270,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.1.13.RELEASE</version>
+            <version>5.2.19.RELEASE</version>
         </dependency>
         <!--dependency>
             <groupId>org.springframework</groupId>
@@ -291,6 +340,12 @@
             <groupId>org.camunda.bpm.springboot</groupId>
             <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
             <version>${camunda.springboot.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -355,12 +410,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.3.10.RELEASE</version>
+            <version>5.3.13.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>5.3.8.RELEASE</version>
+            <version>5.3.13.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -484,7 +539,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>5.3.10.RELEASE</version>
+            <version>5.3.13.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-- 
Gitee


From 1a43c6504bc5ea39bf3bff8eea3b330a79f090fb Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 17:52:04 +0800
Subject: [PATCH 2/9] update version of 3rd.

---
 pom.xml | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9391d4d..858671b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -289,11 +289,6 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.26</version>
         </dependency>
-        <dependency>
-          <artifactId>spring-web</artifactId>
-          <groupId>org.springframework</groupId>
-          <version>5.1.13.RELEASE</version>
-        </dependency>
         <dependency>
           <artifactId>spring-aop</artifactId>
           <groupId>org.springframework</groupId>
@@ -315,11 +310,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <version>${spring-boot.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -374,11 +364,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
-            <version>${spring-boot.version}</version>
-        </dependency>
 
         <!--log4j2 -->
         <dependency>
@@ -482,17 +467,6 @@
         </dependency>
         <!-- end of swagger ui -->
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${spring-boot.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
@@ -546,7 +520,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>5.1.13.RELEASE</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 
-- 
Gitee


From 5a096830c954afda9a77fff99acfde8443333178 Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 17:55:14 +0800
Subject: [PATCH 3/9] update version of 3rd.

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 858671b..794bfae 100755
--- a/pom.xml
+++ b/pom.xml
@@ -343,11 +343,6 @@
             <version>1.4.199</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.26</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-- 
Gitee


From c60f1c05a3ed4083835d3e3ba13cdf3ca7e89883 Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 17:57:13 +0800
Subject: [PATCH 4/9] fix checkstyles

---
 .../mecm/appo/service/impl/ResourceMgrSecGrpImpl.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java b/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java
index 61ec207..04f6335 100755
--- a/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java
+++ b/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java
@@ -96,7 +96,8 @@ public class ResourceMgrSecGrpImpl implements ResourceMgrSecGrpService {
         String apiUrl = resourceMgrServiceHelper.getInventoryMecHostsCfg(accessToken, tenantId, hostIp);
         StringBuilder sb = new StringBuilder(apiUrl);
         apiUrl = sb.append(Constants.RESOURCE_CONTROLLER_URI).append(tenantId).append(Constants.HOSTS).append(hostIp
-                + Constants.SECURITY_GROUPS + securityGroupId + "/securityGroupRules/" + securityGroupRuleId).toString();
+                + Constants.SECURITY_GROUPS + securityGroupId + "/securityGroupRules/" +
+            securityGroupRuleId).toString();
         return restService.sendRequest_ResourceManager(apiUrl, HttpMethod.DELETE, accessToken, null);
     }
 
-- 
Gitee


From c9c1d5917673ecb76625990fc4ae96ea1b94fd53 Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 18:00:52 +0800
Subject: [PATCH 5/9] fix checkstyles

---
 .../mecm/appo/service/impl/ResourceMgrSecGrpImpl.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java b/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java
index 04f6335..b4fc7e3 100755
--- a/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java
+++ b/src/main/java/org/edgegallery/mecm/appo/service/impl/ResourceMgrSecGrpImpl.java
@@ -96,8 +96,8 @@ public class ResourceMgrSecGrpImpl implements ResourceMgrSecGrpService {
         String apiUrl = resourceMgrServiceHelper.getInventoryMecHostsCfg(accessToken, tenantId, hostIp);
         StringBuilder sb = new StringBuilder(apiUrl);
         apiUrl = sb.append(Constants.RESOURCE_CONTROLLER_URI).append(tenantId).append(Constants.HOSTS).append(hostIp
-                + Constants.SECURITY_GROUPS + securityGroupId + "/securityGroupRules/" +
-            securityGroupRuleId).toString();
+                + Constants.SECURITY_GROUPS + securityGroupId + "/securityGroupRules/"
+                + securityGroupRuleId).toString();
         return restService.sendRequest_ResourceManager(apiUrl, HttpMethod.DELETE, accessToken, null);
     }
 
-- 
Gitee


From e28fb7032ea27afa70dae54801b07984b33168ab Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 18:29:35 +0800
Subject: [PATCH 6/9] fix checkstyles

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 794bfae..c92f591 100755
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,11 @@
             <artifactId>tomcat-embed-el</artifactId>
             <version>${tomcat.embed.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>5.2.19.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
@@ -514,7 +519,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.1.13.RELEASE</version>
+            <version>5.2.19.RELEASE</version>
         </dependency>
     </dependencies>
 
-- 
Gitee


From 3074ba9456cbd27dd10b4c87a2b3908f094e7848 Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 18:40:38 +0800
Subject: [PATCH 7/9] update version of 3rd.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c92f591..c091609 100755
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,7 @@
         <dependency>
           <artifactId>spring-aop</artifactId>
           <groupId>org.springframework</groupId>
-          <version>5.1.13.RELEASE</version>
+          <version>5.2.19.RELEASE</version>
         </dependency>
         <dependency>
           <groupId>org.junit.jupiter</groupId>
-- 
Gitee


From dab680c0205444cd68851dd866a9651a17065cbd Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 18:59:33 +0800
Subject: [PATCH 8/9] update version of 3rd.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c091609..9378a8e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -345,7 +345,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.199</version>
+            <version>2.0.199</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-- 
Gitee


From 4cfeb82a0b455a5d1f00f1ddcc662e86438d4f35 Mon Sep 17 00:00:00 2001
From: chandler-lee <13106126@163.com>
Date: Thu, 27 Jan 2022 19:01:24 +0800
Subject: [PATCH 9/9] update version of 3rd.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9378a8e..c091609 100755
--- a/pom.xml
+++ b/pom.xml
@@ -345,7 +345,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.0.199</version>
+            <version>1.4.199</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-- 
Gitee