This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-classloaders.git
The following commit(s) were added to refs/heads/main by this push:
new 9514fe4 Bump org.apache.commons:commons-vfs2 from 2.9.0 to 2.10.0
(#24)
9514fe4 is described below
commit 9514fe485ee4cb598397588c2fb327c9a60f5644
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 25 14:04:22 2025 -0400
Bump org.apache.commons:commons-vfs2 from 2.9.0 to 2.10.0 (#24)
* Bump org.apache.commons:commons-vfs2 from 2.9.0 to 2.10.0
Bumps org.apache.commons:commons-vfs2 from 2.9.0 to 2.10.0.
---
updated-dependencies:
- dependency-name: org.apache.commons:commons-vfs2
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <supp...@github.com>
* Added changes to support vfs 2.10.0 release
Moved off of deprecated classes and methods.
Included new module that contained existing hdfs providers.
* Exclude hadoop deps and add http5 dep
Exclude the 3.4 hadoop deps from vfs2-hdfs.
Add the http5 client deps needed for the http5 provider
* Use BOM and fix compilation error
---------
Signed-off-by: dependabot[bot] <supp...@github.com>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Roberts ddanielr <ddani...@gmail.com>
Co-authored-by: Christopher Tubbs <ctubb...@apache.org>
---
modules/vfs-class-loader/pom.xml | 28 ++++++++++++++++++++++
.../accumulo/classloader/vfs/VFSManager.java | 4 ++--
.../accumulo/classloader/vfs/AccumuloDFSBase.java | 4 ++--
pom.xml | 16 ++++++++++---
4 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/modules/vfs-class-loader/pom.xml b/modules/vfs-class-loader/pom.xml
index edb8337..59c5bb7 100644
--- a/modules/vfs-class-loader/pom.xml
+++ b/modules/vfs-class-loader/pom.xml
@@ -88,6 +88,34 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <!-- no longer provided by accumulo after 2.1 -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2-hdfs</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <!-- exclude this outdated hadoop client from vfs -->
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- exclude this outdated hadoop client from vfs -->
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- exclude this outdated hadoop client from vfs -->
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-minicluster</artifactId>
diff --git
a/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/VFSManager.java
b/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/VFSManager.java
index 09b27d9..fde94c8 100644
---
a/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/VFSManager.java
+++
b/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/VFSManager.java
@@ -154,8 +154,8 @@ public class VFSManager {
VFS.addProvider("file",
new
org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider());
VFS.addProvider("jar", new
org.apache.commons.vfs2.provider.jar.JarFileProvider());
- VFS.addProvider("http", new
org.apache.commons.vfs2.provider.http.HttpFileProvider());
- VFS.addProvider("https", new
org.apache.commons.vfs2.provider.https.HttpsFileProvider());
+ VFS.addProvider("http", new
org.apache.commons.vfs2.provider.http5.Http5FileProvider());
+ VFS.addProvider("https", new
org.apache.commons.vfs2.provider.http5s.Http5sFileProvider());
VFS.addProvider("ftp", new
org.apache.commons.vfs2.provider.ftp.FtpFileProvider());
VFS.addProvider("ftps", new
org.apache.commons.vfs2.provider.ftps.FtpsFileProvider());
VFS.addProvider("war", new
org.apache.commons.vfs2.provider.jar.JarFileProvider());
diff --git
a/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/AccumuloDFSBase.java
b/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/AccumuloDFSBase.java
index ac41f3b..f82a521 100644
---
a/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/AccumuloDFSBase.java
+++
b/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/AccumuloDFSBase.java
@@ -114,8 +114,8 @@ public class AccumuloDFSBase {
vfs.addProvider("file",
new
org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider());
vfs.addProvider("jar", new
org.apache.commons.vfs2.provider.jar.JarFileProvider());
- vfs.addProvider("http", new
org.apache.commons.vfs2.provider.http.HttpFileProvider());
- vfs.addProvider("https", new
org.apache.commons.vfs2.provider.https.HttpsFileProvider());
+ vfs.addProvider("http", new
org.apache.commons.vfs2.provider.http5.Http5FileProvider());
+ vfs.addProvider("https", new
org.apache.commons.vfs2.provider.http5s.Http5sFileProvider());
vfs.addProvider("ftp", new
org.apache.commons.vfs2.provider.ftp.FtpFileProvider());
vfs.addProvider("ftps", new
org.apache.commons.vfs2.provider.ftps.FtpsFileProvider());
vfs.addProvider("war", new
org.apache.commons.vfs2.provider.jar.JarFileProvider());
diff --git a/pom.xml b/pom.xml
index abb017e..198ee28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,8 +135,15 @@ under the License.]]></licenseText>
<dependency>
<!-- no longer provided by accumulo after 2.1 -->
<groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- <version>2.9.0</version>
+ <artifactId>commons-vfs2-bom</artifactId>
+ <version>2.10.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>5.4.2</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -495,7 +502,10 @@ under the License.]]></licenseText>
<configuration>
<failOnWarning>true</failOnWarning>
<ignoredUnusedDeclaredDependencies>
-
<unused>org.apache.logging.log4j:log4j-slf4j2-impl:jar:*</unused>
+ <!-- ignore false positive runtime dependencies -->
+ <unused>org.apache.commons:commons-vfs2-hdfs:*</unused>
+
<unused>org.apache.httpcomponents.client5:httpclient5:*</unused>
+ <unused>org.apache.logging.log4j:log4j-slf4j2-impl:*</unused>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
