You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2023/01/30 15:26:01 UTC

[sling-org-apache-sling-repoinit-filevault-validator] 01/01: SLING-11765 fix IT on Windows with UNC paths

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

kwin pushed a commit to branch bugfix/fix-it-on-windows
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-filevault-validator.git

commit ccf5ac1dc6a5db86453e7c4fb8a179a7e7fba508
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jan 30 16:25:54 2023 +0100

    SLING-11765 fix IT on Windows with UNC paths
---
 .sling-module.json            | 6 ++++++
 src/it/project1/verify.groovy | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..988156a
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,6 @@
+{
+  "jenkins": {
+    "jdks": [8, 11, 17],
+    "operatingSystems": ["linux", "windows"]
+  }
+}
\ No newline at end of file
diff --git a/src/it/project1/verify.groovy b/src/it/project1/verify.groovy
index fc77512..fd9f966 100644
--- a/src/it/project1/verify.groovy
+++ b/src/it/project1/verify.groovy
@@ -17,16 +17,17 @@
 
 String buildLog = new File(basedir, 'build.log').text
 
+String pathNameSeparator = java.nio.file.FileSystems.getDefault().getSeparator();
 assert buildLog.contains('''[ERROR] ValidationViolation: "sling-repoinit: Invalid repoinit statement(s) detected: Encountered " <STRING> "invalid "" at line 2, column 1.
 Was expecting:
     <EOF> 
-    ", filePath=''' + "src${File.separator}main${File.separator}jcr_root${File.separator}apps${File.separator}test${File.separator}config${File.separator}org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config")
+    ", filePath=''' + "src${pathNameSeparator}main${pathNameSeparator}jcr_root${pathNameSeparator}apps${pathNameSeparator}test${pathNameSeparator}config${pathNameSeparator}org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config")
 assert buildLog.contains('''[ERROR] ValidationViolation: "sling-repoinit: Invalid repoinit statement(s) detected: Encountered " <STRING> "invalid "" at line 1, column 1.
 Was expecting:
     <EOF> 
-    ", filePath=''' + "src${File.separator}main${File.separator}jcr_root${File.separator}apps${File.separator}test${File.separator}config${File.separator}org.apache.sling.jcr.repoinit.RepositoryInitializer~test2.cfg.json")
+    ", filePath=''' + "src${pathNameSeparator}main${pathNameSeparator}jcr_root${pathNameSeparator}apps${pathNameSeparator}test${pathNameSeparator}config${pathNameSeparator}org.apache.sling.jcr.repoinit.RepositoryInitializer~test2.cfg.json")
 assert buildLog.contains('''[ERROR] ValidationViolation: "sling-repoinit: Invalid repoinit statement(s) detected: Encountered " <STRING> "invalid "" at line 1, column 1.
 Was expecting:
     <EOF> 
-    ", filePath=''' + "src${File.separator}main${File.separator}jcr_root${File.separator}apps${File.separator}test${File.separator}config${File.separator}org.apache.sling.jcr.repoinit.RepositoryInitializer~test3.cfg")
+    ", filePath=''' + "src${pathNameSeparator}main${pathNameSeparator}jcr_root${pathNameSeparator}apps${pathNameSeparator}test${pathNameSeparator}config${pathNameSeparator}org.apache.sling.jcr.repoinit.RepositoryInitializer~test3.cfg")
 assert buildLog.contains('[ERROR] Failed to execute goal org.apache.jackrabbit:filevault-package-maven-plugin:1.3.0:validate-files (default-validate-files) on project org.apache.sling.repoinit.filevault.validator.project1: Found 3 violation(s) (with severity=ERROR). Check above errors for details -> [Help 1]')
\ No newline at end of file