This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit 4234095ed7702608952bddc56221d9061d01006d Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Wed Oct 28 01:32:45 2026 +0000 Resolve more declared license names and JBoss-hosted license URLs --- .../org/apache/maven/plugin/resources/remote/license-aliases.txt | 9 ++++++++- .../apache/maven/plugin/resources/remote/SpdxLicensesTest.java | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/resources/org/apache/maven/plugin/resources/remote/license-aliases.txt b/src/main/resources/org/apache/maven/plugin/resources/remote/license-aliases.txt index 7f4a4e1..34ebde1 100644 --- a/src/main/resources/org/apache/maven/plugin/resources/remote/license-aliases.txt +++ b/src/main/resources/org/apache/maven/plugin/resources/remote/license-aliases.txt @@ -24,7 +24,9 @@ # # GNU license URLs and unversioned GNU names are left out on purpose: they do not say # whether "only" or "or later" applies, and a wrong ID is worse than none. So are URLs -# of pages that cover two licenses at once, such as GlassFish's CDDL+GPL_1_1.html. +# of pages that cover two licenses at once, such as GlassFish's CDDL+GPL_1_1.html, and +# license pages of individual projects, such as jsoup.org/license: they name no license, +# and keep their address when the project changes its license. 0BSD AGPL-3.0-only @@ -36,6 +38,7 @@ CC0-1.0 CC0 CC0-1.0 CC0 1.0 Universal CC0-1.0 Creative Commons Zero v1.0 Universal CC0-1.0 https://creativecommons.org/publicdomain/zero/1.0/ +CC0-1.0 http://repository.jboss.org/licenses/cc0-1.0.txt Classpath-exception-2.0 GPL-2.0 GPL-2.0+ @@ -50,6 +53,7 @@ LGPL-2.1 LGPL-2.1+ LGPL-2.1-only LGPL-2.1-or-later +LGPL-2.1-or-later GNU Lesser General Public License (LGPL), version 2.1 or later LGPL-3.0 LGPL-3.0+ LGPL-3.0-only @@ -81,6 +85,7 @@ Apache-2.0 The Apache Software License, Version 2.0 Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 Apache-2.0 https://opensource.org/licenses/Apache-2.0 Apache-2.0 https://opensource.org/licenses/apache2.0.php +Apache-2.0 http://repository.jboss.org/licenses/apache-2.0.txt BSD-2-Clause BSD 2-Clause BSD-2-Clause BSD 2-Clause License @@ -99,6 +104,7 @@ BSD-3-Clause Revised BSD License BSD-3-Clause The BSD 3-Clause License BSD-3-Clause EDL 1.0 BSD-3-Clause Eclipse Distribution License - v 1.0 +BSD-3-Clause Eclipse Distribution License (New BSD License) BSD-3-Clause Eclipse Distribution License v. 1.0 BSD-3-Clause https://www.eclipse.org/org/documents/edl-v10.php BSD-3-Clause https://opensource.org/licenses/BSD-3-Clause @@ -141,6 +147,7 @@ EPL-2.0 https://projects.eclipse.org/license/epl-2.0 GPL-2.0-only WITH Classpath-exception-2.0 GPL2 w/ CPE GPL-2.0-only WITH Classpath-exception-2.0 GNU General Public License, version 2, with the Classpath Exception GPL-2.0-only WITH Classpath-exception-2.0 GNU General Public License, version 2 with the GNU Classpath Exception +GPL-2.0-only WITH Classpath-exception-2.0 GNU General Public License, version 2 (GPL2), with the classpath exception GPL-2.0-only WITH Classpath-exception-2.0 https://openjdk.java.net/legal/gplv2+ce.html GPL-2.0-only WITH Classpath-exception-2.0 https://openjdk.org/legal/gplv2+ce.html diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/SpdxLicensesTest.java b/src/test/java/org/apache/maven/plugin/resources/remote/SpdxLicensesTest.java index 81493ec..c13617b 100644 --- a/src/test/java/org/apache/maven/plugin/resources/remote/SpdxLicensesTest.java +++ b/src/test/java/org/apache/maven/plugin/resources/remote/SpdxLicensesTest.java @@ -63,6 +63,13 @@ class SpdxLicensesTest { assertEquals("EPL-2.0", spdx.id("Some name", "https://www.eclipse.org/legal/epl-v20.html";)); } + @Test + void urlMustNameTheLicense() { + assertEquals("Apache-2.0", spdx.id(null, "http://repository.jboss.org/licenses/apache-2.0.txt";)); + assertNull(spdx.id("BSD", "https://asm.ow2.io/license.html";)); + assertNull(spdx.id(null, "https://jsoup.org/license";)); + } + @Test void idAtEndOfUrl() { assertEquals("MIT", spdx.id(null, "https://spdx.org/licenses/MIT.txt";));
