Skip to content

Commit c163245

Browse files
infeoinfeo
committed
Merge branch 'release/1.2.3'
2 parents 369bd6c + 2fefd8a commit c163245

File tree

12 files changed

+139
-42
lines changed

12 files changed

+139
-42
lines changed

‎.github/dependabot.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
day: "monday"
8+
time: "06:00"
9+
timezone: "Etc/UTC"
10+
groups:
11+
java-test-dependencies:
12+
patterns:
13+
- "org.junit.jupiter:*"
14+
- "org.mockito:*"
15+
maven-build-plugins:
16+
patterns:
17+
- "org.apache.maven.plugins:*"
18+
- "org.owasp:dependency-check-maven"
19+
- "org.sonatype.plugins:nexus-staging-maven-plugin"
20+
- "org.codehaus.mojo:exec-maven-plugin"
21+
java-production-dependencies:
22+
patterns:
23+
- "*"
24+
exclude-patterns:
25+
- "org.junit.jupiter:*"
26+
- "org.mockito:*"
27+
- "org.apache.maven.plugins:*"
28+
- "org.owasp:dependency-check-maven"
29+
- "org.sonatype.plugins:nexus-staging-maven-plugin"
30+
- "org.codehaus.mojo:exec-maven-plugin"
31+
- package-ecosystem: "github-actions"
32+
directory: "/" # even for `.github/workflows`
33+
schedule:
34+
interval: "monthly"
35+
groups:
36+
github-actions:
37+
patterns:
38+
- "*"

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: macos-latest
88
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: actions/setup-java@v3
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'temurin'
1414
java-version: 17
@@ -17,11 +17,11 @@ jobs:
1717
if: startsWith(github.ref, 'refs/tags/')
1818
shell: bash
1919
run: |
20-
mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
20+
mvn -B versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
2121
- name: Build and Test
2222
id: buildAndTest
23-
run: mvn -B clean install -Pdependency-check
24-
- uses: actions/upload-artifact@v3
23+
run: mvn -B clean install
24+
- uses: actions/upload-artifact@v4
2525
with:
2626
name: artifacts
2727
path: target/*.jar

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,22 @@ jobs:
1313
analyse:
1414
name: Analyse
1515
runs-on: macos-latest
16-
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
16+
# dependeabot has on push events only read-only access, but codeql requires write access
17+
if: ${{ !(github.actor == 'dependabot[bot]' && contains(fromJSON('["push"]'), github.event_name)) }}
1718
steps:
18-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
1920
with:
2021
fetch-depth: 2
21-
- uses: actions/setup-java@v3
22+
- uses: actions/setup-java@v4
2223
with:
2324
distribution: 'temurin'
2425
java-version: 17
2526
cache: 'maven'
2627
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v2
28+
uses: github/codeql-action/init@v3
2829
with:
2930
languages: java
3031
- name: Build
3132
run: mvn -B compile
3233
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@v2
34+
uses: github/codeql-action/analyze@v3

‎.github/workflows/dependency-check.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: OWASP Maven Dependency Check
2+
on:
3+
schedule:
4+
- cron: '0 14 * * 0'
5+
push:
6+
branches:
7+
- 'release/**'
8+
workflow_dispatch:
9+
10+
11+
jobs:
12+
check-dependencies:
13+
name: Check dependencies
14+
runs-on: macos-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
with:
18+
show-progress: false
19+
- name: Setup Java
20+
uses: actions/setup-java@v4
21+
with:
22+
distribution: 'temurin'
23+
java-version: 17
24+
cache: 'maven'
25+
- name: Cache NVD DB
26+
uses: actions/cache@v4
27+
with:
28+
path: ~/.m2/repository/org/owasp/dependency-check-data/
29+
key: dependency-check-${{ github.run_id }}
30+
restore-keys: |
31+
dependency-check
32+
env:
33+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
34+
- name: Run org.owasp:dependency-check plugin
35+
id: dependency-check
36+
continue-on-error: true
37+
run: mvn -B validate -Pdependency-check
38+
env:
39+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
40+
- name: Upload report on failure
41+
if: steps.dependency-check.outcome == 'failure'
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: dependency-check-report
45+
path: target/dependency-check-report.html
46+
if-no-files-found: error
47+
- name: Slack Notification on regular check
48+
if: github.event_name == 'schedule' && steps.dependency-check.outcome == 'failure'
49+
uses: rtCamp/action-slack-notify@v2
50+
env:
51+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
52+
SLACK_USERNAME: 'Cryptobot'
53+
SLACK_ICON: false
54+
SLACK_ICON_EMOJI: ':bot:'
55+
SLACK_CHANNEL: 'cryptomator-desktop'
56+
SLACK_TITLE: "Vulnerabilities in ${{ github.event.repository.name }} detected."
57+
SLACK_MESSAGE: "Download the <https://github.com/${{ github.repository }}/actions/run/${{ github.run_id }}|report> for more details."
58+
SLACK_FOOTER: false
59+
MSG_MINIMAL: true
60+
- name: Failing workflow on release branch
61+
if: github.event_name == 'push' && steps.dependency-check.outcome == 'failure'
62+
shell: bash
63+
run: exit 1

‎.github/workflows/publish-central.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
publish:
1111
runs-on: macos-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
ref: "refs/tags/${{ github.event.inputs.tag }}"
16-
- uses: actions/setup-java@v3
16+
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
1919
java-version: 17

‎.github/workflows/publish-github.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: macos-latest
88
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: actions/setup-java@v3
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'temurin'
1414
java-version: 17

‎.idea/misc.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 20 additions & 19 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-mac</artifactId>
8-
<version>1.2.2</version>
8+
<version>1.2.3</version>
99

1010
<name>Cryptomator Integrations for macOS</name>
1111
<description>Provides optional macOS services used by Cryptomator</description>
@@ -30,16 +30,16 @@
3030
<project.jdk.version>17</project.jdk.version>
3131

3232
<!-- runtime dependencies -->
33-
<api.version>1.2.0</api.version>
34-
<slf4j.version>1.7.36</slf4j.version>
33+
<api.version>1.3.0</api.version>
34+
<slf4j.version>2.0.11</slf4j.version>
3535

3636
<!-- test dependencies -->
37-
<junit.jupiter.version>5.8.2</junit.jupiter.version>
38-
<mockito.version>4.4.0</mockito.version>
37+
<junit.jupiter.version>5.10.1</junit.jupiter.version>
38+
<mockito.version>5.10.0</mockito.version>
3939

4040
<!-- build plugin dependencies -->
41-
<dependency-check.version>8.1.0</dependency-check.version>
42-
<nexus-staging.version>1.6.8</nexus-staging.version>
41+
<dependency-check.version>9.0.9</dependency-check.version>
42+
<nexus-staging.version>1.6.13</nexus-staging.version>
4343
</properties>
4444

4545
<licenses>
@@ -88,7 +88,7 @@
8888
<plugin>
8989
<groupId>org.apache.maven.plugins</groupId>
9090
<artifactId>maven-clean-plugin</artifactId>
91-
<version>3.1.0</version>
91+
<version>3.3.2</version>
9292
<configuration>
9393
<filesets>
9494
<fileset>
@@ -104,7 +104,7 @@
104104
<plugin>
105105
<groupId>org.apache.maven.plugins</groupId>
106106
<artifactId>maven-compiler-plugin</artifactId>
107-
<version>3.10.1</version>
107+
<version>3.12.1</version>
108108
<configuration>
109109
<compilerArgs>
110110
<arg>-h</arg>
@@ -116,7 +116,7 @@
116116
<plugin>
117117
<groupId>org.apache.maven.plugins</groupId>
118118
<artifactId>maven-enforcer-plugin</artifactId>
119-
<version>3.0.0</version>
119+
<version>3.4.1</version>
120120
<executions>
121121
<execution>
122122
<id>check-preconditions</id>
@@ -145,7 +145,7 @@
145145
<plugin>
146146
<groupId>org.codehaus.mojo</groupId>
147147
<artifactId>exec-maven-plugin</artifactId>
148-
<version>3.0.0</version>
148+
<version>3.1.1</version>
149149
<executions>
150150
<execution>
151151
<goals>
@@ -175,7 +175,7 @@
175175
</plugin>
176176
<plugin>
177177
<artifactId>maven-resources-plugin</artifactId>
178-
<version>3.2.0</version>
178+
<version>3.3.1</version>
179179
<executions>
180180
<execution>
181181
<goals>
@@ -199,11 +199,11 @@
199199
<plugin>
200200
<groupId>org.apache.maven.plugins</groupId>
201201
<artifactId>maven-surefire-plugin</artifactId>
202-
<version>3.0.0-M5</version>
202+
<version>3.2.5</version>
203203
</plugin>
204204
<plugin>
205205
<artifactId>maven-source-plugin</artifactId>
206-
<version>3.2.1</version>
206+
<version>3.3.0</version>
207207
<executions>
208208
<execution>
209209
<id>attach-sources</id>
@@ -215,7 +215,7 @@
215215
</plugin>
216216
<plugin>
217217
<artifactId>maven-javadoc-plugin</artifactId>
218-
<version>3.3.2</version>
218+
<version>3.6.3</version>
219219
<executions>
220220
<execution>
221221
<id>attach-javadocs</id>
@@ -281,18 +281,19 @@
281281
<artifactId>dependency-check-maven</artifactId>
282282
<version>${dependency-check.version}</version>
283283
<configuration>
284-
<cveValidForHours>24</cveValidForHours>
284+
<nvdValidForHours>24</nvdValidForHours>
285285
<failBuildOnCVSS>0</failBuildOnCVSS>
286286
<skipTestScope>true</skipTestScope>
287-
<cveStartYear>2019</cveStartYear>
288287
<detail>true</detail>
289288
<suppressionFile>suppression.xml</suppressionFile>
289+
<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
290290
</configuration>
291291
<executions>
292292
<execution>
293293
<goals>
294294
<goal>check</goal>
295295
</goals>
296+
<phase>validate</phase>
296297
</execution>
297298
</executions>
298299
</plugin>
@@ -306,7 +307,7 @@
306307
<plugins>
307308
<plugin>
308309
<artifactId>maven-gpg-plugin</artifactId>
309-
<version>3.0.1</version>
310+
<version>3.1.0</version>
310311
<executions>
311312
<execution>
312313
<id>sign-artifacts</id>
@@ -367,7 +368,7 @@
367368
<plugin>
368369
<groupId>org.apache.maven.plugins</groupId>
369370
<artifactId>maven-deploy-plugin</artifactId>
370-
<version>3.1.0</version>
371+
<version>3.1.1</version>
371372
</plugin>
372373
</plugins>
373374
</build>

‎src/main/resources/MacIntegrationsBundle_ba.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.cryptomator.macos.keychain.displayName=macOS асҡыс сынйыры (Keychain)

0 commit comments

Comments
 (0)