From e76b5597438e17b987efbd2defc6412b2787648a Mon Sep 17 00:00:00 2001
From: y-okumura-isp <y-okumura@isp.co.jp>
Date: Wed, 31 Mar 2021 21:39:59 +0900
Subject: [PATCH] Support tomcat 8.5 and jdk11

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

diff --git a/pom.xml b/pom.xml
index 230906d1b..3463c50c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,21 @@
             <artifactId>markedj</artifactId>
             <version>1.7.0</version>
         </dependency>
-
+	<dependency>
+    	  <groupId>javax.xml.bind</groupId>
+    	  <artifactId>jaxb-api</artifactId>
+    	  <version>2.3.0</version>
+	</dependency>
+	<dependency>
+    	  <groupId>javax.activation</groupId>
+    	  <artifactId>activation</artifactId>
+    	  <version>1.1</version>
+	</dependency>
+	<dependency>
+	  <groupId>org.glassfish.jaxb</groupId>
+	  <artifactId>jaxb-runtime</artifactId>
+	  <version>2.3.0-b170127.1453</version>
+	</dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 1934196e6..558e9c8e2 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
 <web-app 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"
-    version="3.1" metadata-complete="true">
+    version="3.1" metadata-complete="false">
 
     <display-name>knowledge</display-name>