From c74a4db9413df0922674cdccafc5875024a46985 Mon Sep 17 00:00:00 2001 From: varjain Date: Wed, 13 Nov 2024 11:30:45 +0530 Subject: [PATCH 01/12] use repository.jboss.org for GNU licenses --- licenses-generator/src/main/resources/rh-license-names.json | 4 ++++ pig/src/main/resources/rh-license-exceptions.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/licenses-generator/src/main/resources/rh-license-names.json b/licenses-generator/src/main/resources/rh-license-names.json index 77f9695b..021590d8 100644 --- a/licenses-generator/src/main/resources/rh-license-names.json +++ b/licenses-generator/src/main/resources/rh-license-names.json @@ -54,12 +54,14 @@ }, { "name": "GNU Lesser General Public License, Version 3", + "textUrl": "https://repository.jboss.org/licenses/lgpl-3.0.txt", "url": "http://www.gnu.org/licenses/lgpl-3.0-standalone.html", "aliases": [ "GNU Lesser General Public License, Version 3", "The GNU Lesser General Public License, version 3" ], "urlAliases": [ + "https://repository.jboss.org/licenses/lgpl-3.0.txt", "https://www.gnu.org/licenses/lgpl-3.0-standalone.html", "http://www.gnu.org/licenses/lgpl-3.0-standalone.html", "https://www.gnu.org/licenses/lgpl.html", @@ -70,12 +72,14 @@ }, { "name": "GNU General Public License v2.0 only", + "textUrl": "https://repository.jboss.org/licenses/gpl-2.0.txt", "url": "https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html", "aliases": [ "GNU General Public License v2.0 only", "The GNU General Public License, Version 2" ], "urlAliases": [ + "https://repository.jboss.org/licenses/gpl-2.0.txt", "https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html", "http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html", "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index 09579029..1d99435f 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -882,7 +882,7 @@ "licenses": [ { "name": "GNU Lesser General Public License v3.0 or later", - "url": "https://www.gnu.org/licenses/lgpl-3.0.txt" + "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" }, { "name": "Apache License 2.0", @@ -1270,7 +1270,7 @@ }, { "name": "GNU General Public License v2.0 only", - "url": "https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html" + "url": "https://repository.jboss.org/licenses/gpl-2.0.txt" }, { "name": "BSD 3-clause \"New\" or \"Revised\" License", From 79f52cb8fdc0195ea7a2e172384c987cb583fa0d Mon Sep 17 00:00:00 2001 From: souvik ghosh Date: Wed, 13 Nov 2024 13:26:16 +0530 Subject: [PATCH 02/12] Update rh-license-names.json --- .../src/main/resources/rh-license-names.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/licenses-generator/src/main/resources/rh-license-names.json b/licenses-generator/src/main/resources/rh-license-names.json index 77f9695b..0fec27d2 100644 --- a/licenses-generator/src/main/resources/rh-license-names.json +++ b/licenses-generator/src/main/resources/rh-license-names.json @@ -57,7 +57,9 @@ "url": "http://www.gnu.org/licenses/lgpl-3.0-standalone.html", "aliases": [ "GNU Lesser General Public License, Version 3", - "The GNU Lesser General Public License, version 3" + "The GNU Lesser General Public License, version 3", + "GNU Lesser General Public License v3.0 only", + "GNU Lesser General Public License v3.0 or later" ], "urlAliases": [ "https://www.gnu.org/licenses/lgpl-3.0-standalone.html", @@ -89,7 +91,8 @@ "url": "http://repository.jboss.org/licenses/gpl-2.0-ce.txt", "aliases": [ "GNU General Public License, Version 2 with the Classpath Exception", - "GPL2 w/ CPE" + "GPL2 w/ CPE", + "GNU General Public License" ], "urlAliases": [ "http://repository.jboss.org/licenses/gpl-2.0-ce.txt" From 692b4351fd88b8fb57171f7357fe649a4e3ef400 Mon Sep 17 00:00:00 2001 From: souvik ghosh Date: Thu, 14 Nov 2024 08:40:39 +0530 Subject: [PATCH 03/12] Update rh-license-exceptions.json fix cryptacular and jboss-parent --- .../main/resources/rh-license-exceptions.json | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/licenses-generator/src/main/resources/rh-license-exceptions.json b/licenses-generator/src/main/resources/rh-license-exceptions.json index 239800e8..5c131f54 100644 --- a/licenses-generator/src/main/resources/rh-license-exceptions.json +++ b/licenses-generator/src/main/resources/rh-license-exceptions.json @@ -102,5 +102,31 @@ "url": "https://www.mozilla.org/en-US/MPL/2.0/" } ] + }, + { + "groupId": "org.jboss", + "artifactId": "jboss-parent", + "version-regexp": ".*", + "licenses": [ + { + "name": "Public Domain", + "url": "http://repository.jboss.org/licenses/cc0-1.0.txt" + } + ] + }, + { + "groupId": "org.cryptacular", + "artifactId": "cryptacular", + "version-regexp": ".*", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + }, + { + "name": "GNU Lesser General Public License v3.0 only", + "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" + } + ] } ] From d52dcb0c480fb5b0b2c189249b2fc571c9aaed70 Mon Sep 17 00:00:00 2001 From: souvik ghosh Date: Thu, 14 Nov 2024 11:14:22 +0530 Subject: [PATCH 04/12] Update rh-license-exceptions.json in PIG --- .../main/resources/rh-license-exceptions.json | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index 09579029..cf910183 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -1563,5 +1563,31 @@ "url": "https://opensource.org/licenses/BSD-3-Clause" } ] - } + }, + { + "groupId": "org.jboss", + "artifactId": "jboss-parent", + "version-regexp": ".*", + "licenses": [ + { + "name": "Public Domain", + "url": "http://repository.jboss.org/licenses/cc0-1.0.txt" + } + ] + }, + { + "groupId": "org.cryptacular", + "artifactId": "cryptacular", + "version-regexp": ".*", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + }, + { + "name": "GNU Lesser General Public License v3.0 only", + "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" + } + ] + } ] From 06b11f8e8c85dc0ce4bc637ff8962c3024525aa9 Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Wed, 13 Nov 2024 21:23:57 +0800 Subject: [PATCH 05/12] Fix avro license issues --- .../main/resources/rh-license-exceptions.json | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/licenses-generator/src/main/resources/rh-license-exceptions.json b/licenses-generator/src/main/resources/rh-license-exceptions.json index 5c131f54..81a5ed5a 100644 --- a/licenses-generator/src/main/resources/rh-license-exceptions.json +++ b/licenses-generator/src/main/resources/rh-license-exceptions.json @@ -103,7 +103,7 @@ } ] }, - { + { "groupId": "org.jboss", "artifactId": "jboss-parent", "version-regexp": ".*", @@ -114,6 +114,17 @@ } ] }, + { + "groupId": "org.apache.avro", + "artifactId": "avro", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, { "groupId": "org.cryptacular", "artifactId": "cryptacular", @@ -128,5 +139,27 @@ "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" } ] + }, + { + "groupId": "org.apache.avro", + "artifactId": "avro-parent", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "groupId": "org.apache.avro", + "artifactId": "avro-toplevel", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] } ] From 04df602a14b2c8d83e1c9325e92e219ad9e4c71e Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Thu, 14 Nov 2024 01:14:52 +0800 Subject: [PATCH 06/12] Fix in pig --- .../main/resources/rh-license-exceptions.json | 48 ++++++++++++++++++- pig/src/main/resources/rh-license-names.json | 1 + 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index 52855c55..c167b459 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -1564,7 +1564,7 @@ } ] }, - { + { "groupId": "org.jboss", "artifactId": "jboss-parent", "version-regexp": ".*", @@ -1589,5 +1589,49 @@ "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" } ] - } + }, + { + "groupId": "org.apache.avro", + "artifactId": "avro", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "groupId": "org.apache.avro", + "artifactId": "avro-compiler", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "groupId": "org.apache.avro", + "artifactId": "avro-parent", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "groupId": "org.apache.avro", + "artifactId": "avro-toplevel", + "version-regexp": "1\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + } ] diff --git a/pig/src/main/resources/rh-license-names.json b/pig/src/main/resources/rh-license-names.json index 62d146fb..09d5667c 100644 --- a/pig/src/main/resources/rh-license-names.json +++ b/pig/src/main/resources/rh-license-names.json @@ -117,6 +117,7 @@ "GNU General Public License v2.0 only, with Classpath exception", "GPL-2.0-with-classpath-exception", "GPL2 w/ CPE", + "GNU General Public License", "gpl", "The GNU General Public License (GPL), Version 2, With Classpath Exception", "General Public License, version 2 with the GNU Classpath" From d1857704325d04bd58d66d9f962b1742870b2a03 Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Thu, 14 Nov 2024 16:25:09 +0800 Subject: [PATCH 07/12] Add exception for jackson-bom --- pig/src/main/resources/rh-license-exceptions.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index c167b459..a39d5faa 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -694,6 +694,17 @@ } ] }, + { + "groupId": "com.fasterxml.jackson", + "artifactId": "jackson-bom", + "version-regexp": "2\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, { "groupId": "org.reactivestreams", "artifactId": "reactive-streams", From c347f6e0d11112398c0510188b32ee0371082f90 Mon Sep 17 00:00:00 2001 From: souvik ghosh Date: Thu, 14 Nov 2024 21:59:37 +0530 Subject: [PATCH 08/12] Fix license for jboss-parent and cryptacular --- .../main/resources/rh-license-exceptions.json | 38 ++++++------- .../main/resources/rh-license-exceptions.json | 54 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/licenses-generator/src/main/resources/rh-license-exceptions.json b/licenses-generator/src/main/resources/rh-license-exceptions.json index 81a5ed5a..df3e31f7 100644 --- a/licenses-generator/src/main/resources/rh-license-exceptions.json +++ b/licenses-generator/src/main/resources/rh-license-exceptions.json @@ -103,25 +103,14 @@ } ] }, - { - "groupId": "org.jboss", - "artifactId": "jboss-parent", - "version-regexp": ".*", - "licenses": [ - { - "name": "Public Domain", - "url": "http://repository.jboss.org/licenses/cc0-1.0.txt" - } - ] - }, { "groupId": "org.apache.avro", "artifactId": "avro", "version-regexp": "1\\..+", "licenses": [ { - "name": "Apache License 2.0", - "url": "http://www.apache.org/licenses/LICENSE-2.0" + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" } ] }, @@ -136,7 +125,7 @@ }, { "name": "GNU Lesser General Public License v3.0 only", - "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" + "url": "http://www.gnu.org/licenses/lgpl-3.0-standalone.html" } ] }, @@ -146,8 +135,8 @@ "version-regexp": "1\\..+", "licenses": [ { - "name": "Apache License 2.0", - "url": "http://www.apache.org/licenses/LICENSE-2.0" + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" } ] }, @@ -157,9 +146,20 @@ "version-regexp": "1\\..+", "licenses": [ { - "name": "Apache License 2.0", - "url": "http://www.apache.org/licenses/LICENSE-2.0" + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] + }, + { + "groupId": "org.jboss", + "artifactId": "jboss-parent", + "version-regexp": ".*", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" } ] } -] +] \ No newline at end of file diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index a39d5faa..a5025d2f 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -1576,32 +1576,21 @@ ] }, { - "groupId": "org.jboss", - "artifactId": "jboss-parent", - "version-regexp": ".*", - "licenses": [ - { - "name": "Public Domain", - "url": "http://repository.jboss.org/licenses/cc0-1.0.txt" - } - ] - }, - { - "groupId": "org.cryptacular", - "artifactId": "cryptacular", - "version-regexp": ".*", - "licenses": [ - { - "name": "Apache License 2.0", - "url": "http://www.apache.org/licenses/LICENSE-2.0" - }, - { - "name": "GNU Lesser General Public License v3.0 only", - "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" - } - ] - }, - { + "groupId": "org.cryptacular", + "artifactId": "cryptacular", + "version-regexp": ".*", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + }, + { + "name": "GNU Lesser General Public License v3.0 only", + "url": "http://www.gnu.org/licenses/lgpl-3.0-standalone.html" + } + ] + }, + { "groupId": "org.apache.avro", "artifactId": "avro", "version-regexp": "1\\..+", @@ -1644,5 +1633,16 @@ "url": "http://www.apache.org/licenses/LICENSE-2.0" } ] + }, + { + "groupId": "org.jboss", + "artifactId": "jboss-parent", + "version-regexp": ".*", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] } -] +] \ No newline at end of file From df806e9ea66bd887330a2e22dad0514a5d72aade Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Fri, 15 Nov 2024 15:45:16 +0800 Subject: [PATCH 09/12] fix lgpl v3.0 only url --- pig/src/main/resources/rh-license-exceptions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index a5025d2f..64362d34 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -1586,7 +1586,7 @@ }, { "name": "GNU Lesser General Public License v3.0 only", - "url": "http://www.gnu.org/licenses/lgpl-3.0-standalone.html" + "url": "https://repository.jboss.org/licenses/lgpl-3.0.txt" } ] }, @@ -1645,4 +1645,4 @@ } ] } -] \ No newline at end of file +] From e71aa86646d91894d665859787578be158712a04 Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Fri, 15 Nov 2024 16:40:40 +0800 Subject: [PATCH 10/12] jboss-parent should be Public Domain --- pig/src/main/resources/rh-license-exceptions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index 64362d34..6f115c94 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -1640,8 +1640,8 @@ "version-regexp": ".*", "licenses": [ { - "name": "Apache License 2.0", - "url": "http://www.apache.org/licenses/LICENSE-2.0" + "name": "Public Domain", + "url": "http://repository.jboss.org/licenses/cc0-1.0.txt" } ] } From af63438912f94281ded22d8a629794706324f793 Mon Sep 17 00:00:00 2001 From: Zheng Feng Date: Fri, 15 Nov 2024 18:08:43 +0800 Subject: [PATCH 11/12] Fix jboss-parent versions-regex --- pig/src/main/resources/rh-license-exceptions.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pig/src/main/resources/rh-license-exceptions.json b/pig/src/main/resources/rh-license-exceptions.json index 6f115c94..de8e3fa1 100644 --- a/pig/src/main/resources/rh-license-exceptions.json +++ b/pig/src/main/resources/rh-license-exceptions.json @@ -1637,12 +1637,24 @@ { "groupId": "org.jboss", "artifactId": "jboss-parent", - "version-regexp": ".*", + "version-regexp": "^([0-3]?[0-9])\\..+", "licenses": [ { "name": "Public Domain", "url": "http://repository.jboss.org/licenses/cc0-1.0.txt" } ] + }, + { + "groupId": "org.jboss", + "artifactId": "jboss-parent", + "version-regexp": "^([4-9]?[0-9])\\..+", + "licenses": [ + { + "name": "Apache License 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0" + } + ] } + ] From 2903639ff5d2e60a3070e791c7420cadd198f75c Mon Sep 17 00:00:00 2001 From: Souvik Ghosh Date: Thu, 21 Nov 2024 14:55:42 +0530 Subject: [PATCH 12/12] Fix Unicode duplicate license issue. --- .../src/main/resources/rh-license-names.json | 11 +++++++++++ pig/src/main/resources/rh-license-names.json | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/licenses-generator/src/main/resources/rh-license-names.json b/licenses-generator/src/main/resources/rh-license-names.json index b1738d54..8ff0784e 100644 --- a/licenses-generator/src/main/resources/rh-license-names.json +++ b/licenses-generator/src/main/resources/rh-license-names.json @@ -326,5 +326,16 @@ "urlAliases": [ "http://creativecommons.org/publicdomain/zero/1.0" ] + }, + { + "name": "Unicode-3.0", + "url": "https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE", + "aliases": [ + "Unicode/ICU License", + "Unicode-3.0" + ], + "urlAliases": [ + "https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE" + ] } ] diff --git a/pig/src/main/resources/rh-license-names.json b/pig/src/main/resources/rh-license-names.json index 09d5667c..fed9fafc 100644 --- a/pig/src/main/resources/rh-license-names.json +++ b/pig/src/main/resources/rh-license-names.json @@ -454,5 +454,16 @@ "urlAliases": [ "http://www.opensource.org/licenses/LGPL-2.1" ] + }, + { + "name": "Unicode-3.0", + "url": "https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE", + "aliases": [ + "Unicode/ICU License", + "Unicode-3.0" + ], + "urlAliases": [ + "https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE" + ] } ]