Skip to content

Commit 65813f5

Browse files
committed
Merge branch 'release/0.6.2'
2 parents 1c044ea + c163608 commit 65813f5

File tree

7 files changed

+44
-19
lines changed

7 files changed

+44
-19
lines changed

.github/workflows/build-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
env:
1616
JAVA_DIST: 'zulu'
17-
JAVA_VERSION: '23.0.1+11'
17+
JAVA_VERSION: '24.0.0+36'
1818

1919
defaults:
2020
run:
@@ -56,7 +56,7 @@ jobs:
5656
architecture: x64
5757
native-access-lib: 'org.cryptomator.jfuse.linux.amd64'
5858
artifact-name: cryptomator-cli-${{ needs.prepare.outputs.semVerStr }}-linux-x64.zip
59-
- os: [self-hosted, Linux, ARM64]
59+
- os: ubuntu-24.04-arm
6060
architecture: aarch64
6161
native-access-lib: 'org.cryptomator.jfuse.linux.aarch64'
6262
artifact-name: cryptomator-cli-${{ needs.prepare.outputs.semVerStr }}-linux-aarch64.zip

.github/workflows/build-mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818

1919
env:
2020
JAVA_DIST: 'zulu'
21-
JAVA_VERSION: '23.0.1+11'
21+
JAVA_VERSION: '24.0.0+36'
2222

2323
defaults:
2424
run:

.github/workflows/build-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
env:
1616
JAVA_DIST: 'zulu'
17-
JAVA_VERSION: '23.0.1+11'
17+
JAVA_VERSION: '24.0.0+36'
1818

1919
defaults:
2020
run:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-java@v4
1717
with:
18-
java-version: '23'
18+
java-version: '24'
1919
distribution: 'temurin'
2020
- name: Ensure to use tagged version
2121
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags'

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
The changelog starts with version 0.6.2.
9+
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/cli/releases).
10+
11+
## [0.6.2] - 2025-04-10
12+
13+
### Changed
14+
15+
* Update org.cryptomator:cryptofs from 2.7.1 to 2.8.0
16+
* Update org.cryptomator:webdav-nio-adapter from 2.0.7 to 2.0.10
17+
* Update org.cryptomator:fuse-nio-adapter from 5.0.4 to 5.0.5
18+
* Update org.slf4j:slf4j-api from 2.0.16 to 2.0.17
19+
* Update ch.qos.logback:logback-* from 1.5.13 to 1.5.18
20+
* Update build JDK from 23 to 24.0.0+36
21+
22+
### Fixed
23+
24+
* Mount fails with libfuse3.17.1 ([#87](https://github.com/cryptomator/cli/issues/87))

dist/jpackage.args

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
--dest target
1212
--name cryptomator-cli
1313
--vendor "Skymatic GmbH"
14-
--copyright "(C) 2016 - 2024 Skymatic GmbH"
14+
--copyright "(C) 2016 - 2025 Skymatic GmbH"
1515
--app-version "${JP_APP_VERSION}"
1616
--java-options "-Dorg.cryptomator.cli.version=${APP_VERSION}"
17-
--java-options "--enable-native-access=${NATIVE_ACCESS_PACKAGE}"
17+
--java-options "--enable-native-access=${NATIVE_ACCESS_PACKAGE},org.fusesource.jansi"
1818
--java-options "-Xss5m"
1919
--java-options "-Xmx256m"
20-
--java-options "-Dfile.encoding=\"utf-8\""
20+
--java-options "-Dfile.encoding=\"utf-8\""

pom.xml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.cryptomator</groupId>
55
<artifactId>cli</artifactId>
6-
<version>0.6.1</version>
6+
<version>0.6.2</version>
77
<name>Cryptomator CLI</name>
88
<description>Command line program to access encrypted files via WebDAV.</description>
99
<url>https://github.com/cryptomator/cli</url>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
14-
<jdk.version>23</jdk.version>
14+
<jdk.version>24</jdk.version>
1515

1616
<!--jpackage stuff -->
1717
<!-- Group IDs of jars that need to stay on the class path for now
@@ -20,21 +20,21 @@
2020
<mainClass>org.cryptomator.cli.CryptomatorCli</mainClass>
2121

2222
<!-- runtime dependencies -->
23-
<cryptofs.version>2.7.1</cryptofs.version>
24-
<webdav-nio.version>2.0.7</webdav-nio.version>
25-
<fuse-nio.version>5.0.2</fuse-nio.version>
26-
<logback.version>1.5.13</logback.version>
27-
<slf4j.version>2.0.16</slf4j.version>
23+
<cryptofs.version>2.8.0</cryptofs.version>
24+
<webdav-nio.version>2.0.10</webdav-nio.version>
25+
<fuse-nio.version>5.0.5</fuse-nio.version>
26+
<logback.version>1.5.18</logback.version>
27+
<slf4j.version>2.0.17</slf4j.version>
2828

2929
<!-- build dependencies -->
30-
<jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
3130
<picocli.version>4.7.6</picocli.version>
3231

3332
<!-- maven plugins -->
34-
<maven-compiler.version>3.13.0</maven-compiler.version>
35-
<maven-jar.version>3.3.0</maven-jar.version>
33+
<maven-compiler.version>3.14.0</maven-compiler.version>
34+
<maven-jar.version>3.4.2</maven-jar.version>
35+
<maven-dependency.version>3.8.1</maven-dependency.version>
3636
<maven-shade.version>3.6.0</maven-shade.version>
37-
<maven-exec.version>3.4.1</maven-exec.version>
37+
<maven-exec.version>3.5.0</maven-exec.version>
3838
</properties>
3939

4040
<licenses>
@@ -145,6 +145,7 @@
145145
<plugin>
146146
<groupId>org.apache.maven.plugins</groupId>
147147
<artifactId>maven-dependency-plugin</artifactId>
148+
<version>${maven-dependency.version}</version>
148149
<executions>
149150
<!-- sort jars into two buckets (classpath and modulepath). exclude openjfx, which gets jlinked separately -->
150151
<execution>

0 commit comments

Comments
 (0)