lizrice · November 4, 2019 11:17 · Nov 4, 2019 · Nov 4, 2019 · Aug 28, 2019 · Aug 22, 2019
diff --git a/trivycla.md b/trivycla.md
@@ -1,4 +1,4 @@
-In order to contribute to the Trivy Open Source Project (see https://github.com/aquasecurity/trivy and https://github.com/aquasecurity/fanal) (the “Project”), I agree to the terms and conditions of this agreement (this “CLA”).
+In order to contribute to the Trivy Open Source Project and its components (see https://github.com/aquasecurity/trivy and https://github.com/aquasecurity/fanal) (the “Project”), I agree to the terms and conditions of this agreement (this “CLA”).
 
 I hereby irrevocably assign all of my right, title and interest in and to my present and future contributions and other submissions to the Project (“Contributions”) to Aqua Security Software Ltd., a company organized under the laws of the State of Israel (“Recipient”), and irrevocably waive and release all rights and claims in respect thereof (including all moral rights or similar rights), without the right to receive any compensation or royalties.
 

diff --git a/trivycla.md b/trivycla.md
@@ -1,4 +1,4 @@
-In order to contribute to the Trivy Open Source Project (see https://github.com/aquasecurity/trivy) (the “Project”), I agree to the terms and conditions of this agreement (this “CLA”).
+In order to contribute to the Trivy Open Source Project (see https://github.com/aquasecurity/trivy and https://github.com/aquasecurity/fanal) (the “Project”), I agree to the terms and conditions of this agreement (this “CLA”).
 
 I hereby irrevocably assign all of my right, title and interest in and to my present and future contributions and other submissions to the Project (“Contributions”) to Aqua Security Software Ltd., a company organized under the laws of the State of Israel (“Recipient”), and irrevocably waive and release all rights and claims in respect thereof (including all moral rights or similar rights), without the right to receive any compensation or royalties.
 

diff --git a/metadata b/metadata
@@ -14,15 +14,5 @@
         "title": "I have read and agree to the CLA",
         "type": "boolean",
         "required": true
-    },
-    "category": {
-        "title": "How do you sign?",
-        "type": {
-            "enum": [
-                "I am signing on behalf of myself.",
-                "I am signing on behalf of my employer."
-            ]
-        },
-        "required": true
     }
 }
diff --git a/metadata b/metadata
@@ -0,0 +1,28 @@
+{
+    "name": {
+        "title": "Full Name",
+        "type": "string",
+        "githubKey": "name"
+    },
+    "email": {
+        "title": "E-Mail",
+        "type": "string",
+        "githubKey": "email",
+        "required": true
+    },
+    "agreement": {
+        "title": "I have read and agree to the CLA",
+        "type": "boolean",
+        "required": true
+    },
+    "category": {
+        "title": "How do you sign?",
+        "type": {
+            "enum": [
+                "I am signing on behalf of myself.",
+                "I am signing on behalf of my employer."
+            ]
+        },
+        "required": true
+    }
+}
diff --git a/cla.md → trivycla.md b/cla.md → trivycla.md
diff --git a/cla.md b/cla.md
@@ -0,0 +1,7 @@
+In order to contribute to the Trivy Open Source Project (see https://github.com/aquasecurity/trivy) (the “Project”), I agree to the terms and conditions of this agreement (this “CLA”).
+
+I hereby irrevocably assign all of my right, title and interest in and to my present and future contributions and other submissions to the Project (“Contributions”) to Aqua Security Software Ltd., a company organized under the laws of the State of Israel (“Recipient”), and irrevocably waive and release all rights and claims in respect thereof (including all moral rights or similar rights), without the right to receive any compensation or royalties.
+
+I hereby represent and warrant that I am the sole author of the Contributions, which are my original creations, that I have the legal right to make the assignment set forth above, and that no Contributions are subject to any claim of ownership or otherwise by my employer or any other organization with which I may be affiliated in any way. Without limiting the above, if any Contributions are subject to any such claim by my employer or any such organization, I hereby agree to this CLA on behalf of both myself and such employer or organization and represent and warrant that I have authority to do so.
+
+This CLA, the interpretation hereof, and all disputes arising out of or relating to this CLA, will be governed by the laws of the Commonwealth of Massachusetts, USA, without regard to any conflict of laws provisions that would apply a different law. Any claims by or against Recipient or its affiliates, agents or employees arising out of or relating to this CLA or my relationship with Recipient shall be resolved by final and binding arbitration conducted by the American Arbitration Association in Boston, Massachusetts. This CLA sets forth the entire understanding and agreement between me and Recipient with respect to the subject matter hereof, and supersedes all prior agreements, discussions and understandings, expressed or implied, concerning such subject matter.
No results found