diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5880279d8e..361ff20c1b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,6 +18,10 @@ jobs: analyze: name: Analyze runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write strategy: fail-fast: false @@ -30,22 +34,21 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # 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 8 - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 8 + java-version: '17' distribution: 'temurin' cache: maven @@ -57,4 +60,4 @@ jobs: mvn -B package --file pom.xml -Dmaven.test.skip=true - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c6b7e0ba7f..769307d1f5 100644 --- 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 "" pom.xml | head -1 | grep -v SNAPSHOT - - name: Set up JDK 8 - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '17' distribution: 'temurin' cache: maven diff --git a/README.md b/README.md index d14cb2cac4..05af1cc5fb 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ [![Release](https://jitpack.io/v/umjammer/vavi-nio-file-jnode.svg)](https://jitpack.io/#umjammer/vavi-nio-file-jnode) [![Java CI](https://github.com/umjammer/vavi-nio-file-jnode/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-nio-file-jnode/actions/workflows/maven.yml) [![CodeQL](https://github.com/umjammer/vavi-nio-file-jnode/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-nio-file-jnode/actions/workflows/codeql-analysis.yml) -![Java](https://img.shields.io/badge/Java-8-b07219) +![Java](https://img.shields.io/badge/Java-17-b07219) [![Parent](https://img.shields.io/badge/Parent-vavi--apps--fuse-pink)](https://github.com/umjammer/vavi-apps-fuse) # vavi-nio-file-jnode A Java NIO FileSystem implementation based on [jnode](https://github.com/jnode/jnode). -## Status +all formats are mounted by fuse also! + +### Status | fs | list | upload | download | copy | move | rm | mkdir | cache | watch | comment | |------------------------------|------|--------|----------|------|------|-----|-------|-------|-------|-------------------------------------------------------| @@ -34,7 +36,21 @@ A Java NIO FileSystem implementation based on [jnode](https://github.com/jnode/j | vdisk (d88:pc98:n88) | 🚧 | | | | | | | | | not solid image is not supported by DeviceAPI | | vdisk (fdi:pc98:fat12) | ✅ | | | | | | | | | [virtual disk](vavi-nio-file-emu), partition | -## for emulator user +## Install + + * [maven](https://jitpack.io/#umjammer/vavi-nio-file-jnode) + +## Usage + +### JSR-203 & fuse + +```java + URI uri = URI.create("jnode:file:/foo/bar.nhd"); + fs = FileSystems.newFileSystem(uri, Collections.emptyList()); + Fuse fuse = Fuse.getFuse().mount(fs, MOUNT_POINT, Collections.emptyList()); +``` + +### for emulator user it's possible to mount old school japanese computer pc-9801's virtual disk by fuse. @@ -42,7 +58,11 @@ we can see nostalgic files `autoexec.bat`, `command.com`, `mifes...` etc. time stamps are so old lol. -![](https://lh3.googleusercontent.com/pw/AM-JKLVzJc46TaLOLtacSQdNJF-11XE6gw1eBN-57aIazw22VK1HHsPIoXNO3cVjHWnnEq36bjJxFBiRP3ipe57fXTfpITi8-FybMbTvpHXR-X2ZzQ2MI-HirwnI1PCyhpL6pUb8SDbCRBOyzr_sHRUKMxZB=w1024-h981-no?authuser=0) +mount nhd + +## References + + * [vavi-nio-file-emu](https://jitpack.io/#umjammer/vavi-nio-file-emu) ... PC-98 FAT ## TODO diff --git a/core/.checkstyle b/core/.checkstyle deleted file mode 100644 index de90363149..0000000000 --- a/core/.checkstyle +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/pom.xml b/core/pom.xml index 7f0d3ef625..8d5e26cc94 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -13,17 +13,8 @@ - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - UTF-8 - - - + org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 -Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties @@ -38,12 +29,7 @@ org.apache.ant ant - 1.10.12 - - - - org.apache.logging.log4j - log4j-api + 1.10.14 @@ -66,16 +52,5 @@ junit-platform-suite-engine test - - - org.apache.logging.log4j - log4j-core - test - - - org.apache.logging.log4j - log4j-jul - test - diff --git a/fs/.checkstyle b/fs/.checkstyle deleted file mode 100644 index b889bd04b2..0000000000 --- a/fs/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/fs/pom.xml b/fs/pom.xml index ee014786a5..45aca53407 100644 --- a/fs/pom.xml +++ b/fs/pom.xml @@ -18,23 +18,13 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 -Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties + -Dvavi.util.logging.VaviFormatter.extraClassMethod=vavi\.emu\.disk\.Disk\$1#log false @@ -68,13 +58,13 @@ com.github.umjammer - java7-fs-base - 0.0.13v + vavi-nio-file-base + 0.0.14v vavi vavi-nio-file-emu - 2.0.3 + 2.0.4 com.github.umjammer @@ -86,7 +76,7 @@ eu.agno3.jcifs jcifs-ng - 2.1.8 + 2.1.10 com.enterprisedt @@ -94,11 +84,6 @@ 1.5.3 - - org.apache.logging.log4j - log4j-api - - org.junit.jupiter junit-jupiter-api @@ -133,16 +118,5 @@ test-jar test - - - org.apache.logging.log4j - log4j-core - test - - - org.apache.logging.log4j - log4j-jul - test - diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000000..efde7bf258 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk17 diff --git a/net/.checkstyle b/net/.checkstyle deleted file mode 100644 index b889bd04b2..0000000000 --- a/net/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/net/pom.xml b/net/pom.xml index 9b073733b4..7f725ac238 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -11,20 +11,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 -Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties @@ -52,7 +41,7 @@ commons-net commons-net - 3.9.0 + 3.10.0 com.github.dnsjava @@ -62,12 +51,7 @@ org.acplt.remotetea remotetea-oncrpc - 1.1.4 - - - - org.apache.logging.log4j - log4j-api + 1.1.5 @@ -92,16 +76,5 @@ 0.1.55 test - - - org.apache.logging.log4j - log4j-core - test - - - org.apache.logging.log4j - log4j-jul - test - diff --git a/pom.xml b/pom.xml index b211fb2fdf..96206cfc5a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,31 +22,32 @@ + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.2 + + + + + - - org.apache.logging.log4j - log4j-api - 2.19.0 - - - - org.apache.logging.log4j - log4j-core - 2.19.0 - test - - - org.apache.logging.log4j - log4j-jul - 2.19.0 - test - - org.junit junit-bom - 5.9.1 + 5.10.2 pom import