SLING-9538: normalize the resourcetype path to unix
diff --git a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java
index 3950779..4d6420e 100644
--- a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java
+++ b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java
@@ -59,7 +59,7 @@
String extend = extendResources.get(0);
if (StringUtils.isNotEmpty(extend)) {
String[] extendParts = extend.split(";");
- String extendedResourceType = extendParts[0];
+ String extendedResourceType = FilenameUtils.normalize(extendParts[0], true);
String extendedResourceTypeVersion = extendParts.length > 1 ? extendParts[1] : null;
Set<String> searchPathResourceTypes = processSearchPathResourceTypes(resourceType);
Optional<ProvidedResourceTypeCapability> rootCapability = providedCapabilities.stream().filter(capability ->
@@ -100,7 +100,7 @@
for (String requiredResourceType : requiredResourceTypes) {
if (StringUtils.isNotEmpty(requiredResourceType)) {
String[] requireParts = requiredResourceType.split(";");
- String resourceType = requireParts[0];
+ String resourceType = FilenameUtils.normalize(requireParts[0], true);
String version = requireParts.length > 1 ? requireParts[1] : null;
RequiredResourceTypeCapability.Builder requiredBuilder =
RequiredResourceTypeCapability.builder().withResourceType(resourceType);
diff --git a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java
index 7a9974e..51b7c9b 100644
--- a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java
+++ b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java
@@ -28,6 +28,7 @@
import java.util.Set;
import java.util.stream.Stream;
+import org.apache.commons.io.FilenameUtils;
import org.apache.maven.plugin.logging.Log;
import org.apache.sling.scriptingbundle.maven.plugin.capability.Capabilities;
import org.apache.sling.scriptingbundle.maven.plugin.capability.ProvidedResourceTypeCapability;
@@ -57,7 +58,7 @@
try (DirectoryStream<Path> resourceTypeDirectoryStream = Files
.newDirectoryStream(scriptsDirectory.resolve(resourceTypeDirectory))) {
Path relativeResourceTypeDirectory = scriptsDirectory.relativize(resourceTypeDirectory);
- final ResourceType resourceType = ResourceType.parseResourceType(relativeResourceTypeDirectory.toString());
+ final ResourceType resourceType = ResourceType.parseResourceType(FilenameUtils.normalize(relativeResourceTypeDirectory.toString(), true));
resourceTypeDirectoryStream.forEach(entry -> {
if (Files.isRegularFile(entry)) {
Path file = entry.getFileName();
