Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-22 19:49:46 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "removed license dir, renamed merge file and adjusted paths"

Browse Source 
This reverts commit d053367f83.
This commit is contained in:
Armin Schrenk 2022-04-22 11:51:22 +02:00
parent d053367f83
commit 2f17d80fe6
No known key found for this signature in database
GPG Key ID: 8F2992163CBBA7FC
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mac-dmg.yml vendored
View File

@ -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

4
.github/workflows/win-exe.yml vendored
View File

@ -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 }}

2
dist/mac/dmg/build.sh vendored
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:///../../../third-party.merges
-Dlicense.licenseMergesUrl=file:///../../../license/merges
# codesign
if [ -n "${CODESIGN_IDENTITY}" ]; then

4
dist/win/build.ps1 vendored
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/../../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

0
third-party.merges → license/merges
View File

2
pom.xml
View File

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