From 597bbdbdb8b8f0941ba9e2e10e2773a99671000f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 13 Apr 2022 17:53:44 +0200 Subject: [PATCH 01/18] for mac build generate license on the fly References 7172462b4b4c975c606311a99b0f3aa4ee40c999 --- .github/workflows/mac-dmg.yml | 6 ++ dist/mac/dmg/build.sh | 6 ++ dist/mac/dmg/resources/license.rtf | 100 --------------------- dist/mac/dmg/resources/licenseTemplate.ftl | 37 ++++++++ 4 files changed, 49 insertions(+), 100 deletions(-) delete mode 100644 dist/mac/dmg/resources/license.rtf create mode 100644 dist/mac/dmg/resources/licenseTemplate.ftl diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 3e1e6ceac..8a24c1d7f 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -102,6 +102,12 @@ jobs: env: VERSION_NO: ${{ steps.versions.outputs.semVerNum }} REVISION_NO: ${{ steps.versions.outputs.revNum }} + - 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" - name: Install codesign certificate run: | # create variables diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index c90411acb..9524295bb 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -75,6 +75,12 @@ cp ../resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/ sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist +# generate license +mvn -B -f../../../pom.xml license:add-third-party \ + "-Dlicense.thirdPartyFilename=license.rtf" \ + "-Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl" \ + "-Dlicense.outputDirectory=dist/mac/dmg/resources" + # codesign if [ -n "${CODESIGN_IDENTITY}" ]; then find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \; diff --git a/dist/mac/dmg/resources/license.rtf b/dist/mac/dmg/resources/license.rtf deleted file mode 100644 index 72730adb8..000000000 --- a/dist/mac/dmg/resources/license.rtf +++ /dev/null @@ -1,100 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2512 -\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -\paperw11900\paperh16840\vieww12000\viewh15840\viewkind0 -\deftab720 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0 - -\f0\b\fs24 \cf0 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator. -\f1\b0 \ -\ - -\f0\b \'a9 2016 \'96 2022 Skymatic GmbH -\f1\b0 \ -\ -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ -\ -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ -\ -You should have received a copy of the GNU General Public License along with this program. If not, see {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\ -\ - -\f0\b Cryptomator uses 49 third-party dependencies under the following licenses: -\f1\b0 \ - Apache License v2.0:\ - - jffi (com.github.jnr:jffi:1.2.23 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jffi"}}{\fldrslt http://github.com/jnr/jffi}})\ - - jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm}})\ - - jnr-constants (com.github.jnr:jnr-constants:0.9.15 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jnr-constants"}}{\fldrslt http://github.com/jnr/jnr-constants}})\ - - jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jnr-ffi"}}{\fldrslt http://github.com/jnr/jnr-ffi}})\ - - FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - {\field{\*\fldinst{HYPERLINK "http://findbugs.sourceforge.net/"}}{\fldrslt http://findbugs.sourceforge.net/}})\ - - Gson (com.google.code.gson:gson:2.8.6 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/gson/gson"}}{\fldrslt https://github.com/google/gson/gson}})\ - - Dagger (com.google.dagger:dagger:2.29.1 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/dagger"}}{\fldrslt https://github.com/google/dagger}})\ - - error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotation"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotation}} )\ - - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/guava/failureaccess"}}{\fldrslt https://github.com/google/guava/failureaccess}})\ - - Guava: Google Core Libraries for Java (com.google.guava:guava:30.0-jre - {\field{\*\fldinst{HYPERLINK "https://github.com/google/guava/guava"}}{\fldrslt https://github.com/google/guava/guava}})\ - - Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - {\field{\*\fldinst{HYPERLINK "https://github.com/google/guava/listenablefuture"}}{\fldrslt https://github.com/google/guava/listenablefuture}})\ - - J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - {\field{\*\fldinst{HYPERLINK "https://github.com/google/j2objc/"}}{\fldrslt https://github.com/google/j2objc/}})\ - - Apache Commons CLI (commons-cli:commons-cli:1.4 - {\field{\*\fldinst{HYPERLINK "http://commons.apache.org/proper/commons-cli/"}}{\fldrslt http://commons.apache.org/proper/commons-cli/}})\ - - javax.inject (javax.inject:javax.inject:1 - {\field{\*\fldinst{HYPERLINK "http://code.google.com/p/atinject/"}}{\fldrslt http://code.google.com/p/atinject/}})\ - - Java Native Access (net.java.dev.jna:jna:5.6.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt https://github.com/java-native-access/jna}})\ - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt https://github.com/java-native-access/jna}})\ - - Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - {\field{\*\fldinst{HYPERLINK "https://commons.apache.org/proper/commons-lang/"}}{\fldrslt https://commons.apache.org/proper/commons-lang/}})\ - - Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - {\field{\*\fldinst{HYPERLINK "http://hc.apache.org/httpcomponents-core-ga"}}{\fldrslt http://hc.apache.org/httpcomponents-core-ga}})\ - - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - {\field{\*\fldinst{HYPERLINK "http://jackrabbit.apache.org/jackrabbit-webdav/"}}{\fldrslt http://jackrabbit.apache.org/jackrabbit-webdav/}})\ - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-http"}}{\fldrslt https://eclipse.org/jetty/jetty-http}})\ - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-io"}}{\fldrslt https://eclipse.org/jetty/jetty-io}})\ - - Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-security"}}{\fldrslt https://eclipse.org/jetty/jetty-security}})\ - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-server"}}{\fldrslt https://eclipse.org/jetty/jetty-server}})\ - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-servlet"}}{\fldrslt https://eclipse.org/jetty/jetty-servlet}})\ - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util"}}{\fldrslt https://eclipse.org/jetty/jetty-util}})\ - - Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util-ajax"}}{\fldrslt https://eclipse.org/jetty/jetty-util-ajax}})\ - - Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-webapp"}}{\fldrslt https://eclipse.org/jetty/jetty-webapp}})\ - - Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-xml"}}{\fldrslt https://eclipse.org/jetty/jetty-xml}})\ - BSD:\ - - asm (org.ow2.asm:asm:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-analysis (org.ow2.asm:asm-analysis:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-commons (org.ow2.asm:asm-commons:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-tree (org.ow2.asm:asm-tree:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - - asm-util (org.ow2.asm:asm-util:7.1 - {\field{\*\fldinst{HYPERLINK "http://asm.ow2.org/"}}{\fldrslt http://asm.ow2.org/}})\ - Eclipse Public License - Version 1.0:\ - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-http"}}{\fldrslt https://eclipse.org/jetty/jetty-http}})\ - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-io"}}{\fldrslt https://eclipse.org/jetty/jetty-io}})\ - - Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-security"}}{\fldrslt https://eclipse.org/jetty/jetty-security}})\ - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-server"}}{\fldrslt https://eclipse.org/jetty/jetty-server}})\ - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-servlet"}}{\fldrslt https://eclipse.org/jetty/jetty-servlet}})\ - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util"}}{\fldrslt https://eclipse.org/jetty/jetty-util}})\ - - Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-util-ajax"}}{\fldrslt https://eclipse.org/jetty/jetty-util-ajax}})\ - - Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-webapp"}}{\fldrslt https://eclipse.org/jetty/jetty-webapp}})\ - - Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.35.v20201120 - {\field{\*\fldinst{HYPERLINK "https://eclipse.org/jetty/jetty-xml"}}{\fldrslt https://eclipse.org/jetty/jetty-xml}})\ - Eclipse Public License - v 2.0:\ - - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix}})\ - GPLv2:\ - - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix}})\ - GPLv2+CE:\ - - Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - {\field{\*\fldinst{HYPERLINK "http://servlet-spec.java.net"}}{\fldrslt http://servlet-spec.java.net}})\ - - javafx-base (org.openjfx:javafx-base:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-base/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-base/}})\ - - javafx-controls (org.openjfx:javafx-controls:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-controls/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-controls/}})\ - - javafx-fxml (org.openjfx:javafx-fxml:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-fxml/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-fxml/}})\ - - javafx-graphics (org.openjfx:javafx-graphics:15 - {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/openjfx/javafx-graphics/"}}{\fldrslt https://openjdk.java.net/projects/openjfx/javafx-graphics/}})\ - LGPL 2.1:\ - - jnr-posix (com.github.jnr:jnr-posix:3.0.54 - {\field{\*\fldinst{HYPERLINK "http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix"}}{\fldrslt http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix}})\ - - Java Native Access (net.java.dev.jna:jna:5.6.0 - https://github.com/java-native-access/jna)\ - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt https://github.com/java-native-access/jna}})\ - MIT License:\ - - java jwt (com.auth0:java-jwt:3.12.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/auth0/java-jwt"}}{\fldrslt https://github.com/auth0/java-jwt}})\ - - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - {\field{\*\fldinst{HYPERLINK "http://github.com/jnr/jnr-x86asm"}}{\fldrslt http://github.com/jnr/jnr-x86asm}})\ - - jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined)\ - - zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/nulab/zxcvbn4j"}}{\fldrslt https://github.com/nulab/zxcvbn4j}})\ - - Checker Qual (org.checkerframework:checker-qual:3.5.0 - {\field{\*\fldinst{HYPERLINK "https://checkerframework.org"}}{\fldrslt https://checkerframework.org}})\ - - SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - {\field{\*\fldinst{HYPERLINK "http://www.slf4j.org"}}{\fldrslt http://www.slf4j.org}})\ - The BSD 2-Clause License:\ - - EasyBind (com.tobiasdiez:easybind:2.1.0 - {\field{\*\fldinst{HYPERLINK "https://github.com/tobiasdiez/EasyBind"}}{\fldrslt https://github.com/tobiasdiez/EasyBind}})\ -\ - -\f0\b Cryptomator uses other third-party assets under the following licenses: -\f1\b0 \ - SIL OFL 1.1 License:\ - - Font Awesome 5.12.0 ({\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt https://fontawesome.com/}})\ -\ -} diff --git a/dist/mac/dmg/resources/licenseTemplate.ftl b/dist/mac/dmg/resources/licenseTemplate.ftl new file mode 100644 index 000000000..d442e6538 --- /dev/null +++ b/dist/mac/dmg/resources/licenseTemplate.ftl @@ -0,0 +1,37 @@ +<#function artifactFormat p> + <#if p.name?index_of('Unnamed') > -1> + <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> + <#else> + <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> + + +{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} +{\colortbl ;\red0\green0\blue255;} +\viewkind4\uc1 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par +\par +\b\'a9 2016 \endash 2022 Skymatic GmbH\b0\par +\par +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par +\par +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par +\par +You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par +\par + +\b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:\b0\par +<#list licenseMap as e> +<#assign license = e.getKey()/> +<#assign projects = e.getValue()/> +<#if projects?size > 0> +\tab ${license}:\par +<#list projects as project> +\tab\tab- ${artifactFormat(project)}\par + + + +\par +\b Cryptomator uses other third-party assets under the following licenses:\b0\par +\tab SIL OFL 1.1 License:\par +\tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par +} \ No newline at end of file From dc3894290b151e47a88e2e0f0e87a554cbd1c1ce Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Thu, 14 Apr 2022 13:52:10 +0200 Subject: [PATCH 02/18] updated license template for macos, fixed manual build script --- dist/mac/dmg/.gitignore | 3 +- dist/mac/dmg/build.sh | 2 +- dist/mac/dmg/resources/licenseTemplate.ftl | 58 +++++++++++++--------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dist/mac/dmg/.gitignore b/dist/mac/dmg/.gitignore index b8ef35283..cdc73d89b 100644 --- a/dist/mac/dmg/.gitignore +++ b/dist/mac/dmg/.gitignore @@ -2,4 +2,5 @@ Cryptomator.app/ runtime/ dmg/ -*.dmg \ No newline at end of file +*.dmg +license.rtf \ No newline at end of file diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 9524295bb..56a3258d7 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -78,7 +78,7 @@ 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=dist/mac/dmg/resources/licenseTemplate.ftl" \ + "-Dlicense.fileTemplate=resources/licenseTemplate.ftl" \ "-Dlicense.outputDirectory=dist/mac/dmg/resources" # codesign diff --git a/dist/mac/dmg/resources/licenseTemplate.ftl b/dist/mac/dmg/resources/licenseTemplate.ftl index d442e6538..af949937e 100644 --- a/dist/mac/dmg/resources/licenseTemplate.ftl +++ b/dist/mac/dmg/resources/licenseTemplate.ftl @@ -1,37 +1,49 @@ <#function artifactFormat p> <#if p.name?index_of('Unnamed') > -1> - <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> + <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + (p.url!"no url defined") + "}})"> <#else> - <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> + <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + (p.url!"no url defined") + "}})"> -{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} -{\colortbl ;\red0\green0\blue255;} -\viewkind4\uc1 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par -\par -\b\'a9 2016 \endash 2022 Skymatic GmbH\b0\par -\par -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par -\par -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par -\par -You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par -\par +{\rtf1\ansi\ansicpg1252\cocoartf2512 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\paperw11900\paperh16840\vieww12000\viewh15840\viewkind0 +\deftab720 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\partightenfactor0 -\b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:\b0\par +\f0\b\fs24 \cf0 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator. +\f1\b0 \ +\ + +\f0\b \'a9 2016 \'96 2022 Skymatic GmbH +\f1\b0 \ +\ +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ +\ +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ +\ +You should have received a copy of the GNU General Public License along with this program. If not, see {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\ +\ + +\f0\b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses: +\f1\b0 \ <#list licenseMap as e> <#assign license = e.getKey()/> <#assign projects = e.getValue()/> <#if projects?size > 0> -\tab ${license}:\par + ${license}:\ <#list projects as project> -\tab\tab- ${artifactFormat(project)}\par + - ${artifactFormat(project)}\ -\par -\b Cryptomator uses other third-party assets under the following licenses:\b0\par -\tab SIL OFL 1.1 License:\par -\tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par -} \ No newline at end of file +\ + +\f0\b Cryptomator uses other third-party assets under the following licenses: +\f1\b0 \ + SIL OFL 1.1 License:\ + - Font Awesome 5.12.0 ({\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt https://fontawesome.com/}})\ +\ +} From 51d715caa16893c44405a45dad12eb7b2cb040be Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 19 Apr 2022 11:44:21 +0200 Subject: [PATCH 03/18] apply same config to license generation --- .github/workflows/mac-dmg.yml | 10 +++++++--- .github/workflows/win-exe.yml | 20 ++++++++++++++------ dist/mac/dmg/build.sh | 10 +++++++--- dist/mac/dmg/resources/licenseMerges.xml | 7 +++++++ dist/win/build.ps1 | 12 ++++++++++-- dist/win/resources/licenseMerges.xml | 7 +++++++ 6 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 dist/mac/dmg/resources/licenseMerges.xml create mode 100644 dist/win/resources/licenseMerges.xml 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 From 4d1d6f449eb96e3a25e48b10310e764bc52a1aed Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 10:31:25 +0200 Subject: [PATCH 04/18] Apply suggestions from code review Co-authored-by: Sebastian Stenzel --- .github/workflows/mac-dmg.yml | 4 ++-- .github/workflows/win-exe.yml | 8 ++++---- dist/mac/dmg/build.sh | 2 +- dist/win/build.ps1 | 4 ++-- dist/win/resources/licenseMerges.xml | 7 ------- {src/license => license}/THIRD-PARTY.properties | 0 .../resources/licenseMerges.xml => license/merges.xml | 0 {src/license => license}/template.ftl | 0 pom.xml | 10 ++-------- 9 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 dist/win/resources/licenseMerges.xml rename {src/license => license}/THIRD-PARTY.properties (100%) rename dist/mac/dmg/resources/licenseMerges.xml => license/merges.xml (100%) rename {src/license => license}/template.ftl (100%) 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 From 75f96eb08ff5c08540df1e5ba423090d9888cc2c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 10:37:13 +0200 Subject: [PATCH 05/18] removing static third-party-licenses file --- src/main/resources/license/THIRD-PARTY.txt | 85 ---------------------- 1 file changed, 85 deletions(-) delete mode 100644 src/main/resources/license/THIRD-PARTY.txt diff --git a/src/main/resources/license/THIRD-PARTY.txt b/src/main/resources/license/THIRD-PARTY.txt deleted file mode 100644 index 5de1f62ad..000000000 --- a/src/main/resources/license/THIRD-PARTY.txt +++ /dev/null @@ -1,85 +0,0 @@ -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see http://www.gnu.org/licenses/. - -Cryptomator uses 40 third-party dependencies under the following licenses: - Apache License v2.0: - - jffi (com.github.jnr:jffi:1.3.5 - http://github.com/jnr/jffi) - - jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm) - - jnr-constants (com.github.jnr:jnr-constants:0.10.2 - http://github.com/jnr/jnr-constants) - - jnr-ffi (com.github.jnr:jnr-ffi:2.2.7 - http://github.com/jnr/jnr-ffi) - - Dagger (com.google.dagger:dagger:2.41 - https://github.com/google/dagger) - - Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) - - Guava: Google Core Libraries for Java (com.google.guava:guava:31.1-jre - https://github.com/google/guava) - - Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/) - - javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/) - - Apache Commons Lang (org.apache.commons:commons-lang3:3.12.0 - https://commons.apache.org/proper/commons-lang/) - - Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.14 - http://hc.apache.org/httpcomponents-core-ga) - - Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.5 - http://jackrabbit.apache.org/jackrabbit-webdav/) - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.8 - https://eclipse.org/jetty/jetty-http) - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.8 - https://eclipse.org/jetty/jetty-io) - - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.8 - https://eclipse.org/jetty/jetty-security) - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.8 - https://eclipse.org/jetty/jetty-server) - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.8 - https://eclipse.org/jetty/jetty-servlet) - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.8 - https://eclipse.org/jetty/jetty-util) - - Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api) - Apache-2.0: - - Gson (com.google.code.gson:gson:2.9.0 - https://github.com/google/gson/gson) - - Java Native Access (net.java.dev.jna:jna:5.9.0 - https://github.com/java-native-access/jna) - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.9.0 - https://github.com/java-native-access/jna) - BSD-3-Clause: - - asm (org.ow2.asm:asm:9.2 - http://asm.ow2.io/) - - asm-analysis (org.ow2.asm:asm-analysis:9.2 - http://asm.ow2.io/) - - asm-commons (org.ow2.asm:asm-commons:9.2 - http://asm.ow2.io/) - - asm-tree (org.ow2.asm:asm-tree:9.2 - http://asm.ow2.io/) - - asm-util (org.ow2.asm:asm-util:9.2 - http://asm.ow2.io/) - Eclipse Public License - Version 1.0: - - Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api) - Eclipse Public License - Version 2.0: - - Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.8 - https://eclipse.org/jetty/jetty-http) - - Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.8 - https://eclipse.org/jetty/jetty-io) - - Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.8 - https://eclipse.org/jetty/jetty-security) - - Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.8 - https://eclipse.org/jetty/jetty-server) - - Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.8 - https://eclipse.org/jetty/jetty-servlet) - - Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.8 - https://eclipse.org/jetty/jetty-util) - Eclipse Public License - v 1.0: - - Logback Classic Module (ch.qos.logback:logback-classic:1.2.11 - http://logback.qos.ch/logback-classic) - - Logback Core Module (ch.qos.logback:logback-core:1.2.11 - http://logback.qos.ch/logback-core) - Eclipse Public License - v 2.0: - - jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - GNU Lesser General Public License: - - Logback Classic Module (ch.qos.logback:logback-classic:1.2.11 - http://logback.qos.ch/logback-classic) - - Logback Core Module (ch.qos.logback:logback-core:1.2.11 - http://logback.qos.ch/logback-core) - GPLv2: - - jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - GPLv2+CE: - - javafx-base (org.openjfx:javafx-base:18 - https://openjdk.java.net/projects/openjfx/javafx-base/) - - javafx-controls (org.openjfx:javafx-controls:18 - https://openjdk.java.net/projects/openjfx/javafx-controls/) - - javafx-fxml (org.openjfx:javafx-fxml:18 - https://openjdk.java.net/projects/openjfx/javafx-fxml/) - - javafx-graphics (org.openjfx:javafx-graphics:18 - https://openjdk.java.net/projects/openjfx/javafx-graphics/) - LGPL 2.1: - - jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix) - LGPL-2.1-or-later: - - Java Native Access (net.java.dev.jna:jna:5.9.0 - https://github.com/java-native-access/jna) - - Java Native Access Platform (net.java.dev.jna:jna-platform:5.9.0 - https://github.com/java-native-access/jna) - MIT License: - - java jwt (com.auth0:java-jwt:3.19.1 - https://github.com/auth0/java-jwt) - - jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm) - - jnr-fuse (com.github.serceman:jnr-fuse:0.5.7 - https://github.com/SerCeMan/jnr-fuse) - - zxcvbn4j (com.nulab-inc:zxcvbn:1.6.0 - https://github.com/nulab/zxcvbn4j) - - SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org) - The BSD 2-Clause License: - - EasyBind (com.tobiasdiez:easybind:2.2 - https://github.com/tobiasdiez/EasyBind) - -Cryptomator uses other third-party assets under the following licenses: -SIL OFL 1.1 License: -- Font Awesome 5.12.0 (https://fontawesome.com/) From bff0194f3edb35f52a9243065c7642db4abd687d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 12:12:00 +0200 Subject: [PATCH 06/18] Fixed wrong file format and url of lcense merge file --- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/win-exe.yml | 4 ++-- dist/mac/dmg/build.sh | 2 +- dist/win/build.ps1 | 4 ++-- license/merges | 7 +++++++ license/merges.xml | 7 ------- pom.xml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 license/merges delete mode 100644 license/merges.xml diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index edb87474c..fa15e689e 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -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 diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index cf1c56c2b..c30d730c6 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -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 }} diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 94887658c..e85f4c944 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=../../../license/merges.xml + -Dlicense.licenseMergesUrl=file:///../../../license/merges # codesign if [ -n "${CODESIGN_IDENTITY}" ]; then diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 78e888435..5dfc371ed 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\..\..\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 diff --git a/license/merges b/license/merges new file mode 100644 index 000000000..eb3a32a5b --- /dev/null +++ b/license/merges @@ -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 \ No newline at end of file diff --git a/license/merges.xml b/license/merges.xml deleted file mode 100644 index 086eba3b8..000000000 --- a/license/merges.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/pom.xml b/pom.xml index 04588ea1d..96b5e2cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ THIRD-PARTY.txt compile org\.cryptomator - ${project.basedir}/license/merges.xml + file:///${project.basedir}/license/merges ${project.basedir}/license/template.ftl From c1801e3d222607120576b1e248977a4961d84483 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 12:12:25 +0200 Subject: [PATCH 07/18] fixed typo --- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/win-exe.yml | 4 ++-- dist/mac/dmg/build.sh | 2 +- dist/win/build.ps1 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index fa15e689e..1307c543a 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -108,7 +108,7 @@ jobs: -Dlicense.thirdPartyFilename=license.rtf -Dlicense.outputDirectory=dist/mac/dmg/resources -Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl - -Dlicense.includeScopes=compile + -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true -Dlicense.licenseMergesUrl=file:///license/merges diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index c30d730c6..8edb3fd2f 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -121,7 +121,7 @@ jobs: -Dlicense.thirdPartyFilename=license.rtf -Dlicense.outputDirectory=dist/win/resources -Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl - -Dlicense.includeScopes=compile + -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true -Dlicense.licenseMergesUrl=file:///license/merges @@ -211,7 +211,7 @@ jobs: -Dlicense.thirdPartyFilename=license.rtf -Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl -Dlicense.outputDirectory=dist/win/bundle/resources - -Dlicense.includeScopes=compile + -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true -Dlicense.licenseMergesUrl=file:///license/merges diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index e85f4c944..a779f79b5 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -80,7 +80,7 @@ mvn -B -f../../../pom.xml license:add-third-party \ -Dlicense.thirdPartyFilename=license.rtf \ -Dlicense.outputDirectory=resources -Dlicense.fileTemplate=resources/licenseTemplate.ftl \ - -Dlicense.includeScopes=compile \ + -Dlicense.includedScopes=compile \ -Dlicense.excludedGroups=^org\.cryptomator \ -Dlicense.failOnMissing=true \ -Dlicense.licenseMergesUrl=file:///../../../license/merges diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 5dfc371ed..453cdb652 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -85,7 +85,7 @@ if ($clean -and (Test-Path -Path $appPath)) { "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" ` "-Dlicense.outputDirectory=$buildDir\resources\" ` - "-Dlicense.includeScopes=compile" ` + "-Dlicense.includedScopes=compile" ` "-Dlicense.excludedGroups=^org\.cryptomator" ` "-Dlicense.failOnMissing=true" ` "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" @@ -125,7 +125,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" "-Dlicense.thirdPartyFilename=license.rtf" ` "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" ` "-Dlicense.outputDirectory=$buildDir\bundle\resources\" ` - "-Dlicense.includeScopes=compile" ` + "-Dlicense.includedScopes=compile" ` "-Dlicense.excludedGroups=^org\.cryptomator" ` "-Dlicense.failOnMissing=true" ` "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" From bcfba219008e97c83cab11b4a127f3d979c8a896 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 17:46:58 +0200 Subject: [PATCH 08/18] Create third-party-license file in target directory, use plugin defaults to let it placed inside jar --- pom.xml | 1 - .../java/org/cryptomator/ui/preferences/AboutController.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 96b5e2cc4..94668e5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -355,7 +355,6 @@ generate-resources - ${project.basedir}/src/main/resources/license THIRD-PARTY.txt compile org\.cryptomator diff --git a/src/main/java/org/cryptomator/ui/preferences/AboutController.java b/src/main/java/org/cryptomator/ui/preferences/AboutController.java index 758e0113b..f418843ee 100644 --- a/src/main/java/org/cryptomator/ui/preferences/AboutController.java +++ b/src/main/java/org/cryptomator/ui/preferences/AboutController.java @@ -29,10 +29,10 @@ public class AboutController implements FxController { } private static String loadThirdPartyLicenseFile() { - try (InputStream in = AboutController.class.getResourceAsStream("/license/THIRD-PARTY.txt")) { + try (InputStream in = AboutController.class.getResourceAsStream("/THIRD-PARTY.txt")) { return CharStreams.toString(new InputStreamReader(in)); } catch (IOException | NullPointerException e) { - LOG.error("Failed to load /license/THIRD-PARTY.txt", e); + LOG.error("Failed to load /THIRD-PARTY.txt", e); return ""; } } From 68d4b440e1786e99c75a8c734ce44854f76df98b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 20 Apr 2022 17:47:50 +0200 Subject: [PATCH 09/18] use spaces instead of tabs in app license file --- license/template.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/license/template.ftl b/license/template.ftl index f577ceaff..9468f0094 100644 --- a/license/template.ftl +++ b/license/template.ftl @@ -23,13 +23,13 @@ Cryptomator uses ${dependencyMap?size} third-party dependencies under the follow <#assign license = e.getKey()/> <#assign projects = e.getValue()/> <#if projects?size > 0> - ${license}: + ${license}: <#list projects as project> - - ${artifactFormat(project)} + - ${artifactFormat(project)} Cryptomator uses other third-party assets under the following licenses: -SIL OFL 1.1 License: -- Font Awesome 5.12.0 (https://fontawesome.com/) + SIL OFL 1.1 License: + - Font Awesome 5.12.0 (https://fontawesome.com/) From 9f5c31e4e719399106e6d821532b011b7fd3939f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 21 Apr 2022 14:21:40 +0200 Subject: [PATCH 10/18] Move app specific license template to resources directory --- license/THIRD-PARTY.properties | 1 - pom.xml | 10 +++++++++- {license => src/main/resources/license}/template.ftl | 0 3 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 license/THIRD-PARTY.properties rename {license => src/main/resources/license}/template.ftl (100%) diff --git a/license/THIRD-PARTY.properties b/license/THIRD-PARTY.properties deleted file mode 100644 index 7af1b122f..000000000 --- a/license/THIRD-PARTY.properties +++ /dev/null @@ -1 +0,0 @@ -com.github.serceman--jnr-fuse--0.5.4=MIT License \ No newline at end of file diff --git a/pom.xml b/pom.xml index 94668e5e0..ba29cdeff 100644 --- a/pom.xml +++ b/pom.xml @@ -359,12 +359,20 @@ compile org\.cryptomator file:///${project.basedir}/license/merges - ${project.basedir}/license/template.ftl + ${project.basedir}/src/main/resources/license/template.ftl + + + src/main/resources + + license/* + + + diff --git a/license/template.ftl b/src/main/resources/license/template.ftl similarity index 100% rename from license/template.ftl rename to src/main/resources/license/template.ftl From d053367f83562913e1c511d8f290fcd7ea44e65f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 09:49:04 +0200 Subject: [PATCH 11/18] removed license dir, renamed merge file and adjusted paths --- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/win-exe.yml | 4 ++-- dist/mac/dmg/build.sh | 2 +- dist/win/build.ps1 | 4 ++-- pom.xml | 2 +- license/merges => third-party.merges | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename license/merges => third-party.merges (100%) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1307c543a..9c38c913c 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -111,7 +111,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///license/merges + -Dlicense.licenseMergesUrl=file:///third-party.merges - name: Install codesign certificate run: | # create variables diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 8edb3fd2f..76804efc9 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -124,7 +124,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///license/merges + -Dlicense.licenseMergesUrl=file:///third-party.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:///license/merges + -Dlicense.licenseMergesUrl=file:///third-party.merges - 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 a779f79b5..3944cd8df 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.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 diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 453cdb652..7e4d67119 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -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 diff --git a/pom.xml b/pom.xml index ba29cdeff..d2a4a67be 100644 --- a/pom.xml +++ b/pom.xml @@ -358,7 +358,7 @@ THIRD-PARTY.txt compile org\.cryptomator - file:///${project.basedir}/license/merges + file:///${project.basedir}/third-party.merges ${project.basedir}/src/main/resources/license/template.ftl diff --git a/license/merges b/third-party.merges similarity index 100% rename from license/merges rename to third-party.merges From 2f17d80fe683765cf0af8003b81cffc1c1517188 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 11:51:22 +0200 Subject: [PATCH 12/18] Revert "removed license dir, renamed merge file and adjusted paths" This reverts commit d053367f83562913e1c511d8f290fcd7ea44e65f. --- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/win-exe.yml | 4 ++-- dist/mac/dmg/build.sh | 2 +- dist/win/build.ps1 | 4 ++-- third-party.merges => license/merges | 0 pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename third-party.merges => license/merges (100%) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 9c38c913c..1307c543a 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -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 diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 76804efc9..8edb3fd2f 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -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 }} diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 3944cd8df..a779f79b5 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.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 diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 7e4d67119..453cdb652 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -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 diff --git a/third-party.merges b/license/merges similarity index 100% rename from third-party.merges rename to license/merges diff --git a/pom.xml b/pom.xml index d2a4a67be..ba29cdeff 100644 --- a/pom.xml +++ b/pom.xml @@ -358,7 +358,7 @@ THIRD-PARTY.txt compile org\.cryptomator - file:///${project.basedir}/third-party.merges + file:///${project.basedir}/license/merges ${project.basedir}/src/main/resources/license/template.ftl From 4d7e16d58e5dc3fd42d5b9623d8e634bb5151d0a Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Fri, 22 Apr 2022 12:34:25 +0200 Subject: [PATCH 13/18] updated license templates --- dist/mac/dmg/build.sh | 4 ++-- dist/mac/dmg/resources/licenseTemplate.ftl | 6 +++--- dist/win/bundle/resources/licenseTemplate.ftl | 12 ++++++------ dist/win/resources/licenseTemplate.ftl | 4 ++-- src/main/resources/license/template.ftl | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index a779f79b5..e366a8c38 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -78,12 +78,12 @@ 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.outputDirectory=resources + -Dlicense.outputDirectory=dist/mac/dmg/resources \ -Dlicense.fileTemplate=resources/licenseTemplate.ftl \ -Dlicense.includedScopes=compile \ -Dlicense.excludedGroups=^org\.cryptomator \ -Dlicense.failOnMissing=true \ - -Dlicense.licenseMergesUrl=file:///../../../license/merges + -Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges # codesign if [ -n "${CODESIGN_IDENTITY}" ]; then diff --git a/dist/mac/dmg/resources/licenseTemplate.ftl b/dist/mac/dmg/resources/licenseTemplate.ftl index af949937e..e4d7fd476 100644 --- a/dist/mac/dmg/resources/licenseTemplate.ftl +++ b/dist/mac/dmg/resources/licenseTemplate.ftl @@ -1,8 +1,8 @@ <#function artifactFormat p> <#if p.name?index_of('Unnamed') > -1> - <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + (p.url!"no url defined") + "}})"> + <#return "{\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + p.artifactId + "}}" + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ")"> <#else> - <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + (p.url!"no url defined") + "}})"> + <#return "{\\field{\\*\\fldinst{HYPERLINK \"" + (p.url!"no url defined") + "\"}}{\\fldrslt " + p.name + "}}" + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ")"> {\rtf1\ansi\ansicpg1252\cocoartf2512 @@ -44,6 +44,6 @@ You should have received a copy of the GNU General Public License along with thi \f0\b Cryptomator uses other third-party assets under the following licenses: \f1\b0 \ SIL OFL 1.1 License:\ - - Font Awesome 5.12.0 ({\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt https://fontawesome.com/}})\ + - {\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt Font Awesome}} (5.12.0)\ \ } diff --git a/dist/win/bundle/resources/licenseTemplate.ftl b/dist/win/bundle/resources/licenseTemplate.ftl index bd137a1a1..9b4d461f2 100644 --- a/dist/win/bundle/resources/licenseTemplate.ftl +++ b/dist/win/bundle/resources/licenseTemplate.ftl @@ -1,8 +1,8 @@ <#function artifactFormat p> <#if p.name?index_of('Unnamed') > -1> - <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> + <#return "{{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + p.artifactId + "\\ul0\\cf0}}}}\\f0\\fs16 " + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ") "> <#else> - <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> + <#return "{{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + p.name + "\\ul0\\cf0}}}}\\f0\\fs16 " + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ") "> {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} @@ -26,16 +26,16 @@ You should have received a copy of the GNU General Public License along with thi <#if projects?size > 0> \tab ${license}:\par <#list projects as project> -\tab\tab- ${artifactFormat(project)}\par +\tab\tab - ${artifactFormat(project)}\par \par \b Cryptomator uses other third-party assets under the following licenses:\b0\par \tab SIL OFL 1.1 License:\par -\tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par +\tab\tab - {{\field{\*\fldinst{HYPERLINK https://fontawesome.com/}}{\fldrslt{Font Awesome\ul0\cf0}}}}\f0\fs16 (5.12.0)\b\par \par \b Cryptomator dynamically links to third-party libraries under the following license:\b0\par \tab Uncategorized License:\par -\tab\tab - WinFsp - Windows File System Proxy, Copyright (C) Bill Zissimopoulos ({{\field{\*\fldinst{HYPERLINK https://github.com/billziss-gh/winfsp }}{\fldrslt{https://github.com/billziss-gh/winfsp\ul0\cf0}}}}\f0\fs16 )\b\par -} \ No newline at end of file +\tab\tab - {{\field{\*\fldinst{HYPERLINK https://github.com/billziss-gh/winfsp}}{\fldrslt{WinFsp - Windows File System Proxy\ul0\cf0}}}}\f0\fs16 (Copyright (C) Bill Zissimopoulos)\b\par +} diff --git a/dist/win/resources/licenseTemplate.ftl b/dist/win/resources/licenseTemplate.ftl index d442e6538..1ed36438c 100644 --- a/dist/win/resources/licenseTemplate.ftl +++ b/dist/win/resources/licenseTemplate.ftl @@ -26,12 +26,12 @@ You should have received a copy of the GNU General Public License along with thi <#if projects?size > 0> \tab ${license}:\par <#list projects as project> -\tab\tab- ${artifactFormat(project)}\par +\tab\tab - ${artifactFormat(project)}\par \par \b Cryptomator uses other third-party assets under the following licenses:\b0\par \tab SIL OFL 1.1 License:\par -\tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par +\tab\tab - Font Awesome (5.12.0 - {{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par } \ No newline at end of file diff --git a/src/main/resources/license/template.ftl b/src/main/resources/license/template.ftl index 9468f0094..0c6c8c71a 100644 --- a/src/main/resources/license/template.ftl +++ b/src/main/resources/license/template.ftl @@ -32,4 +32,4 @@ Cryptomator uses ${dependencyMap?size} third-party dependencies under the follow Cryptomator uses other third-party assets under the following licenses: SIL OFL 1.1 License: - - Font Awesome 5.12.0 (https://fontawesome.com/) + - Font Awesome (5.12.0 - https://fontawesome.com/) From 94b3ea37d67b7792a749b3f9e8349585818a8c41 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 16:19:09 +0200 Subject: [PATCH 14/18] use absolute path in workflow --- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/win-exe.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1307c543a..04207243b 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -111,7 +111,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///license/merges + -Dlicense.licenseMergesUrl=file:///${{ env.GITHUB_WORKSPACE }}/license/merges - name: Install codesign certificate run: | # create variables diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 8edb3fd2f..80c480165 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -124,7 +124,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///license/merges + -Dlicense.licenseMergesUrl=file:///${{ env.GITHUB_WORKSPACE }}/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:///license/merges + -Dlicense.licenseMergesUrl=file:///${{ env.GITHUB_WORKSPACE }}/license/merges - name: Download WinFsp run: curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }} From afe77371290b0d92e2091b12505c5d185de4cd8e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 16:24:46 +0200 Subject: [PATCH 15/18] wrong usage of github workspace var --- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/win-exe.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 04207243b..63359b5c5 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -111,7 +111,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///${{ env.GITHUB_WORKSPACE }}/license/merges + -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges - name: Install codesign certificate run: | # create variables diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 80c480165..c5bedfa98 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -124,7 +124,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///${{ env.GITHUB_WORKSPACE }}/license/merges + -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/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:///${{ env.GITHUB_WORKSPACE }}/license/merges + -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges - name: Download WinFsp run: curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }} From c429de6a66137250883990c23d70f52c2bc7bd5e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 16:52:49 +0200 Subject: [PATCH 16/18] third slash's the charm --- .github/workflows/win-exe.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index c5bedfa98..9fb5085c5 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -124,7 +124,7 @@ jobs: -Dlicense.includedScopes=compile -Dlicense.excludedGroups=^org\.cryptomator -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges + -Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/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://${{ github.workspace }}/license/merges + -Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges - name: Download WinFsp run: curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }} From 835a5592fc09c90df89de62e915e28d62b5b5e9a Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 17:18:28 +0200 Subject: [PATCH 17/18] use pwsh for license generation to circumvent slash problem in url --- .github/workflows/win-exe.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 9fb5085c5..3a9ed8ab0 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -118,13 +118,14 @@ jobs: - name: Generate license for MSI run: > mvn -B license:add-third-party - -Dlicense.thirdPartyFilename=license.rtf - -Dlicense.outputDirectory=dist/win/resources - -Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl - -Dlicense.includedScopes=compile - -Dlicense.excludedGroups=^org\.cryptomator - -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges + "-Dlicense.thirdPartyFilename=license.rtf" + "-Dlicense.outputDirectory=dist/win/resources" + "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl" + "-Dlicense.includedScopes=compile" + "-Dlicense.excludedGroups=^org\.cryptomator" + "-Dlicense.failOnMissing=true" + "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" + shell: pwsh - name: Create MSI run: > ${JAVA_HOME}/bin/jpackage @@ -208,13 +209,14 @@ jobs: - name: Generate license for exe 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.includedScopes=compile - -Dlicense.excludedGroups=^org\.cryptomator - -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges + "-Dlicense.thirdPartyFilename=license.rtf" + "-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl" + "-Dlicense.outputDirectory=dist/win/bundle/resources" + "-Dlicense.includedScopes=compile" + "-Dlicense.excludedGroups=^org\.cryptomator" + "-Dlicense.failOnMissing=true" + "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" + shell: pwsh - name: Download WinFsp run: curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }} From 98b3b14e6a858763ea43b33ecee3c4d93801fcb9 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 26 Apr 2022 17:48:05 +0200 Subject: [PATCH 18/18] Reverted bundle license to show links again and adjusted license template * only those are depicted as clickable http links --- dist/win/bundle/resources/licenseTemplate.ftl | 18 +++++++++--------- dist/win/resources/licenseTemplate.ftl | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dist/win/bundle/resources/licenseTemplate.ftl b/dist/win/bundle/resources/licenseTemplate.ftl index 9b4d461f2..8a568b85d 100644 --- a/dist/win/bundle/resources/licenseTemplate.ftl +++ b/dist/win/bundle/resources/licenseTemplate.ftl @@ -1,22 +1,22 @@ <#function artifactFormat p> <#if p.name?index_of('Unnamed') > -1> - <#return "{{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + p.artifactId + "\\ul0\\cf0}}}}\\f0\\fs16 " + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ") "> + <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> <#else> - <#return "{{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + p.name + "\\ul0\\cf0}}}}\\f0\\fs16 " + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + ") "> + <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> -{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1031{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}} {\colortbl ;\red0\green0\blue255;} -\viewkind4\uc1 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par +\vieww12000\viewh15840\viewkind0 +\pard\tx283\tx567\tx850\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par \par -\b\'a9 2016 \endash 2022 Skymatic GmbH\b0\par +\b\'a9 2016 \'96 2022 Skymatic GmbH \b0\par \par This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par \par This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par \par -You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par +You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par \par \b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:\b0\par @@ -33,9 +33,9 @@ You should have received a copy of the GNU General Public License along with thi \par \b Cryptomator uses other third-party assets under the following licenses:\b0\par \tab SIL OFL 1.1 License:\par -\tab\tab - {{\field{\*\fldinst{HYPERLINK https://fontawesome.com/}}{\fldrslt{Font Awesome\ul0\cf0}}}}\f0\fs16 (5.12.0)\b\par +\tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par \par \b Cryptomator dynamically links to third-party libraries under the following license:\b0\par \tab Uncategorized License:\par -\tab\tab - {{\field{\*\fldinst{HYPERLINK https://github.com/billziss-gh/winfsp}}{\fldrslt{WinFsp - Windows File System Proxy\ul0\cf0}}}}\f0\fs16 (Copyright (C) Bill Zissimopoulos)\b\par +\tab\tab - WinFsp - Windows File System Proxy, Copyright (C) Bill Zissimopoulos ({{\field{\*\fldinst{HYPERLINK https://github.com/billziss-gh/winfsp }}{\fldrslt{https://github.com/billziss-gh/winfsp\ul0\cf0}}}}\f0\fs16 )\b\par } diff --git a/dist/win/resources/licenseTemplate.ftl b/dist/win/resources/licenseTemplate.ftl index 1ed36438c..0ee793cb1 100644 --- a/dist/win/resources/licenseTemplate.ftl +++ b/dist/win/resources/licenseTemplate.ftl @@ -5,18 +5,18 @@ <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - {{\\field{\\*\\fldinst{HYPERLINK " + (p.url!"no url defined") + "}}{\\fldrslt{" + (p.url!"no url defined") + "\\ul0\\cf0}}}}\\f0\\fs16 ) "> -{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}} +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1031{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}} {\colortbl ;\red0\green0\blue255;} -\viewkind4\uc1 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par +\vieww12000\viewh15840\viewkind0 +\pard\tx283\tx567\tx850\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par \par -\b\'a9 2016 \endash 2022 Skymatic GmbH\b0\par +\b\'a9 2016 \'96 2022 Skymatic GmbH \b0\par \par This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par \par This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par \par -You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par +You should have received a copy of the GNU General Public License along with this program. If not, see {{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/ }}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs16 .\par \par \b Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:\b0\par