diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index 9c38c913c..1307c543a 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -111,7 +111,7 @@ jobs:
-Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true
- -Dlicense.licenseMergesUrl=file:///third-party.merges
+ -Dlicense.licenseMergesUrl=file:///license/merges
- name: Install codesign certificate
run: |
# create variables
diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 76804efc9..8edb3fd2f 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -124,7 +124,7 @@ jobs:
-Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true
- -Dlicense.licenseMergesUrl=file:///third-party.merges
+ -Dlicense.licenseMergesUrl=file:///license/merges
- name: Create MSI
run: >
${JAVA_HOME}/bin/jpackage
@@ -214,7 +214,7 @@ jobs:
-Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true
- -Dlicense.licenseMergesUrl=file:///third-party.merges
+ -Dlicense.licenseMergesUrl=file:///license/merges
- name: Download WinFsp
run:
curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }}
diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh
index 3944cd8df..a779f79b5 100755
--- a/dist/mac/dmg/build.sh
+++ b/dist/mac/dmg/build.sh
@@ -83,7 +83,7 @@ mvn -B -f../../../pom.xml license:add-third-party \
-Dlicense.includedScopes=compile \
-Dlicense.excludedGroups=^org\.cryptomator \
-Dlicense.failOnMissing=true \
- -Dlicense.licenseMergesUrl=file:///../../../third-party.merges
+ -Dlicense.licenseMergesUrl=file:///../../../license/merges
# codesign
if [ -n "${CODESIGN_IDENTITY}" ]; then
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index 7e4d67119..453cdb652 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -88,7 +88,7 @@ if ($clean -and (Test-Path -Path $appPath)) {
"-Dlicense.includedScopes=compile" `
"-Dlicense.excludedGroups=^org\.cryptomator" `
"-Dlicense.failOnMissing=true" `
- "-Dlicense.licenseMergesUrl=file:///$buildDir/../../third-party.merges"
+ "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
# patch app dir
Copy-Item "contrib\*" -Destination "Cryptomator"
@@ -128,7 +128,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
"-Dlicense.includedScopes=compile" `
"-Dlicense.excludedGroups=^org\.cryptomator" `
"-Dlicense.failOnMissing=true" `
- "-Dlicense.licenseMergesUrl=file:///$buildDir/../../third-party.merges"
+ "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
# download Winfsp
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
diff --git a/third-party.merges b/license/merges
similarity index 100%
rename from third-party.merges
rename to license/merges
diff --git a/pom.xml b/pom.xml
index d2a4a67be..ba29cdeff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,7 +358,7 @@
THIRD-PARTY.txt
compile
org\.cryptomator
- file:///${project.basedir}/third-party.merges
+ file:///${project.basedir}/license/merges
${project.basedir}/src/main/resources/license/template.ftl