From 600efa6cbf078948ed58dc9b22ae1b9df1104c62 Mon Sep 17 00:00:00 2001
From: hwhbj <xdhbj0022@163.com>
Date: Thu, 13 Mar 2025 11:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCM-RESTAPI=E6=BC=8F=E6=B4=9E2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 92fbabe..6d8ccdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.12</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.opengauss</groupId>
     <artifactId>cmrestapi</artifactId>
-    <version>3.1.0-RELEASE</version>
+    <version>7.0.0-RC1-RELEASE</version>
     <name>CMRestAPI</name>
     <description>Project for CMRestAPI</description>
     <properties>
-        <java.version>1.8</java.version>
-        <tomcat.version>10.1.34</tomcat.version>
-        <spring-framework.version>5.3.32</spring-framework.version>
+        <java.version>11</java.version>
+        <spring-framework.version>5.3.39</spring-framework.version>
         <logback.version>1.3.14</logback.version>
+        <tomcat.version>10.1.35</tomcat.version>
     </properties>
     <dependencies>
         <dependency>
@@ -28,8 +28,17 @@
                     <groupId>org.yaml</groupId>
                     <artifactId>snakeyaml</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>10.1.35</version>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -51,8 +60,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
-- 
Gitee