Merge branch 'release/1.5.1'

cryptomator · Nov 4, 2024 · adbf840 · adbf840
2 parents f59c6cb + 5106492
commit adbf840
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 17 deletions.
diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
@@ -34,4 +34,5 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
-          MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
+          MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
+          MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
@@ -21,6 +21,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
           MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
+          MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
       - name: Slack Notification
         uses: rtCamp/action-slack-notify@v2
         env:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-linux</artifactId>
-	<version>1.5.0</version>
+	<version>1.5.1</version>
 
 	<name>integrations-linux</name>
 	<description>Provides optional Linux services used by Cryptomator</description>
@@ -47,11 +47,18 @@
 		<appindicator.version>1.4.1</appindicator.version>
 
 		<!-- test dependencies -->
-		<junit.version>5.10.3</junit.version>
+		<junit.version>5.11.3</junit.version>
 
 		<!-- build plugin dependencies -->
-		<dependency-check.version>10.0.3</dependency-check.version>
-		<nexus-staging.version>1.6.8</nexus-staging.version>
+		<mvn-compiler.version>3.13.0</mvn-compiler.version>
+		<mvn-surefire.version>3.5.1</mvn-surefire.version>
+		<mvn-enforcer.version>3.5.0</mvn-enforcer.version>
+		<mvn-source.version>3.3.1</mvn-source.version>
+		<mvn-javadoc.version>3.10.1</mvn-javadoc.version>
+		<mvn-gpg.version>3.2.7</mvn-gpg.version>
+		<mvn-deploy.version>3.1.3</mvn-deploy.version>
+		<dependency-check.version>11.1.0</dependency-check.version>
+		<nexus-staging.version>1.7.0</nexus-staging.version>
 	</properties>
 
 	<dependencies>
@@ -100,20 +107,20 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.13.0</version>
+				<version>${mvn-compiler.version}</version>
 				<configuration>
 					<release>${project.jdk.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>${mvn-surefire.version}</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>${mvn-enforcer.version}</version>
 				<executions>
 					<execution>
 						<id>check-preconditions</id>
@@ -134,7 +141,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>${mvn-source.version}</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -146,7 +153,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>${mvn-javadoc.version}</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -239,7 +246,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.4</version>
+						<version>${mvn-gpg.version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -271,7 +278,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.7.0</version>
+						<version>${nexus-staging.version}</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
@@ -297,7 +304,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>${mvn-deploy.version}</version>
 					</plugin>
 				</plugins>
 			</build>

diff --git a/src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java b/src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java
@@ -29,7 +29,8 @@ public class NautilusBookmarks implements QuickAccessService {
 
 	@Override
 	public QuickAccessService.QuickAccessEntry add(Path target, String displayName) throws QuickAccessServiceException {
-		String entryLine = "file://" + target.toAbsolutePath() + " " + displayName;
+		var uriPath = target.toAbsolutePath().toString().replace(" ", "%20");
+		String entryLine = "file://" + uriPath + " " + displayName;
 		try {
 			BOOKMARKS_LOCK.lock();
 			if (Files.size(BOOKMARKS_FILE) > MAX_FILE_SIZE) {

diff --git a/src/test/java/org/cryptomator/linux/quickaccess/NautilusBookmarksIT.java b/src/test/java/org/cryptomator/linux/quickaccess/NautilusBookmarksIT.java
@@ -9,6 +9,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
 
@@ -25,11 +27,42 @@ public void testSupport() {
 	}
 
 	@Test
-	@DisplayName("Adds for 20s an entryto the Nautilus sidebar")
+	@DisplayName("Adds for 20s an entry to the Nautilus sidebar")
 	@Disabled
-	public void testSidebarIntegration(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException {
-		var entry = new NautilusBookmarks().add(tmpdir, "integrations-linux");
+	public void testSidebarIntegrationEasy(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
+		var target = tmpdir.resolve("foobar");
+		testSidebarIntegration(target, "foobar");
+	}
+
+	@Test
+	@DisplayName("Adds for 20s an entry to the Nautilus sidebar. The target dir contains a space.")
+	@Disabled
+	public void testSidebarIntegrationSpace(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
+		var target = tmpdir.resolve("foo bar");
+		testSidebarIntegration(target, "foobar");
+	}
+
+	@Test
+	@DisplayName("Adds for 20s an entry to the Nautilus sidebar. The target dir contains non ascii.")
+	@Disabled
+	public void testSidebarIntegrationNonASCII(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
+		var target = tmpdir.resolve("f한obÄr");
+		testSidebarIntegration(target, "foobar");
+	}
+
+	@Test
+	@DisplayName("Adds for 20s an entry to the Nautilus sidebar. The target dir contains non ascii.")
+	@Disabled
+	public void testSidebarIntegrationName(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
+		var target = tmpdir.resolve("foobar");
+		testSidebarIntegration(target, "f한o bÄr");
+	}
+
+	private void testSidebarIntegration(Path target, String name) throws IOException, InterruptedException, QuickAccessServiceException {
+		Files.createDirectory(target);
+		var entry = new NautilusBookmarks().add(target, name);
 		Thread.sleep(Duration.ofSeconds(20));
 		entry.remove();
 	}
+
 }