[sling-scriptingbundle-maven-plugin] branch master updated: SLING-9538: normalize the resourcetype path to unix

[pauls]

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f602eb  SLING-9538: normalize the resourcetype path to unix
4f602eb is described below

commit 4f602eb614fe05edf9ab50598124d4b62c2eb1bf
Author: Karl Pauls <kpa...@adobe.com>
AuthorDate: Mon Jun 22 13:55:43 2020 +0200

    SLING-9538: normalize the resourcetype path to unix
---
 .../org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java  | 4 ++--
 .../scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 @@ public class FileProcessor {
                 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 @@ public class FileProcessor {
             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.Map;
 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 @@ class ResourceTypeFolderAnalyser {
             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();