Compare commits

...
Author SHA1 Message Date
Armin Schrenk ad240eb18b Merge branch 'develop' into release/1.19.0
# Conflicts:
#	pom.xml
2025-12-30 12:40:06 +01:00
Armin Schrenk 8105dbc236 Closes #4058 2025-12-30 12:31:45 +01:00
Armin Schrenk ceed70c314 [skip ci] update changelog 2025-12-29 16:59:01 +01:00
Sebastian Stenzel 04bdb2d8c4 fix mocked update check 2025-11-24 20:58:57 +01:00
Sebastian Stenzel f32d24c1c0 Merge branch 'develop' into release/1.19.0 2025-11-24 20:58:25 +01:00
Sebastian Stenzel 3f06460667 bump version 2025-11-24 14:50:19 +01:00
3 changed files with 20 additions and 10 deletions
+6 -5
View File
@@ -10,12 +10,13 @@ Changes to prior versions can be found on the [Github release page](https://gith
## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.18.0...HEAD) ## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.18.0...HEAD)
### Added ### Added
* Self-Update Mechanism (#3948) * Self-Update Mechanism ([#3948](https://github.com/cryptomator/cryptomator/pull/3948))
* Implemented `.dmg` update mechanism * Implemented `.dmg` update mechanism
* Implemented Flatpak update mechanism * Implemented Flatpak update mechanism
* App notifications (#4069) * App notifications ([#4069](https://github.com/cryptomator/cryptomator/pull/4069))
* Mark files in-use for Hub vaults (#4078) * Mark files in-use for Hub vaults ([#4078](https://github.com/cryptomator/cryptomator/pull/4078))
* Accessibility labels for GUI elements ([#4064](https://github.com/cryptomator/cryptomator/issues/4064), [#4066](https://github.com/cryptomator/cryptomator/pull/4066), [#4055](https://github.com/cryptomator/cryptomator/issues/4055))
### Changed ### Changed
* Built using JDK 25 (#4031) * Built using JDK 25 ([#4031](https://github.com/cryptomator/cryptomator/issues/4031))
* Modernized Templage for GitHub Releases * Modernized Template for GitHub Releases
+3 -3
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId> <groupId>org.cryptomator</groupId>
<artifactId>cryptomator</artifactId> <artifactId>cryptomator</artifactId>
<version>1.19.0-SNAPSHOT</version> <version>1.19.0</version>
<name>Cryptomator Desktop App</name> <name>Cryptomator Desktop App</name>
<organization> <organization>
@@ -36,8 +36,8 @@
<cryptomator.cryptofs.version>2.10.0-beta2</cryptomator.cryptofs.version> <cryptomator.cryptofs.version>2.10.0-beta2</cryptomator.cryptofs.version>
<cryptomator.integrations.version>1.8.0-beta1</cryptomator.integrations.version> <cryptomator.integrations.version>1.8.0-beta1</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.5.1</cryptomator.integrations.win.version> <cryptomator.integrations.win.version>1.5.1</cryptomator.integrations.win.version>
<cryptomator.integrations.mac.version>1.5.0-beta1</cryptomator.integrations.mac.version> <cryptomator.integrations.mac.version>1.5.0-beta3</cryptomator.integrations.mac.version>
<cryptomator.integrations.linux.version>1.7.0-beta1</cryptomator.integrations.linux.version> <cryptomator.integrations.linux.version>1.7.0-beta3</cryptomator.integrations.linux.version>
<cryptomator.fuse.version>5.1.0</cryptomator.fuse.version> <cryptomator.fuse.version>5.1.0</cryptomator.fuse.version>
<cryptomator.webdav.version>3.0.0</cryptomator.webdav.version> <cryptomator.webdav.version>3.0.0</cryptomator.webdav.version>
+11 -2
View File
@@ -82,13 +82,22 @@
<!-- Vulnerable, but unused class in jetty --> <!-- Vulnerable, but unused class in jetty -->
<suppress> <suppress>
<notes><![CDATA[ <notes><![CDATA[
The project does not use the HttpURI class at all, so no decoded user data is passed to it. The project does not use the HttpURI class at all, so no decoded user data is passed to it.
See also https://github.com/jetty/jetty.project/security/advisories/GHSA-qh8g-58pp-2wxh. See also https://github.com/jetty/jetty.project/security/advisories/GHSA-qh8g-58pp-2wxh.
]]></notes> ]]></notes>
<packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty-.*$</packageUrl> <packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty-.*$</packageUrl>
<vulnerabilityName>CVE-2024-6763</vulnerabilityName> <vulnerabilityName>CVE-2024-6763</vulnerabilityName>
<cve>CVE-2024-6763</cve> <cve>CVE-2024-6763</cve>
</suppress> </suppress>
<!-- False positives of the flatpak sandbox -->
<suppress>
<notes><![CDATA[
file name: flatpak-update-portal-1.1.0.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.purejava/flatpak-update-portal@.*$</packageUrl>
<cpe>cpe:/a:flatpak:flatpak</cpe>
</suppress>
</suppressions> </suppressions>