Merge branch 'develop' into release/1.3.0

# Conflicts:
#	pom.xml

pom.xml

@@ -44,7 +44,7 @@
  <secret-service.version>1.8.1-jdk17</secret-service.version>
  <kdewallet.version>1.3.0</kdewallet.version>
  <appindicator.version>1.3.1</appindicator.version>
- <guava.version>31.1-jre</guava.version>
+ <guava.version>32.0.0-jre</guava.version>
  <slf4j.version>1.7.36</slf4j.version>
  <commons-lang3.version>3.12.0</commons-lang3.version>
 

src/test/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccessTest.java

@@ -3,8 +3,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledOnOs;
-import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.condition.EnabledIf;
 
 import java.io.IOException;
 import java.util.List;
@@ -13,14 +12,13 @@
 /**
  * Unit tests for GNOME keyring access via DBUS.
  */
-@EnabledOnOs(OS.LINUX)
 public class SecretServiceKeychainAccessTest {
 
  private static boolean isInstalled;
 
  @BeforeAll
  public static void checkSystemAndSetup() throws IOException {
- ProcessBuilder dbusSend = new ProcessBuilder("dbus-send","--print-reply","--dest=org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus.ListNames");
+ ProcessBuilder dbusSend = new ProcessBuilder("dbus-send", "--print-reply", "--dest=org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus.ListNames");
  ProcessBuilder grep = new ProcessBuilder("grep", "org.gnome.keyring");
  try {
  Process end = ProcessBuilder.startPipeline(List.of(dbusSend, grep)).get(1);
@@ -36,10 +34,13 @@ public static void checkSystemAndSetup() throws IOException {
 
 
  @Test
- public void testIsSupported(){
+ @EnabledIf("isXdgDisplayEnvVarSet")
+ public void testIsSupported() {
  SecretServiceKeychainAccess secretService = new SecretServiceKeychainAccess();
  Assertions.assertEquals(isInstalled, secretService.isSupported());
  }
 
-
-}
+ public boolean isXdgDisplayEnvVarSet() {
+ return System.getenv("DISPLAY") != null;
+ }
+}

suppression.xml

@@ -1,10 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
- <suppress>
- <notes><![CDATA[
- Vulnerable method `Files::createTempDir` not used.
- ]]></notes>
- <gav regex="true">^com\.google\.guava:.*$</gav>
- <cve>CVE-2020-8908</cve>
- </suppress>
 </suppressions>