diff --git a/jackrabbit-vfs-ext/pom.xml b/jackrabbit-vfs-ext/pom.xml index fe7841ee9f6..418d84b9e9d 100644 --- a/jackrabbit-vfs-ext/pom.xml +++ b/jackrabbit-vfs-ext/pom.xml @@ -44,57 +44,22 @@ org.apache.commons commons-vfs2 - 2.9.0 + 2.10.0 - commons-logging - commons-logging - - - - org.apache.hadoop - hadoop-hdfs-client - - - - - - org.apache.hadoop - hadoop-hdfs-client - 3.4.0 - - - org.jetbrains.kotlin - kotlin-stdlib-common + commons-io + commons-io - - - org.jetbrains.kotlin - kotlin-stdlib - 1.9.25 - org.apache.commons commons-vfs2-jackrabbit2 - 2.9.0 + 2.10.0 - commons-logging - commons-logging - - - org.apache.httpcomponents - httpclient - - - org.apache.jackrabbit - jackrabbit-webdav - - - org.apache.jackrabbit - jackrabbit-standalone-components + commons-io + commons-io diff --git a/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java b/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java index 869223a31f8..43736aaba2f 100644 --- a/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java +++ b/jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java @@ -190,7 +190,11 @@ protected void doSetFileSystemOptionsPropertiesInString() throws Exception { File [] identities = configBuilder.getIdentities(fso); Assert.assertNotNull(identities); Assert.assertEquals(1, identities.length); - Assert.assertEquals("/home/tester/.ssh/id_rsa", FilenameUtils.separatorsToUnix(identities[0].getPath())); + String expectedPath = identities[0].getPath(); + if (FilenameUtils.getPrefixLength(expectedPath) != 0) { + expectedPath = expectedPath.substring(FilenameUtils.getPrefixLength(expectedPath) - 1); + } + Assert.assertEquals("/home/tester/.ssh/id_rsa", FilenameUtils.separatorsToUnix(expectedPath)); Assert.assertEquals(Integer.valueOf(30000), configBuilder.getTimeout(fso)); dataStore.close();