This is an automated email from the ASF dual-hosted git repository. joerghoh pushed a commit to branch SLING-12775-update-filevault in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
commit 40a60fe7e5186a7eb695b1453ab30d6145c04647 Author: Joerg Hoh <[email protected]> AuthorDate: Sat May 3 17:04:37 2025 +0200 SLING-12775 update file vault dependencies --- pom.xml | 13 +++++++++---- .../contentpackage/ArchiveValidationContextImpl.java | 16 ++++++++++++++++ .../analyser/task/impl/CheckContentPackagesTest.java | 3 ++- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d098c8e..0f955b2 100644 --- a/pom.xml +++ b/pom.xml @@ -113,13 +113,19 @@ <dependency> <groupId>org.apache.jackrabbit.vault</groupId> <artifactId>org.apache.jackrabbit.vault</artifactId> - <version>3.5.4</version> + <version>3.8.4</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit.vault</groupId> <artifactId>vault-validation</artifactId> - <version>3.5.4</version> + <version>3.8.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.17.0</version> <scope>provided</scope> </dependency> <dependency> @@ -167,8 +173,7 @@ <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-core</artifactId> - <version>1.2.14</version> - <classifier>jakarta</classifier> + <version>2.0.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/main/java/org/apache/sling/feature/analyser/task/impl/contentpackage/ArchiveValidationContextImpl.java b/src/main/java/org/apache/sling/feature/analyser/task/impl/contentpackage/ArchiveValidationContextImpl.java index 04e168d..ab82dce 100644 --- a/src/main/java/org/apache/sling/feature/analyser/task/impl/contentpackage/ArchiveValidationContextImpl.java +++ b/src/main/java/org/apache/sling/feature/analyser/task/impl/contentpackage/ArchiveValidationContextImpl.java @@ -21,6 +21,7 @@ package org.apache.sling.feature.analyser.task.impl.contentpackage; import java.nio.file.Path; import java.util.Collection; import java.util.Collections; +import java.util.Set; import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter; import org.apache.jackrabbit.vault.fs.io.Archive; @@ -69,4 +70,19 @@ public class ArchiveValidationContextImpl implements ValidationContext { public Collection<PackageInfo> getDependenciesPackageInfo() { return Collections.emptyList(); } + + @Override + public Object setAttribute(String name, Object value) { + throw new UnsupportedOperationException(); + } + + @Override + public Object getAttribute(String name) { + throw new UnsupportedOperationException(); + } + + @Override + public Set<String> getAttributeNames() { + throw new UnsupportedOperationException(); + } } diff --git a/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesTest.java b/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesTest.java index ccca7bf..4eb09af 100644 --- a/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesTest.java +++ b/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesTest.java @@ -91,7 +91,8 @@ public class CheckContentPackagesTest { assertThat( errors.get(0), equalTo(String.format( - "ValidationViolation: \"jackrabbit-docviewparser: Invalid XML found: The reference to entity \"se\" must end with the ';' delimiter.\", filePath=%s, nodePath=/apps/cschneidervalidation/configs/com.adobe.test.Invalid", + "ValidationViolation: \"jackrabbit-docviewparser: Could not parse FileVault Document View XML: The reference to entity \"se\" must end with the ';' delimiter.\", " + + "filePath=%s, nodePath=/apps/cschneidervalidation/configs/com.adobe.test.Invalid, line=3, column=38", "jcr_root/apps/cschneidervalidation/configs/com.adobe.test.Invalid.xml" .replace('/', File.separatorChar)))); }
