services loader can contains any classname so if not mapping just do not touch it

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

Author: olamy

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

@@ -69,7 +69,7 @@ public void execute()
                     String newFileName = changeEE9TypeToEE8(fileName);
                     File newFile = new File(metaInfDirectory, newFileName == null ? fileName : newFileName);
                     List<String> newContent = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8).
-                            stream().map(ModifyEE9ToEE8::changeEE9TypeToEE8).collect(Collectors.toList());
+                            stream().map(s -> mapFileName(s)).collect(Collectors.toList());
                     Files.write(newFile.toPath(), newContent, StandardCharsets.UTF_8);
                     if (newFileName != null) {
                         Files.delete(file.toPath());
@@ -85,6 +85,11 @@ public void execute()
 
     }
 
+    private String mapFileName(String className) {
+        String newType = ModifyEE9ToEE8.changeEE9TypeToEE8(className);
+        return newType == null ? className : newType;
+    }
+
     public void setOutputDirectory(File outputDirectory) {
         this.outputDirectory = outputDirectory;
     }

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

@@ -81,6 +81,10 @@ public void copyFile(File from, final File to, boolean filtering, List<FilterWra
                     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 https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd",
+                            "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd");
+
                     content = StringUtils.replace(content, "https://jakarta.ee/xml/ns/jakartaee",
                             "http://xmlns.jcp.org/xml/ns/javaee");