From c71fb27346ebe8779c288a6961a1d4ca6bc3c6cb Mon Sep 17 00:00:00 2001 From: NucleonGodX Date: Sat, 28 Dec 2024 23:37:25 +0530 Subject: [PATCH 1/4] add new license rules for elastic notices #3942 Signed-off-by: NucleonGodX --- ...se-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE | 17 +++++++++++++++++ ...se-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE | 16 ++++++++++++++++ ...se-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE | 10 ++++++++++ 3 files changed, 43 insertions(+) create mode 100644 src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE create mode 100644 src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE create mode 100644 src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE new file mode 100644 index 00000000000..3e2863023ab --- /dev/null +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE @@ -0,0 +1,17 @@ +--- +license_expression: elastic-license-v2 OR agpl-3.0 OR mongodb-sspl-1.0 +is_license_notice: yes +relevance: 100 +notes: https://github.com/elastic/elasticsearch/commit/a59c182f9f7e9d1bf3d6eecbc0e44f24ff91d053 +ignorable_copyrights: + - Copyright Elasticsearch B.V. +ignorable_holders: + - Elasticsearch B.V. +--- + +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the "{{Elastic License}} + * 2.0", the "{{GNU Affero General Public License v3.0 only}}", and the "{{Server Side + * Public License, v 1}}"; you may not use this file except in compliance with, at + * your election, the "{{Elastic License 2.0}}", the "{{GNU Affero General Public + * License v3.0 only}}" or the "{{Server Side Public License, v 1}}". diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE new file mode 100644 index 00000000000..7188b6e3204 --- /dev/null +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE @@ -0,0 +1,16 @@ +--- +license_expression: (elastic-license-v2 OR agpl-3.0 OR mongodb-sspl-1.0) AND apache-2.0 AND elastic-license-v2 +is_license_notice: yes +relevance: 100 +notes: See https://github.com/elastic/elasticsearch/commit/a59c182f9f7e9d1bf3d6eecbc0e44f24ff91d053 +--- + +Source code in this repository is covered by (i) a triple license under the "GNU +Affero General Public License v3.0 only", "the Server Side Public License, v 1", +and the "Elastic License 2.0", or (ii) an "Apache License 2.0" compatible +license or (iii) solely under the "Elastic License 2.0", in each case, as noted +in the applicable header. The default throughout the repository is a triple +license under the "GNU Affero General Public License v3.0 only", "the Server +Side Public License, v 1", and the "Elastic License 2.0", unless the header +specifies another license. Code that is licensed solely under the "Elastic +License 2.0" is found only in the x-pack folder. \ No newline at end of file diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE new file mode 100644 index 00000000000..2f7a1ac598f --- /dev/null +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE @@ -0,0 +1,10 @@ +--- +license_expression: elastic-license-v2 OR agpl-3.0 OR mongodb-sspl-1.0 +is_license_reference: yes +relevance: 100 +referenced_filenames: + - licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt +notes: https://github.com/elastic/elasticsearch/commit/a59c182f9f7e9d1bf3d6eecbc0e44f24ff91d053 +--- + +licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt From 5228f8474c69ca459baf7b4dfdc724f1efe95f0c Mon Sep 17 00:00:00 2001 From: NucleonGodX Date: Tue, 31 Dec 2024 15:08:29 +0530 Subject: [PATCH 2/4] minor fix Signed-off-by: NucleonGodX --- .../elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE index 3e2863023ab..382c9d9f783 100644 --- a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE @@ -13,5 +13,5 @@ ignorable_holders: * or more contributor license agreements. Licensed under the "{{Elastic License}} * 2.0", the "{{GNU Affero General Public License v3.0 only}}", and the "{{Server Side * Public License, v 1}}"; you may not use this file except in compliance with, at - * your election, the "{{Elastic License 2.0}}", the "{{GNU Affero General Public - * License v3.0 only}}" or the "{{Server Side Public License, v 1}}". + * your election, the "Elastic License 2.0", the "GNU Affero General Public + * License v3.0 only" or the "Server Side Public License, v 1". From b8807369fed685fe08153c4fbc55d9a9d775f3e8 Mon Sep 17 00:00:00 2001 From: Manit Singh <79140607+NucleonGodX@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:05:06 +0530 Subject: [PATCH 3/4] Update src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE Co-authored-by: Ayan Sinha Mahapatra Signed-off-by: NucleonGodX --- .../elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE index 7188b6e3204..a2556668c1c 100644 --- a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE @@ -1,5 +1,5 @@ --- -license_expression: (elastic-license-v2 OR agpl-3.0 OR mongodb-sspl-1.0) AND apache-2.0 AND elastic-license-v2 +license_expression: elastic-license-v2 OR agpl-3.0 OR mongodb-sspl-1.0 is_license_notice: yes relevance: 100 notes: See https://github.com/elastic/elasticsearch/commit/a59c182f9f7e9d1bf3d6eecbc0e44f24ff91d053 From 72bae9c9cafe553c9226a68f32906b39056f0fd3 Mon Sep 17 00:00:00 2001 From: NucleonGodX Date: Mon, 14 Apr 2025 16:18:16 +0530 Subject: [PATCH 4/4] suggestions applied Signed-off-by: NucleonGodX --- ...nse-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE | 8 ++++---- ...nse-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE | 16 ++++++++-------- ...nse-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE index 382c9d9f783..0d73778bb18 100644 --- a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_1.RULE @@ -10,8 +10,8 @@ ignorable_holders: --- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "{{Elastic License}} - * 2.0", the "{{GNU Affero General Public License v3.0 only}}", and the "{{Server Side + * or more contributor license agreements. Licensed under the "{{Elastic License + * 2.0}}", the "{{GNU Affero General Public License v3.0 only}}", and the "{{Server Side * Public License, v 1}}"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only" or the "Server Side Public License, v 1". + * your election, the "{{Elastic License 2.0}}", the "{{GNU Affero General Public + * License v3.0 only}}" or the "{{Server Side Public License, v 1}}". diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE index a2556668c1c..bfbd81abb72 100644 --- a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_2.RULE @@ -5,12 +5,12 @@ relevance: 100 notes: See https://github.com/elastic/elasticsearch/commit/a59c182f9f7e9d1bf3d6eecbc0e44f24ff91d053 --- -Source code in this repository is covered by (i) a triple license under the "GNU -Affero General Public License v3.0 only", "the Server Side Public License, v 1", -and the "Elastic License 2.0", or (ii) an "Apache License 2.0" compatible -license or (iii) solely under the "Elastic License 2.0", in each case, as noted +Source code in this repository is covered by (i) a triple license under the "{{GNU +Affero General Public License v3.0 only}}", "{{the Server Side Public License, v 1}}", +and the "{{Elastic License 2.0}}", or (ii) an "{{Apache License 2.0}}" compatible +license or (iii) solely under the "{{Elastic License 2.0}}", in each case, as noted in the applicable header. The default throughout the repository is a triple -license under the "GNU Affero General Public License v3.0 only", "the Server -Side Public License, v 1", and the "Elastic License 2.0", unless the header -specifies another license. Code that is licensed solely under the "Elastic -License 2.0" is found only in the x-pack folder. \ No newline at end of file +license under the "{{GNU Affero General Public License v3.0 only}}", "{{the Server +Side Public License, v 1}}", and the "{{Elastic License 2.0}}", unless the header +specifies another license. Code that is licensed solely under the "{{Elastic +License 2.0}}" is found only in the x-pack folder. \ No newline at end of file diff --git a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE index 2f7a1ac598f..d93240935ab 100644 --- a/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE +++ b/src/licensedcode/data/rules/elastic-license-v2_or_agpl-3.0_or_mongodb-sspl-1.0_3.RULE @@ -2,6 +2,7 @@ license_expression: elastic-license-v2 OR agpl-3.0 OR mongodb-sspl-1.0 is_license_reference: yes relevance: 100 +minimum_coverage: 95 referenced_filenames: - licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt notes: https://github.com/elastic/elasticsearch/commit/a59c182f9f7e9d1bf3d6eecbc0e44f24ff91d053