You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2022/11/06 19:25:08 UTC

[accumulo] branch 1.10 updated: Add VFS type mapping for new jar mime type (#3069)

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.10
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.10 by this push:
     new 5548c9289a Add VFS type mapping for new jar mime type (#3069)
5548c9289a is described below

commit 5548c9289ac36907c5b38d977421ab7d623649ee
Author: Christopher L. Shannon <ch...@gmail.com>
AuthorDate: Sun Nov 6 14:25:02 2022 -0500

    Add VFS type mapping for new jar mime type (#3069)
    
    Add VFS type mapping for the new jar mime type added in newer versions
    of Java 11 and 17, application/java-archive, to ensure it is associated with
    the "jar" scheme in VFS. This ensures VFS loads jars correctly when run
    on a newer version of Java.
    
    This fixes #3068
    See related: https://issues.apache.org/jira/browse/VFS-819
    
    Backported from #2682 to the 1.10 branch
    (cherry picked from commit 838eccf83ee88d0716b88d021611b1fb85089491)
    
    Co-authored-by: Christopher L. Shannon <ch...@gmail.com>
    Co-authored-by: Christopher Tubbs <ct...@apache.org>
---
 .../apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java    | 1 +
 start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index 25b8ac677a..38ecd69d19 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@ -284,6 +284,7 @@ public class AccumuloVFSClassLoader {
     vfs.addExtensionMap("tbz2", "tar");
     vfs.addExtensionMap("tgz", "tar");
     vfs.addExtensionMap("bz2", "bz2");
+    vfs.addMimeTypeMap("application/java-archive", "jar");
     vfs.addMimeTypeMap("application/x-tar", "tar");
     vfs.addMimeTypeMap("application/x-gzip", "gz");
     vfs.addMimeTypeMap("application/zip", "zip");
diff --git a/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java b/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
index 777e9c1ae9..d345e19b6f 100644
--- a/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
+++ b/start/src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java
@@ -107,6 +107,7 @@ public class AccumuloDFSBase {
       vfs.addExtensionMap("tbz2", "tar");
       vfs.addExtensionMap("tgz", "tar");
       vfs.addExtensionMap("bz2", "bz2");
+      vfs.addMimeTypeMap("application/java-archive", "jar");
       vfs.addMimeTypeMap("application/x-tar", "tar");
       vfs.addMimeTypeMap("application/x-gzip", "gz");
       vfs.addMimeTypeMap("application/zip", "zip");