Skip to content

Commit 69f1b17

Browse files
committed
Update test expectations for Maven POMs #1403
Also add extra license rules for sanity Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent 8d00280 commit 69f1b17

17 files changed

Lines changed: 29 additions & 10 deletions
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
http://www.gnu.org/licenses/lgpl.txt
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
license_expression: lgpl-2.0-plus
2+
is_license_reference: yes
3+
relevance: 100
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
license_expression: lgpl-2.1-plus
22
is_license_notice: yes
3+
referenced_filenames:
4+
- /usr/share/common-licenses/LGPL-2.1
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<licenses>
2+
<license>
3+
<name>GNU LESSER GENERAL PUBLIC LICENSE</name>
4+
<url>http://www.gnu.org/licenses/lgpl.txt</url>
5+
</license>
6+
</licenses>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
license_expression: lgpl-2.1-plus
2+
is_license_reference: yes
3+
relevance: 100
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lesser Gnu Public License v2.1
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
license_expression: lgpl-2.1
2+
is_license_reference: yes
3+
relevance: 100

tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"code_view_url": null,
2222
"vcs_url": null,
2323
"copyright": null,
24-
"license_expression": "lgpl-2.0-plus AND ((gpl-1.0-plus AND lgpl-2.1-plus) AND unknown)",
24+
"license_expression": "lgpl-2.0-plus",
2525
"declared_license": [
2626
{
2727
"name": "GNU LESSER GENERAL PUBLIC LICENSE",

tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"code_view_url": null,
2222
"vcs_url": null,
2323
"copyright": null,
24-
"license_expression": "lgpl-2.0-plus AND ((gpl-1.0-plus AND lgpl-2.1-plus) AND unknown)",
24+
"license_expression": "lgpl-2.0-plus",
2525
"declared_license": [
2626
{
2727
"name": "GNU LESSER GENERAL PUBLIC LICENSE",

tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"code_view_url": "http://svn.apache.org/viewvc/mina/tags/1.1.1",
3030
"vcs_url": "svn+http://svn.apache.org/repos/asf/mina/tags/1.1.1",
3131
"copyright": null,
32-
"license_expression": "(apache-2.0 AND unknown) AND apache-2.0",
32+
"license_expression": "apache-2.0",
3333
"declared_license": [
3434
{
3535
"name": "Apache 2.0 License",

0 commit comments

Comments
 (0)