This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch SLING-13306 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 05a52583ddb914775e6dcc5ba1126fff7cb38778 Author: Julian Reschke <[email protected]> AuthorDate: Wed Aug 12 17:56:10 2026 +0100 SLING-13306: org.apache.sling:org.apache.sling.jcr.webdav needs updated Jackrabbit components due commons fileupload changes --- pom.xml | 2 +- .../org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetector.java | 3 ++- .../org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetectorTest.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2af39c9..4009ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ <properties> <sling.java.version>8</sling.java.version> <project.build.outputTimestamp>1734084693</project.build.outputTimestamp> - <jackrabbit.version>2.14.3</jackrabbit.version> + <jackrabbit.version>2.22.4</jackrabbit.version> </properties> <dependencies> diff --git a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetector.java b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetector.java index 61f5847..6935ad5 100644 --- a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetector.java +++ b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetector.java @@ -23,6 +23,7 @@ import java.io.InputStream; import org.apache.sling.commons.mime.MimeTypeService; import org.apache.tika.detect.Detector; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; public class SlingTikaDetector implements Detector { @@ -40,7 +41,7 @@ public class SlingTikaDetector implements Detector { // consideration when trying to detect the MIME type. // Look for a resource name in the input metadata - String name = metadata.get(Metadata.RESOURCE_NAME_KEY); + String name = metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY); if (name != null) { // If the name is a path, skip all but the last component int slash = name.lastIndexOf('/'); diff --git a/src/test/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetectorTest.java b/src/test/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetectorTest.java index b215127..cae87bc 100644 --- a/src/test/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetectorTest.java +++ b/src/test/java/org/apache/sling/jcr/webdav/impl/helper/SlingTikaDetectorTest.java @@ -25,6 +25,7 @@ import java.util.Locale; import org.apache.sling.commons.mime.MimeTypeService; import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; import org.junit.Test; @@ -69,7 +70,7 @@ public class SlingTikaDetectorTest { public void withPercentInName() { // see SLING-7528: checks that there is no percent-unescaping Metadata metadata = new Metadata(); - metadata.add(Metadata.RESOURCE_NAME_KEY, "a/b%c.html"); + metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, "a/b%c.html"); assertEquals(MediaType.TEXT_HTML, detector.detect(EMPTY_INPUT_STREAM, metadata)); } }
