Merge pull request #4 from umjammer/0.23.4

0.23.4

.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,20 +34,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD
-      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      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.
@@ -53,8 +48,15 @@ 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: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +70,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Java CI
 
 on:
   push:
@@ -15,12 +15,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - name: Checkout repository
+        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 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

README.md

@@ -1,19 +1,29 @@
 [![jitpack](https://jitpack.io/v/umjammer/hfsexplorer.svg)](https://jitpack.io/#umjammer/hfsexplorer)
-[![Java CI](https://github.com/umjammer/hfsexplorer/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/umjammer/hfsexplorer/actions)
+[![Java CI](https://github.com/umjammer/hfsexplorer/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/hfsexplorer/actions/workflows/maven.yml)
 [![CodeQL](https://github.com/umjammer/hfsexplorer/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/hfsexplorer/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)
 
 # hfs explorer
 
 this is a fork of https://github.com/unsound/hfsexplorer and mavenized
 
+## Install
+
+ * [maven](https://jitpack.io/#umjammer/hfsexplorer)
+
+## Usage
+
+## References
+
 ## TODO
 
 * native (win32) compilation by maven
 
 ----
 
+# [Original](http://www.catacombae.org/hfsexplorer/)
+
 ## What is HFSExplorer?
 
 HFSExplorer is an application that can read Mac-formatted hard disks and disk images.
@@ -31,7 +41,3 @@ People that need to access the contents of HFS+-formatted .dmg / .sparsebundle f
 HFSExplorer is written mostly in Java 5, optionally using some Java 6 / 7 features, with some Windows-specific parts written in C in order to be able to get raw access to block devices, and to create a practical launcher application.
 
 Linux and OS X users should in most cases not need HFSExplorer for browsing file systems on devices, since there are native file system drivers available on those systems, but it seems to work fine if you need it. Linux users might find use for opening .dmg / .sparsebundle files.
-
-----
-
-[Project Page](http://www.catacombae.org/hfsexplorer/)

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17

pom.xml

@@ -3,21 +3,22 @@
 
   <groupId>catacombae</groupId>
   <artifactId>hfsexplorer</artifactId>
-  <version>0.23.3</version>
+  <version>0.23.4</version>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <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>
           <trimStackTrace>false</trimStackTrace>
           <argLine>
@@ -41,7 +42,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.10.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -50,10 +51,16 @@
 
   <dependencies>
     <dependency>
-      <!-- catacombae:hfsx_dmglib, dmgextractor -->
-      <groupId>com.github.umjammer</groupId>
-      <artifactId>dmgextractor</artifactId>
-      <version>0.70.2</version>
+      <groupId>com.github.umjammer</groupId> <!-- catacombae / com.github.umjammer -->
+      <artifactId>dmgextractor</artifactId> <!-- hfsx_dmglib / dmgextractor -->
+      <version>0.70.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.formdev</groupId>
+      <artifactId>flatlaf</artifactId>
+      <version>3.4.1</version>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
@@ -71,5 +78,12 @@
       <artifactId>junit-platform-commons</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.github.umjammer</groupId>
+      <artifactId>vavi-commons</artifactId>
+      <version>1.1.13</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>