Skip to content

Commit adbf840

Browse files
infeoinfeo
committed
Merge branch 'release/1.5.1'
2 parents f59c6cb + 5106492 commit adbf840

File tree

5 files changed

+60
-17
lines changed

5 files changed

+60
-17
lines changed

‎.github/workflows/publish-central.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ jobs:
3434
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
3535
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
3636
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
37-
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
37+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
38+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

‎.github/workflows/publish-github.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
2323
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
24+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
2425
- name: Slack Notification
2526
uses: rtCamp/action-slack-notify@v2
2627
env:

‎pom.xml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-linux</artifactId>
8-
<version>1.5.0</version>
8+
<version>1.5.1</version>
99

1010
<name>integrations-linux</name>
1111
<description>Provides optional Linux services used by Cryptomator</description>
@@ -47,11 +47,18 @@
4747
<appindicator.version>1.4.1</appindicator.version>
4848

4949
<!-- test dependencies -->
50-
<junit.version>5.10.3</junit.version>
50+
<junit.version>5.11.3</junit.version>
5151

5252
<!-- build plugin dependencies -->
53-
<dependency-check.version>10.0.3</dependency-check.version>
54-
<nexus-staging.version>1.6.8</nexus-staging.version>
53+
<mvn-compiler.version>3.13.0</mvn-compiler.version>
54+
<mvn-surefire.version>3.5.1</mvn-surefire.version>
55+
<mvn-enforcer.version>3.5.0</mvn-enforcer.version>
56+
<mvn-source.version>3.3.1</mvn-source.version>
57+
<mvn-javadoc.version>3.10.1</mvn-javadoc.version>
58+
<mvn-gpg.version>3.2.7</mvn-gpg.version>
59+
<mvn-deploy.version>3.1.3</mvn-deploy.version>
60+
<dependency-check.version>11.1.0</dependency-check.version>
61+
<nexus-staging.version>1.7.0</nexus-staging.version>
5562
</properties>
5663

5764
<dependencies>
@@ -100,20 +107,20 @@
100107
<plugin>
101108
<groupId>org.apache.maven.plugins</groupId>
102109
<artifactId>maven-compiler-plugin</artifactId>
103-
<version>3.13.0</version>
110+
<version>${mvn-compiler.version}</version>
104111
<configuration>
105112
<release>${project.jdk.version}</release>
106113
</configuration>
107114
</plugin>
108115
<plugin>
109116
<groupId>org.apache.maven.plugins</groupId>
110117
<artifactId>maven-surefire-plugin</artifactId>
111-
<version>3.3.1</version>
118+
<version>${mvn-surefire.version}</version>
112119
</plugin>
113120
<plugin>
114121
<groupId>org.apache.maven.plugins</groupId>
115122
<artifactId>maven-enforcer-plugin</artifactId>
116-
<version>3.5.0</version>
123+
<version>${mvn-enforcer.version}</version>
117124
<executions>
118125
<execution>
119126
<id>check-preconditions</id>
@@ -134,7 +141,7 @@
134141
</plugin>
135142
<plugin>
136143
<artifactId>maven-source-plugin</artifactId>
137-
<version>3.3.1</version>
144+
<version>${mvn-source.version}</version>
138145
<executions>
139146
<execution>
140147
<id>attach-sources</id>
@@ -146,7 +153,7 @@
146153
</plugin>
147154
<plugin>
148155
<artifactId>maven-javadoc-plugin</artifactId>
149-
<version>3.8.0</version>
156+
<version>${mvn-javadoc.version}</version>
150157
<executions>
151158
<execution>
152159
<id>attach-javadocs</id>
@@ -239,7 +246,7 @@
239246
<plugins>
240247
<plugin>
241248
<artifactId>maven-gpg-plugin</artifactId>
242-
<version>3.2.4</version>
249+
<version>${mvn-gpg.version}</version>
243250
<executions>
244251
<execution>
245252
<id>sign-artifacts</id>
@@ -271,7 +278,7 @@
271278
<plugin>
272279
<groupId>org.sonatype.plugins</groupId>
273280
<artifactId>nexus-staging-maven-plugin</artifactId>
274-
<version>1.7.0</version>
281+
<version>${nexus-staging.version}</version>
275282
<extensions>true</extensions>
276283
<configuration>
277284
<serverId>ossrh</serverId>
@@ -297,7 +304,7 @@
297304
<plugin>
298305
<groupId>org.apache.maven.plugins</groupId>
299306
<artifactId>maven-deploy-plugin</artifactId>
300-
<version>3.1.2</version>
307+
<version>${mvn-deploy.version}</version>
301308
</plugin>
302309
</plugins>
303310
</build>

‎src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public class NautilusBookmarks implements QuickAccessService {
2929

3030
@Override
3131
public QuickAccessService.QuickAccessEntry add(Path target, String displayName) throws QuickAccessServiceException {
32-
String entryLine = "file://" + target.toAbsolutePath() + " " + displayName;
32+
var uriPath = target.toAbsolutePath().toString().replace(" ", "%20");
33+
String entryLine = "file://" + uriPath + " " + displayName;
3334
try {
3435
BOOKMARKS_LOCK.lock();
3536
if (Files.size(BOOKMARKS_FILE) > MAX_FILE_SIZE) {

‎src/test/java/org/cryptomator/linux/quickaccess/NautilusBookmarksIT.java

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import org.junit.jupiter.api.Test;
1010
import org.junit.jupiter.api.io.TempDir;
1111

12+
import java.io.IOException;
13+
import java.nio.file.Files;
1214
import java.nio.file.Path;
1315
import java.time.Duration;
1416

@@ -25,11 +27,42 @@ public void testSupport() {
2527
}
2628

2729
@Test
28-
@DisplayName("Adds for 20s an entryto the Nautilus sidebar")
30+
@DisplayName("Adds for 20s an entry to the Nautilus sidebar")
2931
@Disabled
30-
public void testSidebarIntegration(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException {
31-
var entry = new NautilusBookmarks().add(tmpdir, "integrations-linux");
32+
public void testSidebarIntegrationEasy(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
33+
var target = tmpdir.resolve("foobar");
34+
testSidebarIntegration(target, "foobar");
35+
}
36+
37+
@Test
38+
@DisplayName("Adds for 20s an entry to the Nautilus sidebar. The target dir contains a space.")
39+
@Disabled
40+
public void testSidebarIntegrationSpace(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
41+
var target = tmpdir.resolve("foo bar");
42+
testSidebarIntegration(target, "foobar");
43+
}
44+
45+
@Test
46+
@DisplayName("Adds for 20s an entry to the Nautilus sidebar. The target dir contains non ascii.")
47+
@Disabled
48+
public void testSidebarIntegrationNonASCII(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
49+
var target = tmpdir.resolve("f한obÄr");
50+
testSidebarIntegration(target, "foobar");
51+
}
52+
53+
@Test
54+
@DisplayName("Adds for 20s an entry to the Nautilus sidebar. The target dir contains non ascii.")
55+
@Disabled
56+
public void testSidebarIntegrationName(@TempDir Path tmpdir) throws QuickAccessServiceException, InterruptedException, IOException {
57+
var target = tmpdir.resolve("foobar");
58+
testSidebarIntegration(target, "f한o bÄr");
59+
}
60+
61+
private void testSidebarIntegration(Path target, String name) throws IOException, InterruptedException, QuickAccessServiceException {
62+
Files.createDirectory(target);
63+
var entry = new NautilusBookmarks().add(target, name);
3264
Thread.sleep(Duration.ofSeconds(20));
3365
entry.remove();
3466
}
67+
3568
}

0 commit comments

Comments
 (0)