From 497d86d4913383f7e28fa2768d45fb1290714395 Mon Sep 17 00:00:00 2001
From: Kane Wang <wangkane@qq.com>
Date: Thu, 29 Sep 2022 09:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20javax.servlet-api=204.0.1?=
 =?UTF-8?q?=20=E5=8F=AF=E4=BB=A5=E8=BF=90=E8=A1=8C=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/java/car_dealer/pom.xml                  |  6 ++++--
 .../main/webapp/WEB-INF/springmvc-servlet.xml | 21 -------------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 code/java/car_dealer/src/main/webapp/WEB-INF/springmvc-servlet.xml

diff --git a/code/java/car_dealer/pom.xml b/code/java/car_dealer/pom.xml
index 2f0cb4c..acac280 100644
--- a/code/java/car_dealer/pom.xml
+++ b/code/java/car_dealer/pom.xml
@@ -27,9 +27,11 @@
     <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>4.0.1</version>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
diff --git a/code/java/car_dealer/src/main/webapp/WEB-INF/springmvc-servlet.xml b/code/java/car_dealer/src/main/webapp/WEB-INF/springmvc-servlet.xml
deleted file mode 100644
index 8e1b614..0000000
--- a/code/java/car_dealer/src/main/webapp/WEB-INF/springmvc-servlet.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:util="http://www.springframework.org/schema/util" xmlns:jpa="http://www.springframework.org/schema/data/jpa" xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-    http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
-    http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-    http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
-    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
-
-    <context:component-scan base-package="com.cpic.xim" />
-    <mvc:annotation-driven />
-    <mvc:default-servlet-handler />
-
-    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="prefix" value="/WEB-INF/jsp/" />
-        <property name="suffix" value=".jsp" />
-    </bean>
-
-</beans>
\ No newline at end of file