From 8a3894d55d7c287f978187b5222fd947ec70c404 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Fri, 25 Feb 2022 10:16:08 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #11010
---
 backend/pom.xml       | 24 +++++++++++++++++++++---
 frontend/package.json |  6 +++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index f5704e0ee1..0683798c23 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <shiro.version>1.7.1</shiro.version>
+        <shiro.version>1.8.0</shiro.version>
         <java.version>1.8</java.version>
         <flyway.version>7.15.0</flyway.version>
     </properties>
@@ -156,7 +156,13 @@
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>ms-jmeter-core</artifactId>
-            <version>1.0.9</version>
+            <version>1.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>netty</artifactId>
+                    <groupId>io.netty</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--   排除jmeter中的 xstream 解决bug     -->
@@ -173,6 +179,13 @@
             <version>2.1.7</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>com.fit2cloud</groupId>
             <artifactId>quartz-spring-boot-starter</artifactId>
@@ -250,7 +263,7 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <version>4.13.0</version>
+            <version>4.13.2</version>
         </dependency>
 
         <dependency>
@@ -264,6 +277,11 @@
             <artifactId>xmindjbehaveplugin</artifactId>
             <version>0.8</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.0.24</version>
+        </dependency>
         <!-- selenium包  -->
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
diff --git a/frontend/package.json b/frontend/package.json
index e40bc76fa2..f10fb056a3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,7 +17,7 @@
     "@fortawesome/free-regular-svg-icons": "^5.12.0",
     "@fortawesome/free-solid-svg-icons": "^5.12.0",
     "@fortawesome/vue-fontawesome": "^0.1.9",
-    "axios": "^0.21.1",
+    "axios": "^0.21.3",
     "core-js": "^3.4.3",
     "diffable-html": "^4.0.0",
     "echarts": "^5.0.2",
@@ -31,9 +31,9 @@
     "json-schema-faker": "^0.5.0-rcv.32",
     "json5": "^2.1.3",
     "jsondiffpatch": "^0.4.1",
-    "jsoneditor": "^9.1.2",
+    "jsoneditor": "^9.5.6",
     "jsonpath": "^1.1.0",
-    "jspdf": "^2.1.1",
+    "jspdf": "^2.3.1",
     "lodash.isboolean": "^3.0.3",
     "lodash.isempty": "^4.4.0",
     "lodash.isinteger": "^4.0.4",