filtering of jakarta namespace in xml files

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

pom.xml

@@ -223,6 +223,7 @@
           <postBuildHookScript>verify</postBuildHookScript>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
+          <streamLogsOnFailures>true</streamLogsOnFailures>
           <goals>
             <goal>clean</goal>
             <goal>test-compile</goal>

src/it/filtering-it/src/main/config/web.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app 
-   xmlns="http://java.sun.com/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-   metadata-complete="false"
-   version="3.0">
+<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"
+  metadata-complete="false"
+  version="5.0">
 
   <display-name>Test WebApp</display-name>
 

src/it/filtering-it/verify.groovy

@@ -2,6 +2,11 @@ File source = new File( basedir, "target/test-classes/web.xml" );
 assert source.isFile()
 assert !source.text.contains( 'ee9' )
 assert !source.text.contains( 'jakarta')
+assert !source.text.contains( 'version="5.0"')
+assert !source.text.contains( 'web-app_5_0.xsd')
 
 assert source.text.contains( 'org.eclipse.jetty.ee8.plus.webapp.PlusDescriptorProcessorTest$TestInjections');
 assert source.text.contains( 'javax.servlet.Foo');
+
+
+

src/main/java/org/eclipse/jetty/toolchain/modifysources/ResourcesFiltering.java

@@ -77,15 +77,21 @@ public void copyFile(File from, final File to, boolean filtering, List<FilterWra
                 if (filtering && Files.exists(from.toPath())) {
                     // well it is definitely not the best option to read the full content but shouldn't be too big files
                     String content = Files.readString(from.toPath());
-                    if(StringUtils.contains(content, "jakarta.")) {
-                        content = StringUtils.replace(content, "jakarta.", "javax.");
-                    }
-                    if(StringUtils.contains(content, "jakarta/")) {
-                        content = StringUtils.replace(content, "jakarta/", "javax/");
-                    }
-                    if(StringUtils.contains(content, "ee9")) {
-                        content = StringUtils.replace(content, "ee9", "ee8");
-                    }
+
+                    content = StringUtils.replace(content, "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://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd");
+
+                    content = StringUtils.replace(content, "https://jakarta.ee/xml/ns/jakartaee",
+                            "http://xmlns.jcp.org/xml/ns/javaee");
+
+                    content = StringUtils.replace(content, "jakarta.", "javax.");
+                    content = StringUtils.replace(content, "jakarta/", "javax/");
+                    content = StringUtils.replace(content, "ee9", "ee8");
+
+                    content = StringUtils.replace(content, "version=\"5.0\"",
+                            "version=\"4.0\"");
+
+
                     Files.writeString(to.toPath(), content, StandardCharsets.UTF_8);
                     buildContext.refresh( to );
                 }