From 264e1590c20d63c19be09129f18c4464e2689550 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 15 Sep 2026 18:44:48 +0200
Subject: [PATCH] fix license generation plugin

---
 .github/workflows/mac-dmg-x64.yml | 1 -
 .github/workflows/mac-dmg.yml     | 1 -
 .github/workflows/win-exe.yml     | 2 --
 dist/mac/dmg/build.sh             | 3 +--
 dist/win/build.ps1                | 6 ++----
 license/merges                    | 4 ++--
 pom.xml                           | 4 +++-
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml
index 96455be3d..501a0cece 100644
--- a/.github/workflows/mac-dmg-x64.yml
+++ b/.github/workflows/mac-dmg-x64.yml
@@ -192,7 +192,6 @@ jobs:
           -Dlicense.includedScopes=compile
           -Dlicense.excludedGroups=^org\.cryptomator
           -Dlicense.failOnMissing=true
-          -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
       - name: Install codesign certificate
         run: |
           # create variables
diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index 2e2feafc8..fce667ae8 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -191,7 +191,6 @@ jobs:
           -Dlicense.includedScopes=compile
           -Dlicense.excludedGroups=^org\.cryptomator
           -Dlicense.failOnMissing=true
-          -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
       - name: Install codesign certificate
         run: |
           # create variables
diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 4a08409df..9dcbe12cd 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -269,7 +269,6 @@ jobs:
           "-Dlicense.includedScopes=compile"
           "-Dlicense.excludedGroups=^org\.cryptomator"
           "-Dlicense.failOnMissing=true"
-          "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
         shell: pwsh
       - name: Create file association file from template
         working-directory: dist/win
@@ -384,7 +383,6 @@ jobs:
           "-Dlicense.includedScopes=compile"
           "-Dlicense.excludedGroups=^org\.cryptomator"
           "-Dlicense.failOnMissing=true"
-          "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
         shell: pwsh
       - name: Download WinFsp
         run: |
diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh
index b90d2b033..81587bb50 100755
--- a/dist/mac/dmg/build.sh
+++ b/dist/mac/dmg/build.sh
@@ -143,8 +143,7 @@ cp ../embedded.provisionprofile ${APP_NAME}.app/Contents/
     -Dlicense.fileTemplate=resources/licenseTemplate.ftl \
     -Dlicense.includedScopes=compile \
     -Dlicense.excludedGroups=^org\.cryptomator \
-    -Dlicense.failOnMissing=true \
-    -Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges
+    -Dlicense.failOnMissing=true
 
 # codesign
 if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index aa37e806b..17a450f3e 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -213,8 +213,7 @@ Invoke-CommandWithExitCheck -Command `
     "-Dlicense.outputDirectory=$buildDir\resources\", `
     "-Dlicense.includedScopes=compile", `
     "-Dlicense.excludedGroups=^org\.cryptomator", `
-    "-Dlicense.failOnMissing=true", `
-    "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
+    "-Dlicense.failOnMissing=true")
 
 # patch app dir
 Copy-Item "contrib\*" -Destination "$AppName"
@@ -260,8 +259,7 @@ Invoke-CommandWithExitCheck -Command `
 	"-Dlicense.outputDirectory=$buildDir\bundle\resources\", `
 	"-Dlicense.includedScopes=compile", `
 	"-Dlicense.excludedGroups=^org\.cryptomator", `
-	"-Dlicense.failOnMissing=true", `
-	"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
+	"-Dlicense.failOnMissing=true")
 
 # download Winfsp
 $winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
diff --git a/license/merges b/license/merges
index a47203dfa..5bdec4c50 100644
--- a/license/merges
+++ b/license/merges
@@ -1,7 +1,7 @@
 Apache License v2.0|Apache License, Version 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0|Apache-2.0
 MIT License|MIT|The MIT License (MIT)|The MIT License|MIT license
-LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1|GNU Lesser General Public License
+LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1|GNU Lesser General Public License|LGPL-2.1-only
 GPLv2|GNU General Public License Version 2
 GPLv2+CE|CDDL + GPLv2 with classpath exception
 Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0
-Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0
\ No newline at end of file
+Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0|EPL-2.0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 71bde59ea..1fdfeefc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,6 +426,9 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
+				<configuration>
+					<licenseMergesUrl>${project.baseUri}license/merges</licenseMergesUrl>
+				</configuration>
 				<executions>
 					<execution>
 						<id>add-third-party</id>
@@ -437,7 +440,6 @@
 							<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
 							<includedScopes>compile</includedScopes>
 							<excludedGroups>org\.cryptomator</excludedGroups>
-							<licenseMergesUrl>file:///${project.basedir}/license/merges</licenseMergesUrl>
 							<fileTemplate>${project.basedir}/src/main/resources/license/template.ftl</fileTemplate>
 						</configuration>
 					</execution>