From 2278706e9a9d789e756ae88267239798cc74804a Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 28 Apr 2023 09:26:45 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=84=9C=EB=B8=94=EB=A6=BF=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                         | 45 ++++++++++++++-------------------
 src/main/webapp/WEB-INF/web.xml | 14 +++++-----
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index db8d828e..9510fcd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,6 +206,25 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>javax.servlet.jsp-api</artifactId>
+			<version>2.3.3</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
 
 		<!-- swagger2 -->
 		<dependency>
@@ -241,19 +260,6 @@
 			<version>3.1.0</version>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
-		</dependency>
-
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
@@ -364,14 +370,6 @@
 		</dependency>
 
 
-		<!-- Cross-Site Scripting -->
-		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.2</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
@@ -887,11 +885,6 @@
 
 			<!-- Rest Doc 생성 -->
 			<!-- jar/war build 전 문서 생성 > 생성된 문서 jar/war에 포함 -->
-			<plugin>
-				<!-- Asciidoctor 플러그인 선언 -->
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<!--
 					문서가 패키지로 복사되기 전에 생성되야 하므로 위에 Asciidoctor 플러그인 뒤에 선언한다.
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d9350c1b..e4bddbf6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app id="WebApp_ID" version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
 	<display-name>egovframework.ebt</display-name>
 	<filter>
 		<filter-name>encodingFilter</filter-name>
@@ -160,21 +160,21 @@
 
     <session-config>
         <session-timeout>60</session-timeout>
-		<tracking-mode>COOKIE</tracking-mode>
         <cookie-config>
-        	<http-only>true</http-only>
-        	<secure>false</secure>
+            <http-only>true</http-only>
+            <secure>false</secure>
         </cookie-config>
+		<tracking-mode>COOKIE</tracking-mode>
     </session-config>
     
 
     <error-page>
         <exception-type>java.lang.Throwable</exception-type>
-        <location>/common/error.jsp</location>
+        <location>/WEB-INF/jsp/framework/error/error.jsp</location>
     </error-page>
     <error-page>
         <exception-type>org.springframework.web.util.NestedServletException</exception-type>
-        <location>/common/error.jsp</location>
+        <location>/WEB-INF/jsp/framework/error/error.jsp</location>
     </error-page>
     <error-page>
         <error-code>500</error-code>