Updating for Servlet 5

jetty · Jan 10, 2024 · cf3b0c6 · cf3b0c6
1 parent 59d6521
commit cf3b0c6
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/embedded/connectors/src/main/webapps/webapp-a/WEB-INF/web.xml b/embedded/connectors/src/main/webapps/webapp-a/WEB-INF/web.xml
@@ -1,7 +1,9 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns="https://jakarta.ee/xml/ns/jakartaee"
   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">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+  metadata-complete="false"
+  version="5.0">
   <name>WebApp-A</name>
 </web-app>
diff --git a/embedded/connectors/src/main/webapps/webapp-b/WEB-INF/web.xml b/embedded/connectors/src/main/webapps/webapp-b/WEB-INF/web.xml
@@ -1,7 +1,9 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns="https://jakarta.ee/xml/ns/jakartaee"
   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">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+  metadata-complete="false"
+  version="5.0">
   <name>WebApp-B</name>
 </web-app>
diff --git a/embedded/jndi/src/main/webroots/jndi-root/WEB-INF/web.xml b/embedded/jndi/src/main/webroots/jndi-root/WEB-INF/web.xml
@@ -1,8 +1,10 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns="https://jakarta.ee/xml/ns/jakartaee"
   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">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+  metadata-complete="false"
+  version="5.0">
 
   <resource-ref>
     <description>My Foo Resource</description>

diff --git a/embedded/webapp-context/src/main/resources/hello-webapp/WEB-INF/web.xml b/embedded/webapp-context/src/main/resources/hello-webapp/WEB-INF/web.xml
@@ -1,8 +1,10 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns="https://jakarta.ee/xml/ns/jakartaee"
   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">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+  metadata-complete="false"
+  version="5.0">
   <display-name>hello webapp</display-name>
   <servlet>
     <servlet-name>hello</servlet-name>

diff --git a/webapps/hello/src/main/webapp/WEB-INF/web.xml b/webapps/hello/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,10 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  xmlns="https://jakarta.ee/xml/ns/jakartaee"
   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">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+  metadata-complete="false"
+  version="5.0">
   <display-name>hello webapp</display-name>
   <servlet>
     <servlet-name>hello</servlet-name>