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/31 13:18:32 UTC
[sling-org-apache-sling-repoinit-filevault-validator] branch master updated: SLING-11765 fix IT on Windows (#1)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-filevault-validator.git
The following commit(s) were added to refs/heads/master by this push:
new b678796 SLING-11765 fix IT on Windows (#1)
b678796 is described below
commit b678796286b1f3ecfc14b3673049c37a43cd0aae
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jan 31 14:18:26 2023 +0100
SLING-11765 fix IT on Windows (#1)
---
.sling-module.json | 6 ++++++
src/it/project1/verify.groovy | 9 +++++----
2 files changed, 11 insertions(+), 4 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..510ed8f 100644
--- a/src/it/project1/verify.groovy
+++ b/src/it/project1/verify.groovy
@@ -15,18 +15,19 @@
* the License.
*/
-String buildLog = new File(basedir, 'build.log').text
+// normalize platform specific line separator to '\n' to be able to use multiline groovy strings
+String buildLog = new File(basedir, 'build.log').text.normalize()
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=''' + java.nio.file.Paths.get('src', 'main', 'jcr_root', 'apps', 'test', 'config', '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=''' + java.nio.file.Paths.get('src', 'main', 'jcr_root', 'apps', 'test', 'config', '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=''' + java.nio.file.Paths.get('src', 'main', 'jcr_root', 'apps', 'test', 'config', '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