diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 8a24c1d7f..9c945bf30 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -105,9 +105,13 @@ jobs: - name: Generate license run: > mvn -B license:add-third-party - "-Dlicense.thirdPartyFilename=license.rtf" - "-Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl" - "-Dlicense.outputDirectory=dist/mac/dmg/resources" + -Dlicense.thirdPartyFilename=license.rtf + -Dlicense.outputDirectory=dist/mac/dmg/resources + -Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl + -Dlicense.includeScopes=compile + -Dlicense.excludedGroups=^org\.cryptomator + -Dlicense.failOnMissing=true + -Dlicense.licenseMergesUrl=dist/mac/dmg/resources/licenseMerges.xml - name: Install codesign certificate run: | # create variables diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 5b1ba1aaf..b8b183c96 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -118,9 +118,13 @@ jobs: - name: Generate license run: > mvn -B license:add-third-party - "-Dlicense.thirdPartyFilename=license.rtf" - "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl" - "-Dlicense.outputDirectory=dist/win/resources" + -Dlicense.thirdPartyFilename=license.rtf + -Dlicense.outputDirectory=dist/win/resources + -Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl + -Dlicense.includeScopes=compile + -Dlicense.excludedGroups=^org\.cryptomator + -Dlicense.failOnMissing=true + -Dlicense.licenseMergesUrl=dist/win/resources/license/licenseMerges.xml - name: Create MSI run: > ${JAVA_HOME}/bin/jpackage @@ -204,9 +208,13 @@ jobs: - name: Generate license run: > mvn -B license:add-third-party - "-Dlicense.thirdPartyFilename=license.rtf" - "-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl" - "-Dlicense.outputDirectory=dist/win/bundle/resources" + -Dlicense.thirdPartyFilename=license.rtf + -Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl + -Dlicense.outputDirectory=dist/win/bundle/resources + -Dlicense.includeScopes=compile + -Dlicense.excludedGroups=^org\.cryptomator + -Dlicense.failOnMissing=true + -Dlicense.licenseMergesUrl=dist/win/resources/license/licenseMerges.xml - 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 56a3258d7..249427897 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -77,9 +77,13 @@ sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Inf # generate license mvn -B -f../../../pom.xml license:add-third-party \ - "-Dlicense.thirdPartyFilename=license.rtf" \ - "-Dlicense.fileTemplate=resources/licenseTemplate.ftl" \ - "-Dlicense.outputDirectory=dist/mac/dmg/resources" + -Dlicense.thirdPartyFilename=license.rtf \ + -Dlicense.outputDirectory=resources + -Dlicense.fileTemplate=resources/licenseTemplate.ftl \ + -Dlicense.includeScopes=compile \ + -Dlicense.excludedGroups=^org\.cryptomator \ + -Dlicense.failOnMissing=true \ + -Dlicense.licenseMergesUrl=resources/licenseMerges.xml # codesign if [ -n "${CODESIGN_IDENTITY}" ]; then diff --git a/dist/mac/dmg/resources/licenseMerges.xml b/dist/mac/dmg/resources/licenseMerges.xml new file mode 100644 index 000000000..086eba3b8 --- /dev/null +++ b/dist/mac/dmg/resources/licenseMerges.xml @@ -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 + 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 + \ No newline at end of file diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index e3ba36efd..a81781ed0 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -84,7 +84,11 @@ if ($clean -and (Test-Path -Path $appPath)) { &mvn -B -f $buildDir/../../pom.xml license:add-third-party ` "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" ` - "-Dlicense.outputDirectory=$buildDir\resources\" + "-Dlicense.outputDirectory=$buildDir\resources\" ` + "-Dlicense.includeScopes=compile" ` + "-Dlicense.excludedGroups=^org\.cryptomator" ` + "-Dlicense.failOnMissing=true" ` + "-Dlicense.licenseMergesUrl=$buildDir\resources\licenseMerges.xml" # patch app dir Copy-Item "contrib\*" -Destination "Cryptomator" @@ -120,7 +124,11 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" &mvn -B -f $buildDir/../../pom.xml license:add-third-party ` "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" ` - "-Dlicense.outputDirectory=$buildDir\bundle\resources\" + "-Dlicense.outputDirectory=$buildDir\bundle\resources\" ` + "-Dlicense.includeScopes=compile" ` + "-Dlicense.excludedGroups=^org\.cryptomator" ` + "-Dlicense.failOnMissing=true" ` + "-Dlicense.licenseMergesUrl=$buildDir\resources\licenseMerges.xml" # download Winfsp [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 diff --git a/dist/win/resources/licenseMerges.xml b/dist/win/resources/licenseMerges.xml new file mode 100644 index 000000000..086eba3b8 --- /dev/null +++ b/dist/win/resources/licenseMerges.xml @@ -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 + 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 + \ No newline at end of file