Merge pull request #20 from umjammer/0.1.9

0.1.9
umjammer · Feb 9, 2024 · 0aba7cf · 0aba7cf
2 parents de196ac + 09b0f98
commit 0aba7cf
Show file tree

Hide file tree

Showing 94 changed files with 1,628 additions and 1,787 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -42,10 +42,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
@@ -54,9 +54,12 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Build with Maven
-      run: mvn -B install --file pom.xml -s $GITHUB_WORKSPACE/settings.xml
+      run: |
+        mkdir -p $FUSE_MOUNT_POINT
+        mvn -B install --file pom.xml -s $GITHUB_WORKSPACE/settings.xml
       env:
         GITHUB_TOKEN: ${{ github.token }}
+        FUSE_MOUNT_POINT: tmp/fuse
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,16 +16,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check w/o SNAPSHOT when "bump version"
         if: ${{ contains(github.event.head_commit.message, 'bump version') }}
         run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml

diff --git a/README.md b/README.md
@@ -1,38 +1,38 @@
 [![Release](https://jitpack.io/v/umjammer/vavi-apps-fuse.svg)](https://jitpack.io/#umjammer/vavi-apps-fuse)
-[![Java CI with Maven](https://github.com/umjammer/vavi-apps-fuse/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/umjammer/vavi-apps-fuse/actions)
+[![Java CI](https://github.com/umjammer/vavi-apps-fuse/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-apps-fuse/actions)
 [![CodeQL](https://github.com/umjammer/vavi-apps-fuse/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-apps-fuse/actions/workflows/codeql-analysis.yml)
-![Java](https://img.shields.io/badge/Java-8-b07219)
+![Java](https://img.shields.io/badge/Java-17-b07219)
 
 # vavi-apps-fuse
 
 🌏 mount the world!
 
 ## Status
 
-| fs                 | list | upload | download | copy | move | rm | mkdir | cache | watch | project | library |
-|--------------------|------|--------|----------|------|------|----|-------|-------|-------|---------|---------|
-| google drive (v3)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-googledrive) | [google-api-services-drive](https://developers.google.com/api-client-library/java/) |
-| one drive (v1)     | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-onedrive) | [OneDriveJavaSDK](https://github.com/umjammer/OneDriveJavaSDK) |
-| one drive (graph)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-onedrive3) | [msgraph-sdk-java](https://github.com/microsoftgraph/msgraph-sdk-java) |
-| one drive (graph)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-onedrive4) | [onedrive-java-client](https://github.com/iterate-ch/onedrive-java-client) |
-| dropbox (v2)       | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [java7-fs-dropbox](https://github.com/umjammer/java7-fs-dropbox) | |
-| box (v2)           | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [java7-fs-box](https://github.com/umjammer/java7-fs-box) | |
-| vfs (sftp)         | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2](https://commons.apache.org/proper/commons-vfs/), [jsch](http://www.jcraft.com/jsch/) |
-| vfs (smb:cifs-ng)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-cifs](https://github.com/vbauer/commons-vfs2-cifs), [jcifs-ng](https://github.com/AgNO3/jcifs-ng) |
-| vfs (smb:smbj)     | ✅    | ✅   | ?        | ✅    | 🚫   | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-smb](https://github.com/mikhasd/commons-vfs2-smb) |
-| vfs (webdav ssh)   | 🚧    |      |          |      |      |     |       |       |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-jackrabbit2](https://commons.apache.org/proper/commons-vfs/commons-vfs2-jackrabbit2/) |
+| fs                 | list | upload | download | copy | move | rm | mkdir | cache | watch | project | library                                                                                                                                     |
+|--------------------|------|--------|----------|------|------|----|-------|-------|-------|---------|---------------------------------------------------------------------------------------------------------------------------------------------|
+| google drive (v3)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-googledrive) | [google-api-services-drive](https://developers.google.com/api-client-library/java/)                                                         |
+| one drive (v1)     | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-onedrive) | [OneDriveJavaSDK](https://github.com/umjammer/OneDriveJavaSDK)                                                                              |
+| one drive (graph)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-onedrive3) | [onedrive-java-client](https://github.com/iterate-ch/onedrive-java-client)                                                                      |
+| one drive (graph)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [sub module](vavi-nio-file-onedrive4) | [msgraph-sdk-java](https://github.com/microsoftgraph/msgraph-sdk-java)                                                                  |
+| dropbox (v2)       | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [java7-fs-dropbox](https://github.com/umjammer/java7-fs-dropbox) |                                                                                                                                             |
+| box (v2)           | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | ✅     | 🚧    | [java7-fs-box](https://github.com/umjammer/java7-fs-box) |                                                                                                                                             |
+| vfs (sftp)         | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2](https://commons.apache.org/proper/commons-vfs/), [jsch](http://www.jcraft.com/jsch/)                                         |
+| vfs (smb:cifs-ng)  | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-cifs](https://github.com/vbauer/commons-vfs2-cifs), [jcifs-ng](https://github.com/AgNO3/jcifs-ng)                             |
+| vfs (smb:smbj)     | ✅    | ✅   | ✅       | ✅    | ✅   | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-smb](https://github.com/umjammer/commons-vfs2-smb)                                                                            |
+| vfs (webdav ssh)   | 🚧    |      |          |      |      |     |       |       |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-jackrabbit2](https://commons.apache.org/proper/commons-vfs/commons-vfs2-jackrabbit2/)                                         |
 | vfs (smb:cifs)     | ✅    | ✅   | ✅       | ✅   | ✅    | ✅ | ✅    | -     |       | [sub module](vavi-nio-file-vfs) | [commons-vfs2-sandbox](https://commons.apache.org/proper/commons-vfs/commons-vfs2-sandbox/), [jcifs-ng](https://github.com/AgNO3/jcifs-ng/) |
-| archive            | ✅    | -    | ✅       | -    | -    | -   | -     | -     |       | [sub module](vavi-nio-file-archive) | [vavi-util-archive](https://github.com/umjammer/vavi-util-archive) |
-| hfs+ (dmg)         | ✅    |      | ✅       |      |      |     |       |       |       | [sub module](vavi-nio-file-hfs) | [hfsexplorer](https://github.com/umjammer/hfsexplorer) |
-| [gathered](https://github.com/umjammer/vavi-apps-fuse/wiki/GatheredFileSystem) | ✅ | - | ✅ | -    | -    | - | - | -     | | [sub module](vavi-nio-file-gathered) | - |
-| cyberduck (webdav ssh) | ✅ | ✅  | ✅       | ✅    | ✅    | ✅ | ✅   | ✅     |       | [vavi-nio-file-cyberduck](https://github.com/umjammer/vavi-nio-file-cyberduck) | [cyberduck.webdav](https://github.com/iterate-ch/cyberduck/) |
-| cyberduck (sftp)   | ✅    | ✅   | ✅       | ✅    | ✅    | ✅ | ✅   | ✅     |       | [vavi-nio-file-cyberduck](https://github.com/umjammer/vavi-nio-file-cyberduck) | [cyberduck.ssh](https://github.com/iterate-ch/cyberduck/) |
-| discutils (vdi/ntfs) | ✅  |      | ✅       |      |      |     |      |       |       | [vavi-nio-file-discutils](https://github.com/umjammer/vavi-nio-file-discutils) | |
-| ~~google play music~~ | ✅ | -    | ✅       | -    | -    | -   | -    | -     |       | [vavi-nio-file-googleplaymusic](https://github.com/umjammer/vavi-nio-file-googleplaymusic) | [gplaymusic](https://github.com/umjammer/gplaymusic) |
+| archive            | ✅    | -    | ✅       | -    | -    | -   | -     | -     |       | [sub module](vavi-nio-file-archive) | [vavi-util-archive](https://github.com/umjammer/vavi-util-archive)                                                                          |
+| hfs+ (dmg)         | ✅    |      | ✅       |      |      |     |       |       |       | [sub module](vavi-nio-file-hfs) | [hfsexplorer](https://github.com/umjammer/hfsexplorer)                                                                                      |
+| [gathered](https://github.com/umjammer/vavi-apps-fuse/wiki/GatheredFileSystem) | ✅ | - | ✅ | -    | -    | - | - | -     | | [sub module](vavi-nio-file-gathered) | -                                                                                                                                           |
+| cyberduck (webdav ssh) | ✅ | ✅  | ✅       | ✅    | ✅    | ✅ | ✅   | ✅     |       | [vavi-nio-file-cyberduck](https://github.com/umjammer/vavi-nio-file-cyberduck) | [cyberduck.webdav](https://github.com/iterate-ch/cyberduck/)                                                                                |
+| cyberduck (sftp)   | ✅    | ✅   | ✅       | ✅    | ✅    | ✅ | ✅   | ✅     |       | [vavi-nio-file-cyberduck](https://github.com/umjammer/vavi-nio-file-cyberduck) | [cyberduck.ssh](https://github.com/iterate-ch/cyberduck/)                                                                                   |
+| discutils (vdi/ntfs) | ✅  |      | ✅       |      |      |     |      |       |       | [vavi-nio-file-discutils](https://github.com/umjammer/vavi-nio-file-discutils) |                                                                                                                                             |
+| ~~google play music~~ | ✅ | -    | ✅       | -    | -    | -   | -    | -     |       | [vavi-nio-file-googleplaymusic](https://github.com/umjammer/vavi-nio-file-googleplaymusic) | [gplaymusic](https://github.com/umjammer/gplaymusic)                                                                                        |
 ||||||
-| fuse (javafs)      | ✅    | ✅   | ✅       | ✅    | ✅    | ✅  | ✅   | ✅     |       | [sub module](vavi-net-fuse) | [javafs](https://github.com/umjammer/javafs) |
-| fuse (fuse-jna)    | ✅    | ✅   | ✅       | ✅    | ✅    | ✅  | ✅   | ✅     |       | [sub module](vavi-net-fuse) | [fuse-jna](https://github.com/EtiennePerot/fuse-jna) |
-| fuse (jnr-fuse)    | ✅    | ✅   | ✅       | ✅    | ✅    | ✅  | ✅   | ✅     |       | [sub module](vavi-net-fuse) | [jnr-fuse](https://github.com/SerCeMan/jnr-fuse) |
+| fuse (javafs)      | ✅    | ✅   | ✅       | ✅    | ✅    | ✅  | ✅   | ✅     |       | [sub module](vavi-net-fuse) | [javafs](https://github.com/umjammer/javafs)                                                                                                |
+| fuse (fuse-jna)    | ✅    | ✅   | ✅       | ✅    | ✅    | ✅  | ✅   | ✅     |       | [sub module](vavi-net-fuse) | [fuse-jna](https://github.com/EtiennePerot/fuse-jna)                                                                                        |
+| fuse (jnr-fuse)    | ✅    | ✅   | ✅       | ✅    | ✅    | ✅  | ✅   | ✅     |       | [sub module](vavi-net-fuse) | [jnr-fuse](https://github.com/SerCeMan/jnr-fuse)                                                                                            |
 
 ## Usage
 
@@ -44,6 +44,8 @@
 
 ## Installation
 
+ * [maven](https://jitpack.io/#umjammer/vavi-apps-fuse)
+
 ### jars
 
  * https://jitpack.io/#umjammer/vavi-apps-fuse
@@ -72,7 +74,12 @@
 
 ## References
 
-https://github.com/umjammer/vavi-apps-fuse/wiki/Libraries
+ * https://github.com/umjammer/vavi-apps-fuse/wiki/Libraries
+ * https://github.com/googleapis/java-storage-nio (official !!!)
+   * retry handler
+   * option
+   * SeekableByteChannel
+ * https://github.com/unsound/jfuse (jni)
 
 ## TODO
 
@@ -89,6 +96,4 @@ https://github.com/umjammer/vavi-apps-fuse/wiki/Libraries
  * ~~https://github.com/cryptomator/fuse-nio-adapter~~
  * https://github.com/mucommander/mucommander
  * trash,recent
- * https://github.com/googleapis/java-storage-nio (official !!!)
- * https://github.com/unsound/jfuse (jni)
-
+ * ~~separate vavi-nio-file-commons and merge into vavi-nio-file-base~~
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17
diff --git a/pom.xml b/pom.xml
@@ -4,10 +4,10 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-apps-fuse</artifactId>
-  <version>0.1.8</version>
+  <version>0.1.9</version>
+  <packaging>pom</packaging>
 
   <modules>
-    <module>vavi-nio-file-commons</module>
     <module>vavi-nio-file-googledrive</module>
     <module>vavi-nio-file-amazondrive</module>
     <module>vavi-nio-file-flickr</module>
@@ -23,16 +23,13 @@
   </modules>
 
   <properties>
-    <vavi-net-auth.groupId>com.github.umjammer.vavi-net-auth</vavi-net-auth.groupId>
-    <vavi-net-auth.version>0.1.6</vavi-net-auth.version>
-    <vavi-nio-file.groupId>com.github.umjammer</vavi-nio-file.groupId>
-    <vavi-nio-file.version>0.0.14</vavi-nio-file.version>
-    <!-- com.github.fge / com.github.umjammer -->
-    <java7-fs-base.groupId>com.github.umjammer</java7-fs-base.groupId>
-    <java7-fs-base.version>0.0.13v</java7-fs-base.version>
+    <vavi-net-auth.groupId>com.github.umjammer.vavi-net-auth</vavi-net-auth.groupId> <!-- vavi / com.github.umjammer -->
+    <vavi-net-auth.version>0.1.9</vavi-net-auth.version>
+
+    <vavi-nio-file-base.groupId>com.github.umjammer</vavi-nio-file-base.groupId> <!-- com.github.fge / com.github.umjammer -->
+    <vavi-nio-file-base.version>0.0.14v</vavi-nio-file-base.version>
   </properties>
 
-  <packaging>pom</packaging>
   <name>vavi-apps-fuse</name>
   <url>https://github.com/umjammer/vavi-apps-fuse</url>
   <description>fuse for java and many file systems.</description>
@@ -49,17 +46,15 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
+          <version>3.11.0</version>
           <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-            <encoding>utf-8</encoding>
+            <release>17</release>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M7</version>
+          <version>3.2.2</version>
           <configuration>
             <argLine>-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties</argLine>
             <trimStackTrace>false</trimStackTrace>
@@ -80,46 +75,35 @@
     <dependencies>
       <dependency>
         <!-- java-fs base -->
-        <groupId>${java7-fs-base.groupId}</groupId>
-        <artifactId>java7-fs-base</artifactId>
-        <version>${java7-fs-base.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${vavi-nio-file.groupId}</groupId>
-        <artifactId>vavi-nio-file</artifactId>
-        <version>${vavi-nio-file.version}</version>
+        <groupId>${vavi-nio-file-base.groupId}</groupId>
+        <artifactId>vavi-nio-file-base</artifactId>
+        <version>${vavi-nio-file-base.version}</version>
       </dependency>
 
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
-        <version>1.3.9</version>
-      </dependency>
-
-      <dependency>
-        <groupId>vavi</groupId>
-        <artifactId>vavi-nio-file-commons</artifactId>
-        <version>0.1.8</version>
+        <version>3.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>vavi</groupId>
         <artifactId>vavi-net-fuse</artifactId>
-        <version>0.1.8</version>
+        <version>0.1.9</version>
       </dependency>
 
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.1</version>
+        <version>5.10.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
 
       <dependency>
-        <groupId>${vavi-nio-file.groupId}</groupId>
-        <artifactId>vavi-nio-file</artifactId>
-        <version>${vavi-nio-file.version}</version>
+        <groupId>${vavi-nio-file-base.groupId}</groupId>
+        <artifactId>vavi-nio-file-base</artifactId>
+        <version>${vavi-nio-file-base.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
@@ -133,13 +117,7 @@
       <dependency>
         <groupId>vavi</groupId>
         <artifactId>vavi-net-fuse</artifactId>
-        <version>0.1.8</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>vavi</groupId>
-        <artifactId>vavi-net-fuse</artifactId>
-        <version>0.1.8</version>
+        <version>0.1.9</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>