Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2025-02-17 00:29:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed wrong file format and url of lcense merge file

Browse Source
This commit is contained in:
Armin Schrenk 2022-04-20 12:12:00 +02:00
parent 75f96eb08f
commit bff0194f3e
No known key found for this signature in database
GPG Key ID: 8F2992163CBBA7FC
7 changed files with 14 additions and 14 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.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

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

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

2
dist/mac/dmg/build.sh vendored
View File

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

4
dist/win/build.ps1 vendored
View File

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

7
license/merges Normal file
View File

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

7
license/merges.xml
View File

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

2
pom.xml
View File

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