change Jakarta EE namespace to suit Tomcat 10

fixes #3718

Author: Vladimir Kotal

tools/setup.cfg

@@ -2,5 +2,5 @@
 test=pytest
 
 [tool:pytest]
-addopts = -v --color=yes --numprocesses=auto
+addopts = -vv --color=yes --numprocesses=auto
 testpaths = src/test/python

tools/src/main/python/opengrok_tools/utils/xml.py

@@ -37,7 +37,7 @@ def insert_file(input_xml, insert_xml_file):
     """
 
     # This avoids resulting XML to have namespace prefixes in elements.
-    ET.register_namespace('', "http://xmlns.jcp.org/xml/ns/javaee")
+    ET.register_namespace('', "https://jakarta.ee/xml/ns/jakartaee")
 
     root = ET.fromstring(input_xml)
     try:

tools/src/test/python/new.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf8'?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee          http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee          https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd" version="5.0">
 
     <display-name>OpenGrok</display-name>
     <description>A wicked fast source browser</description>
@@ -42,4 +42,4 @@
         <auth-method>BASIC</auth-method>
     </login-config>
 
-</web-app>
+</web-app>

tools/src/test/python/test_xml.py

@@ -40,7 +40,7 @@ def test_xml_insert():
                           os.path.join(DIR_PATH, "insert.xml"))
         with open(os.path.join(DIR_PATH, "new.xml")) as expected_xml:
             # TODO: this should really be comparing XML trees
-            assert out == expected_xml.read()
+            assert out.strip() == expected_xml.read().strip()
 
 
 def test_invalid_xml():

tools/src/test/python/web.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         version="3.1"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+         https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+         version="5.0">
 
     <display-name>OpenGrok</display-name>
     <description>A wicked fast source browser</description>