Skip to content

Commit 8650671

Browse files
Optimize license information in pom.xml
- the maven pom.xml documentation recommends to use the SPDX identifier as license name - the link to the LGPL 2.1 license should point to license itself, not to an overview page (reported by @TorstenKruse) Closes: #1355
1 parent 7b9322d commit 8650671

File tree

4 files changed

+80
-40
lines changed

4 files changed

+80
-40
lines changed

pom-jna-jpms.xml

+20-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,26 @@
1414
<url>https://github.com/java-native-access/jna</url>
1515

1616
<licenses>
17-
<license>
18-
<name>LGPL, version 2.1</name>
19-
<url>http://www.gnu.org/licenses/licenses.html</url>
20-
<distribution>repo</distribution>
21-
</license>
22-
<license>
23-
<name>Apache License v2.0</name>
24-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
25-
<distribution>repo</distribution>
26-
</license>
17+
<license>
18+
<name>LGPL-2.1-or-later</name>
19+
<url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
20+
<distribution>repo</distribution>
21+
<comments>
22+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
23+
later, or the Apache License, version 2.0. You can freely decide which
24+
license you want to apply to the project.
25+
</comments>
26+
</license>
27+
<license>
28+
<name>Apache-2.0</name>
29+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
30+
<distribution>repo</distribution>
31+
<comments>
32+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
33+
later, or the Apache License, version 2.0. You can freely decide which
34+
license you want to apply to the project.
35+
</comments>
36+
</license>
2737
</licenses>
2838

2939
<scm>

pom-jna-platform-jpms.xml

+20-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,26 @@
1414
<url>https://github.com/java-native-access/jna</url>
1515

1616
<licenses>
17-
<license>
18-
<name>LGPL, version 2.1</name>
19-
<url>http://www.gnu.org/licenses/licenses.html</url>
20-
<distribution>repo</distribution>
21-
</license>
22-
<license>
23-
<name>Apache License v2.0</name>
24-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
25-
<distribution>repo</distribution>
26-
</license>
17+
<license>
18+
<name>LGPL-2.1-or-later</name>
19+
<url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
20+
<distribution>repo</distribution>
21+
<comments>
22+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
23+
later, or the Apache License, version 2.0. You can freely decide which
24+
license you want to apply to the project.
25+
</comments>
26+
</license>
27+
<license>
28+
<name>Apache-2.0</name>
29+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
30+
<distribution>repo</distribution>
31+
<comments>
32+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
33+
later, or the Apache License, version 2.0. You can freely decide which
34+
license you want to apply to the project.
35+
</comments>
36+
</license>
2737
</licenses>
2838

2939
<scm>

pom-jna-platform.xml

+20-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,26 @@
1414
<url>https://github.com/java-native-access/jna</url>
1515

1616
<licenses>
17-
<license>
18-
<name>LGPL, version 2.1</name>
19-
<url>http://www.gnu.org/licenses/licenses.html</url>
20-
<distribution>repo</distribution>
21-
</license>
22-
<license>
23-
<name>Apache License v2.0</name>
24-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
25-
<distribution>repo</distribution>
26-
</license>
17+
<license>
18+
<name>LGPL-2.1-or-later</name>
19+
<url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
20+
<distribution>repo</distribution>
21+
<comments>
22+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
23+
later, or the Apache License, version 2.0. You can freely decide which
24+
license you want to apply to the project.
25+
</comments>
26+
</license>
27+
<license>
28+
<name>Apache-2.0</name>
29+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
30+
<distribution>repo</distribution>
31+
<comments>
32+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
33+
later, or the Apache License, version 2.0. You can freely decide which
34+
license you want to apply to the project.
35+
</comments>
36+
</license>
2737
</licenses>
2838

2939
<scm>

pom-jna.xml

+20-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,26 @@
1414
<url>https://github.com/java-native-access/jna</url>
1515

1616
<licenses>
17-
<license>
18-
<name>LGPL, version 2.1</name>
19-
<url>http://www.gnu.org/licenses/licenses.html</url>
20-
<distribution>repo</distribution>
21-
</license>
22-
<license>
23-
<name>Apache License v2.0</name>
24-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
25-
<distribution>repo</distribution>
26-
</license>
17+
<license>
18+
<name>LGPL-2.1-or-later</name>
19+
<url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
20+
<distribution>repo</distribution>
21+
<comments>
22+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
23+
later, or the Apache License, version 2.0. You can freely decide which
24+
license you want to apply to the project.
25+
</comments>
26+
</license>
27+
<license>
28+
<name>Apache-2.0</name>
29+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
30+
<distribution>repo</distribution>
31+
<comments>
32+
Java Native Access (JNA) is licensed under the LGPL, version 2.1 or
33+
later, or the Apache License, version 2.0. You can freely decide which
34+
license you want to apply to the project.
35+
</comments>
36+
</license>
2737
</licenses>
2838

2939
<scm>

0 commit comments

Comments
 (0)