Include the XML namespace declarations for the web.xml files - we nee…

…d different files depending on JavaEE/Jakarta

cdkdepict-webapp/src/main/webapp/WEB-INF/web-jakarta.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:web="http://xmlns.jcp.org/xml/ns/javaee"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd http://xmlns.jcp.org/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="5.0">
+<servlet>
+ <servlet-name>cdkdepict</servlet-name>
+ <servlet-class>org.springframework.web.servlet.DispatcherServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>cdkdepict</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+ <filter>
+ <filter-name>ExpiresFilter</filter-name>
+ <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class>
+ <init-param>
+ <param-name>ExpiresByType image</param-name>
+ <param-value>access plus 10 days</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ExpiresByType text/css</param-name>
+ <param-value>access plus 10 days</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ExpiresByType image/svg+xml</param-name>
+ <param-value>access plus 10 days</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ExpiresByType application/javascript</param-name>
+ <param-value>access plus 10 days</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ExpiresFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+</web-app>

cdkdepict-webapp/src/main/webapp/WEB-INF/web.xml

@@ -1,4 +1,8 @@
-<web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
  <servlet>
  <servlet-name>cdkdepict</servlet-name>
  <servlet-class>org.springframework.web.servlet.DispatcherServlet

pom.xml

@@ -165,6 +165,13 @@
  </properties>
  <build>
  <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>src/main/webapp/WEB-INF/web-jakarta.xml</webXml>
+ </configuration>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>