removed license dir, renamed merge file and adjusted paths

This commit is contained in:
Armin Schrenk
2022-04-22 09:49:04 +02:00
parent 9f5c31e4e7
commit d053367f83
6 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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