Update license-mapping.json, added mappings

Author: ssi-zloe

src/main/resources/license-mapping.json

@@ -16,6 +16,7 @@
       "The Apache Software License, Version 2.0",
       "Apache License (v2.0)",
       "Apache License 2.0",
+      "Apache License, 2.0",
       "Apache License Version 2.0",
       "Apache License, Version 2.0",
       "Apache Public License 2.0",
@@ -26,6 +27,13 @@
       "Apache 2 Style License"
     ]
   },
+  {
+    "exp": "(Apache-2.0 OR LGPL-2.1-only)",
+    "names": [
+      "SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1",
+      "Apache-2.0 OR LGPL-2.1"
+    ]
+  },
   {
     "exp": "BSD-2-Clause",
     "names": [
@@ -49,12 +57,14 @@
       "Eclipse Distribution License (New BSD License)",
       "New BSD License",
       "Modified BSD License",
+      "Modified BSD",
       "Revised BSD",
       "Revised BSD License",
       "The New BSD License",
       "3-Clause BSD License",
       "BSD 3-clause New License",
       "BSD License",
+      "BSD License 3",
       "Eclipse Distribution License - v 1.0",
       "Eclipse Distribution License v. 1.0",
       "Eclipse Distribution License v1.0"
@@ -91,17 +101,17 @@
     ]
   },
   {
-    "exp": "CDDL-1.1",
+    "exp": "(CDDL-1.1 OR GPL-2.0-only)",
     "names": [
-      "CDDL 1.1",
-      "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1",
-      "Common Development and Distribution License (CDDL) v1.1"
+      "Dual license consisting of the CDDL v1.1 and GPL v2"
     ]
   },
   {
-    "exp": "(CDDL-1.1 OR GPL-2.0-only)",
+    "exp": "CDDL-1.1",
     "names": [
-      "Dual license consisting of the CDDL v1.1 and GPL v2"
+      "CDDL 1.1",
+      "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1",
+      "Common Development and Distribution License (CDDL) v1.1"
     ]
   },
   {
@@ -113,7 +123,8 @@
       "Eclipse Public License, Version 1.0",
       "Eclipse Public License - v 1.0",
       "Eclipse Public License - v1.0",
-      "Eclipse Public License (EPL), Version 1.0"
+      "Eclipse Public License (EPL), Version 1.0",
+      "EPL 1.0"
     ]
   },
   {
@@ -164,7 +175,10 @@
       "GPL2 w/ CPE",
       "GPLv2+CE",
       "GPLv2 with classpath exception",
-      "GPLv2 license, includes the CLASSPATH exception"
+      "GPLv2 license, includes the CLASSPATH exception",
+      "GNU General Public License, Version 2 with the Classpath Exception",
+      "GNU General Public License, version 2 with the GNU Classpath Exception",
+      "The GNU General Public License (GPL), Version 2, With Classpath Exception"
     ]
   },
   {
@@ -193,15 +207,17 @@
       "LGPL-2.1",
       "LGPL2.1",
       "GNU Lesser General Public License Version 2.1, February 1999",
-      "GNU Library or Lesser General Public License (LGPL) V2.1"
+      "GNU Library or Lesser General Public License (LGPL) V2.1",
+      "GNU Lesser General Public License (LGPL), Version 2.1"
     ]
   },
   {
     "exp": "LGPL-2.1-or-later",
     "names": [
       "GNU Lesser General Public License (LGPL), version 2.1 or later",
       "GNU Lesser General Public License v2.1 or later",
-      "LGPL, v2.1 or later"
+      "LGPL, v2.1 or later",
+      "GNU Library General Public License v2.1 or later"
     ]
   },
   {
@@ -236,19 +252,23 @@
   {
     "exp": "MPL-1.0",
     "names": [
-      "Mozilla Public License"
+      "MPL 1.0",
+      "Mozilla Public License",
+      "Mozilla Public License Version 1.0"
     ]
   },
   {
     "exp": "MPL-1.1",
     "names": [
-      "MPL 1.1"
+      "MPL 1.1",
+      "Mozilla Public License Version 1.1"
     ]
   },
   {
     "exp": "MPL-2.0",
     "names": [
-      "MPL 2.0"
+      "MPL 2.0",
+      "Mozilla Public License Version 2.0"
     ]
   },
   {
@@ -267,7 +287,8 @@
   {
     "exp": "W3C",
     "names": [
-      "The W3C Software License"
+      "The W3C Software License",
+      "W3C license"
     ]
   }
 ]