From 5a65283052ac1998af6ba7e395e3e55173445682 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 15 Jan 2022 13:29:58 +0800
Subject: [PATCH] build: spring version, jmeter version

---
 backend/pom.xml | 6 +++++-
 pom.xml         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 9c6f0e8a99..a8a1b13055 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -271,6 +271,10 @@
                     <artifactId>log4j-slf4j-impl</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>ApacheJMeter_core</artifactId>
+                    <groupId>org.apache.jmeter</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!--随机数据生成API-->
@@ -430,7 +434,7 @@
                         <artifactItem>
                             <groupId>org.apache.jmeter</groupId>
                             <artifactId>ApacheJMeter_functions</artifactId>
-                            <version>5.4.2</version>
+                            <version>5.4.3</version>
                             <type>jar</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>src/main/resources/jmeter/lib/ext</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 47c8a2fc92..1b0425469c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.1</version>
+        <version>2.6.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>