Skip to content

Commit 2561ec4

Browse files
authored
JCR-5145: Upgrade Commons VFS to 2.10.0 (#240)
1 parent 1d2c61b commit 2561ec4

File tree

2 files changed

+11
-42
lines changed

2 files changed

+11
-42
lines changed

jackrabbit-vfs-ext/pom.xml

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -44,57 +44,22 @@
4444
<dependency>
4545
<groupId>org.apache.commons</groupId>
4646
<artifactId>commons-vfs2</artifactId>
47-
<version>2.9.0</version>
47+
<version>2.10.0</version>
4848
<exclusions>
4949
<exclusion>
50-
<groupId>commons-logging</groupId>
51-
<artifactId>commons-logging</artifactId>
52-
</exclusion>
53-
<exclusion>
54-
<!-- see JCR-4839 -->
55-
<groupId>org.apache.hadoop</groupId>
56-
<artifactId>hadoop-hdfs-client</artifactId>
57-
</exclusion>
58-
</exclusions>
59-
</dependency>
60-
<!-- see JCR-4839 -->
61-
<dependency>
62-
<groupId>org.apache.hadoop</groupId>
63-
<artifactId>hadoop-hdfs-client</artifactId>
64-
<version>3.4.0</version>
65-
<exclusions>
66-
<exclusion>
67-
<groupId>org.jetbrains.kotlin</groupId>
68-
<artifactId>kotlin-stdlib-common</artifactId>
50+
<groupId>commons-io</groupId>
51+
<artifactId>commons-io</artifactId>
6952
</exclusion>
7053
</exclusions>
7154
</dependency>
72-
<!-- see JCR-4839 -->
73-
<dependency>
74-
<groupId>org.jetbrains.kotlin</groupId>
75-
<artifactId>kotlin-stdlib</artifactId>
76-
<version>1.9.25</version>
77-
</dependency>
7855
<dependency>
7956
<groupId>org.apache.commons</groupId>
8057
<artifactId>commons-vfs2-jackrabbit2</artifactId>
81-
<version>2.9.0</version>
58+
<version>2.10.0</version>
8259
<exclusions>
8360
<exclusion>
84-
<groupId>commons-logging</groupId>
85-
<artifactId>commons-logging</artifactId>
86-
</exclusion>
87-
<exclusion>
88-
<groupId>org.apache.httpcomponents</groupId>
89-
<artifactId>httpclient</artifactId>
90-
</exclusion>
91-
<exclusion>
92-
<groupId>org.apache.jackrabbit</groupId>
93-
<artifactId>jackrabbit-webdav</artifactId>
94-
</exclusion>
95-
<exclusion>
96-
<groupId>org.apache.jackrabbit</groupId>
97-
<artifactId>jackrabbit-standalone-components</artifactId>
61+
<groupId>commons-io</groupId>
62+
<artifactId>commons-io</artifactId>
9863
</exclusion>
9964
</exclusions>
10065
</dependency>

jackrabbit-vfs-ext/src/test/java/org/apache/jackrabbit/vfs/ext/ds/TestVFSDataStore.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@ protected void doSetFileSystemOptionsPropertiesInString() throws Exception {
190190
File [] identities = configBuilder.getIdentities(fso);
191191
Assert.assertNotNull(identities);
192192
Assert.assertEquals(1, identities.length);
193-
Assert.assertEquals("/home/tester/.ssh/id_rsa", FilenameUtils.separatorsToUnix(identities[0].getPath()));
193+
String expectedPath = identities[0].getPath();
194+
if (FilenameUtils.getPrefixLength(expectedPath) != 0) {
195+
expectedPath = expectedPath.substring(FilenameUtils.getPrefixLength(expectedPath) - 1);
196+
}
197+
Assert.assertEquals("/home/tester/.ssh/id_rsa", FilenameUtils.separatorsToUnix(expectedPath));
194198
Assert.assertEquals(Integer.valueOf(30000), configBuilder.getTimeout(fso));
195199

196200
dataStore.close();

0 commit comments

Comments
 (0)