removed license dir, renamed merge file and adjusted paths

cryptomator · Apr 22, 2022 · d053367 · d053367
1 parent 9f5c31e
commit d053367
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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:///license/merges
+          -Dlicense.licenseMergesUrl=file:///third-party.merges
       - name: Install codesign certificate
         run: |
           # create variables

diff --git 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:///license/merges
+          -Dlicense.licenseMergesUrl=file:///third-party.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:///license/merges
+          -Dlicense.licenseMergesUrl=file:///third-party.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
@@ -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:///../../../license/merges
+    -Dlicense.licenseMergesUrl=file:///../../../third-party.merges
 
 # codesign
 if [ -n "${CODESIGN_IDENTITY}" ]; then

diff --git 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/../../license/merges"
+ "-Dlicense.licenseMergesUrl=file:///$buildDir/../../third-party.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/../../license/merges"
+ "-Dlicense.licenseMergesUrl=file:///$buildDir/../../third-party.merges"
 
 # download Winfsp
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

diff --git a/pom.xml b/pom.xml
@@ -358,7 +358,7 @@
 							<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
 							<includedScopes>compile</includedScopes>
 							<excludedGroups>org\.cryptomator</excludedGroups>
-							<licenseMergesUrl>file:///${project.basedir}/license/merges</licenseMergesUrl>
+							<licenseMergesUrl>file:///${project.basedir}/third-party.merges</licenseMergesUrl>
 							<fileTemplate>${project.basedir}/src/main/resources/license/template.ftl</fileTemplate>
 						</configuration>
 					</execution>

diff --git a/license/merges → third-party.merges b/license/merges → third-party.merges