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/25 19:40:51 UTC
[sling-org-apache-sling-repoinit-filevault-validator] branch master updated: fix dependencies
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 0bb69f0 fix dependencies
0bb69f0 is described below
commit 0bb69f00368abcaf9948049de4fb7cb8152b26ec
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Jan 25 20:40:45 2023 +0100
fix dependencies
include all OSGi config serializations in IT
---
pom.xml | 24 +++++++++++++++++++++-
...jcr.repoinit.RepositoryInitializer~test1.config | 22 +++++---------------
...r.repoinit.RepositoryInitializer~test2.cfg.json | 3 +++
...g.jcr.repoinit.RepositoryInitializer~test3.cfg} | 0
src/it/project1/verify.groovy | 11 +++++++++-
.../filevault/validator/RepoInitValidator.java | 4 ++--
6 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 597fb16..a8b1277 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,24 @@
<version>1.0.6</version>
<scope>compile</scope>
</dependency>
+ <!-- transitive (but provided scope) dep of felix.cm.json -->
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.2.3</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.1_spec</artifactId>
<version>1.2</version>
- <scope>provided</scope>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.converter</artifactId>
+ <version>1.0.14</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -89,6 +102,15 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/*.config</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
diff --git a/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config b/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config
index 6d596ba..ac2e74a 100644
--- a/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config
+++ b/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config
@@ -1,17 +1,5 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-scripts=invalid
\ No newline at end of file
+scripts=[
+"# multiline example
+invalid
+"
+]
\ No newline at end of file
diff --git a/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test2.cfg.json b/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test2.cfg.json
new file mode 100644
index 0000000..b94ed72
--- /dev/null
+++ b/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test2.cfg.json
@@ -0,0 +1,3 @@
+{
+ "scripts":"invalid"
+}
\ No newline at end of file
diff --git a/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config b/src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test3.cfg
similarity index 100%
copy from src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test1.config
copy to src/it/project1/src/main/jcr_root/apps/test/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~test3.cfg
diff --git a/src/it/project1/verify.groovy b/src/it/project1/verify.groovy
index 4957ba6..fc77512 100644
--- a/src/it/project1/verify.groovy
+++ b/src/it/project1/verify.groovy
@@ -17,7 +17,16 @@
String buildLog = new File(basedir, 'build.log').text
-assert buildLog.contains('''[ERROR] ValidationViolation: "sling-repoinit: Invalid repoinit statement(s) detected: Encountered " <STRING> "invalid "" at line 1, column 1.
+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")
+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")
+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")
+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
diff --git a/src/main/java/org/apache/sling/repoinit/filevault/validator/RepoInitValidator.java b/src/main/java/org/apache/sling/repoinit/filevault/validator/RepoInitValidator.java
index bb69f52..cdb15d9 100644
--- a/src/main/java/org/apache/sling/repoinit/filevault/validator/RepoInitValidator.java
+++ b/src/main/java/org/apache/sling/repoinit/filevault/validator/RepoInitValidator.java
@@ -132,11 +132,11 @@ public class RepoInitValidator implements DocumentViewXmlValidator, GenericJcrDa
Map<String, Object> deserializeOsgiConfiguration(@NotNull OsgiConfigurationSerialization serializationType, @NotNull InputStream input) throws IOException {
switch(serializationType) {
case CONFIG:
+ return convertToMap(org.apache.felix.cm.file.ConfigurationHandler.read(input));
+ case CFG:
Properties properties = new Properties();
properties.load(input);
return convertToMap(properties);
- case CFG:
- return convertToMap(org.apache.felix.cm.file.ConfigurationHandler.read(input));
case CFG_JSON:
Reader reader = new InputStreamReader(input, StandardCharsets.UTF_8);
ConfigurationReader configReader = org.apache.felix.cm.json.Configurations.buildReader().build(reader);