From dfdaa94812541522887c77de415bd283e4e37c28 Mon Sep 17 00:00:00 2001
From: hwhbj <xdhbj0022@163.com>
Date: Mon, 10 Mar 2025 15:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCM-RESTAPI=20CVE=E6=BC=8F?=
 =?UTF-8?q?=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              | 12 ++++++++++--
 .../org/opengauss/cmrestapi/CMRestAPIServer.java     |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3c2bd8..92fbabe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -15,6 +15,9 @@
     <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>
+        <logback.version>1.3.14</logback.version>
     </properties>
     <dependencies>
         <dependency>
@@ -32,6 +35,11 @@
             <artifactId>gson</artifactId>
             <version>2.9.0</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version> <!-- 使用 Jakarta Servlet API -->
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -50,4 +58,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/opengauss/cmrestapi/CMRestAPIServer.java b/src/main/java/org/opengauss/cmrestapi/CMRestAPIServer.java
index 5db6c87..e16b72e 100644
--- a/src/main/java/org/opengauss/cmrestapi/CMRestAPIServer.java
+++ b/src/main/java/org/opengauss/cmrestapi/CMRestAPIServer.java
@@ -14,7 +14,7 @@
  */
 package org.opengauss.cmrestapi;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-- 
Gitee