From bff0194f3edb35f52a9243065c7642db4abd687d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 20 Apr 2022 12:12:00 +0200
Subject: [PATCH] Fixed wrong file format and url of lcense merge file

---
 .github/workflows/mac-dmg.yml | 2 +-
 .github/workflows/win-exe.yml | 4 ++--
 dist/mac/dmg/build.sh         | 2 +-
 dist/win/build.ps1            | 4 ++--
 license/merges                | 7 +++++++
 license/merges.xml            | 7 -------
 pom.xml                       | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 license/merges
 delete mode 100644 license/merges.xml

diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index edb87474c..fa15e689e 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -111,7 +111,7 @@ jobs:
           -Dlicense.includeScopes=compile
           -Dlicense.excludedGroups=^org\.cryptomator
           -Dlicense.failOnMissing=true
-          -Dlicense.licenseMergesUrl=license/merges.xml
+          -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 cf1c56c2b..c30d730c6 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -124,7 +124,7 @@ jobs:
           -Dlicense.includeScopes=compile
           -Dlicense.excludedGroups=^org\.cryptomator
           -Dlicense.failOnMissing=true
-          -Dlicense.licenseMergesUrl=license/merges.xml
+          -Dlicense.licenseMergesUrl=file:///license/merges
       - name: Create MSI
         run: >
           ${JAVA_HOME}/bin/jpackage
@@ -214,7 +214,7 @@ jobs:
           -Dlicense.includeScopes=compile
           -Dlicense.excludedGroups=^org\.cryptomator
           -Dlicense.failOnMissing=true
-          -Dlicense.licenseMergesUrl=license/merges.xml
+          -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 94887658c..e85f4c944 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.includeScopes=compile \
     -Dlicense.excludedGroups=^org\.cryptomator \
     -Dlicense.failOnMissing=true \
-    -Dlicense.licenseMergesUrl=../../../license/merges.xml
+    -Dlicense.licenseMergesUrl=file:///../../../license/merges
 
 # codesign
 if [ -n "${CODESIGN_IDENTITY}" ]; then
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index 78e888435..5dfc371ed 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -88,7 +88,7 @@ if ($clean -and (Test-Path -Path $appPath)) {
  "-Dlicense.includeScopes=compile" `
  "-Dlicense.excludedGroups=^org\.cryptomator" `
  "-Dlicense.failOnMissing=true" `
- "-Dlicense.licenseMergesUrl=$buildDir\..\..\license\merges.xml"
+ "-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.includeScopes=compile" `
  "-Dlicense.excludedGroups=^org\.cryptomator" `
  "-Dlicense.failOnMissing=true" `
- "-Dlicense.licenseMergesUrl=$buildDir\..\..\license\merges.xml"
+ "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
 
 # download Winfsp
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
diff --git a/license/merges b/license/merges
new file mode 100644
index 000000000..eb3a32a5b
--- /dev/null
+++ b/license/merges
@@ -0,0 +1,7 @@
+Apache License v2.0|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|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
+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
diff --git a/license/merges.xml b/license/merges.xml
deleted file mode 100644
index 086eba3b8..000000000
--- a/license/merges.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<licenseMerges>
-	<licenseMerge>Apache License v2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0</licenseMerge>
-	<licenseMerge>MIT License|The MIT License (MIT)|The MIT License|MIT license</licenseMerge>
-	<licenseMerge>LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1</licenseMerge>
-	<licenseMerge>GPLv2|GNU General Public License Version 2</licenseMerge>
-	<licenseMerge>GPLv2+CE|CDDL + GPLv2 with classpath exception</licenseMerge>
-</licenseMerges>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 04588ea1d..96b5e2cc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,7 +359,7 @@
 							<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
 							<includedScopes>compile</includedScopes>
 							<excludedGroups>org\.cryptomator</excludedGroups>
-							<licenseMergesUrl>${project.basedir}/license/merges.xml</licenseMergesUrl>
+							<licenseMergesUrl>file:///${project.basedir}/license/merges</licenseMergesUrl>
 							<fileTemplate>${project.basedir}/license/template.ftl</fileTemplate>
 						</configuration>
 					</execution>