diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 9c945bf30..edb87474c 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -102,7 +102,7 @@ jobs: env: VERSION_NO: ${{ steps.versions.outputs.semVerNum }} REVISION_NO: ${{ steps.versions.outputs.revNum }} - - name: Generate license + - name: Generate license for dmg run: > mvn -B license:add-third-party -Dlicense.thirdPartyFilename=license.rtf @@ -111,7 +111,7 @@ jobs: -Dlicense.includeScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=dist/mac/dmg/resources/licenseMerges.xml + -Dlicense.licenseMergesUrl=license/merges.xml - name: Install codesign certificate run: | # create variables diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index b8b183c96..cf1c56c2b 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -115,7 +115,7 @@ jobs: timestampUrl: 'http://timestamp.digicert.com' folder: appdir/Cryptomator recursive: true - - name: Generate license + - name: Generate license for MSI run: > mvn -B license:add-third-party -Dlicense.thirdPartyFilename=license.rtf @@ -124,7 +124,7 @@ jobs: -Dlicense.includeScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=dist/win/resources/license/licenseMerges.xml + -Dlicense.licenseMergesUrl=license/merges.xml - name: Create MSI run: > ${JAVA_HOME}/bin/jpackage @@ -205,7 +205,7 @@ jobs: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - - name: Generate license + - name: Generate license for exe run: > mvn -B license:add-third-party -Dlicense.thirdPartyFilename=license.rtf @@ -214,7 +214,7 @@ jobs: -Dlicense.includeScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=dist/win/resources/license/licenseMerges.xml + -Dlicense.licenseMergesUrl=license/merges.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 249427897..94887658c 100755 --- 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.includeScopes=compile \ -Dlicense.excludedGroups=^org\.cryptomator \ -Dlicense.failOnMissing=true \ - -Dlicense.licenseMergesUrl=resources/licenseMerges.xml + -Dlicense.licenseMergesUrl=../../../license/merges.xml # codesign if [ -n "${CODESIGN_IDENTITY}" ]; then diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index a81781ed0..78e888435 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -88,7 +88,7 @@ if ($clean -and (Test-Path -Path $appPath)) { "-Dlicense.includeScopes=compile" ` "-Dlicense.excludedGroups=^org\.cryptomator" ` "-Dlicense.failOnMissing=true" ` - "-Dlicense.licenseMergesUrl=$buildDir\resources\licenseMerges.xml" + "-Dlicense.licenseMergesUrl=$buildDir\..\..\license\merges.xml" # 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\resources\licenseMerges.xml" + "-Dlicense.licenseMergesUrl=$buildDir\..\..\license\merges.xml" # download Winfsp [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 diff --git a/dist/win/resources/licenseMerges.xml b/dist/win/resources/licenseMerges.xml deleted file mode 100644 index 086eba3b8..000000000 --- a/dist/win/resources/licenseMerges.xml +++ /dev/null @@ -1,7 +0,0 @@ - - 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/src/license/THIRD-PARTY.properties b/license/THIRD-PARTY.properties similarity index 100% rename from src/license/THIRD-PARTY.properties rename to license/THIRD-PARTY.properties diff --git a/dist/mac/dmg/resources/licenseMerges.xml b/license/merges.xml similarity index 100% rename from dist/mac/dmg/resources/licenseMerges.xml rename to license/merges.xml diff --git a/src/license/template.ftl b/license/template.ftl similarity index 100% rename from src/license/template.ftl rename to license/template.ftl diff --git a/pom.xml b/pom.xml index 6518a2d53..04588ea1d 100644 --- a/pom.xml +++ b/pom.xml @@ -359,14 +359,8 @@ THIRD-PARTY.txt compile org\.cryptomator - - 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 - - ${project.basedir}/src/license/template.ftl + ${project.basedir}/license/merges.xml + ${project.basedir}/license/template.ftl