Skip to content

Commit 83840df

Browse files
mromboutmrombout
committed
Fix false positive of apache-2.0
Signed-off-by: Mike Rombout <mike.rombout@elastisys.com>
1 parent a9a85a0 commit 83840df

11 files changed

+122
-53
lines changed

‎src/licensedcode/data/rules/apache-2.0_or_epl-2.0_1.RULE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<licenses>
22
<license>
3-
<name>The Apache Software License, Version 2.0</name>
3+
<name>{{The Apache Software License}}, Version 2.0</name>
44
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
55
<distribution>repo</distribution>
66
</license>
77
<license>
8-
<name>Eclipse Public License - v 2.0</name>
8+
<name>{{Eclipse Public License}} - v 2.0</name>
99
<url>http://www.eclipse.org/legal/epl-v20.html</url>
1010
<distribution>repo</distribution>
1111
</license>

‎src/licensedcode/data/rules/apache-2.0_or_gpl-1.0-plus_3.RULE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<licenses><license><name>The Apache Software License, Version 2.0</name><url>http://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license><license><name>GNU Lesser General Public License (LGPL), Version 2.1</name><url>http://www.fsf.org/licensing/licenses/lgpl.txt</url><distribution>repo</distribution></license></licenses>
1+
<licenses><license><name>The {{Apache Software License}}, Version 2.0</name><url>http://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license><license><name>{{GNU Lesser General Public License}} (LGPL), Version 2.1</name><url>http://www.fsf.org/licensing/licenses/lgpl.txt</url><distribution>repo</distribution></license></licenses>

‎src/licensedcode/data/rules/apache-2.0_or_gpl-1.0-plus_4.RULE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<licenses><license><name>The Apache Software License, Version 2.0</name><url>https://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license><license><name>GNU Lesser General Public License (LGPL), Version 2.1</name><url>http://www.fsf.org/licensing/licenses/lgpl.txt</url><distribution>repo</distribution></license></licenses>
1+
<licenses><license><name>The {{Apache Software License}}, Version 2.0</name><url>https://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license><license><name>{{GNU Lesser General Public License}} (LGPL), Version 2.1</name><url>http://www.fsf.org/licensing/licenses/lgpl.txt</url><distribution>repo</distribution></license></licenses>

‎src/licensedcode/data/rules/apache-2.0_or_gpl-1.0-plus_5.RULE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<!-- Licensing: ASL or GPL -->
2-
<licenses><license><name>The Apache Software License, Version 2.0</name><url>https://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license><license><name>GNU Lesser General Public License (LGPL), Version 2.1</name><url>http://www.fsf.org/licensing/licenses/lgpl.txt</url><distribution>repo</distribution></license></licenses>
2+
<licenses><license><name>The {{Apache Software License}}, Version 2.0</name><url>https://www.apache.org/licenses/LICENSE-2.0.txt</url><distribution>repo</distribution></license><license><name>{{GNU Lesser General Public License}} (LGPL), Version 2.1</name><url>http://www.fsf.org/licensing/licenses/lgpl.txt</url><distribution>repo</distribution></license></licenses>

‎src/licensedcode/data/rules/apache-2.0_or_gpl-2.0-plus_with_classpath-exception-2.0_7.RULE

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<licenses>
22
<license>
3-
<name>Apache License, Version 2.0</name>
3+
<name>{{Apache License}}, Version 2.0</name>
44
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
55
<distribution>repo</distribution>
66
</license>
77
<license>
8-
<name>GNU General Public License (GPL) version 2, or any later version</name>
8+
<name>{{GNU General Public License}} (GPL) version 2, or any later version</name>
99
<url>https://www.gnu.org/licenses/</url>
1010
<distribution>repo</distribution>
1111
</license>
1212
<license>
13-
<name>GPLv2 with Classpath exception</name>
13+
<name>{{GPLv2}} with {{Classpath exception}}</name>
1414
<url>https://www.gnu.org/software/classpath/license.html</url>
1515
<distribution>repo</distribution>
1616
</license>

‎src/licensedcode/data/rules/apache-2.0_url_12.RULE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<licenses> <license> <name>Apache License, Version 2.0</name> <url>https://www.apache.org/licenses/LICENSE-2.0</url> <distribution>repo</distribution> </license> </licenses>
1+
<licenses> <license> <name>{{Apache License}}, Version 2.0</name> <url>https://www.apache.org/licenses/LICENSE-2.0</url> <distribution>repo</distribution> </license> </licenses>

‎src/licensedcode/data/rules/apache-2.0_url_13.RULE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<licenses> <license> <name>Apache License, Version 2.0</name> <url>https://apache.org/licenses/LICENSE-2.0</url> <distribution>repo</distribution> </license> </licenses>
1+
<licenses> <license> <name>{{Apache License}}, Version 2.0</name> <url>https://apache.org/licenses/LICENSE-2.0</url> <distribution>repo</distribution> </license> </licenses>

‎src/licensedcode/data/rules/bsd-new_58.RULE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<licenses>
22
<license>
3-
<name>Berkeley Software Distribution (BSD) License</name>
3+
<name>{{Berkeley Software Distribution (BSD) License}}</name>
44
<url>http://www.opensource.org/licenses/bsd-license.html</url>
55
</license>
66
</licenses>

‎src/licensedcode/data/rules/epl-1.0_or_lgpl-2.1-plus_4.RULE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<licenses>
22
<license>
3-
<name>Eclipse Public License 1.0</name>
3+
<name>{{Eclipse Public License 1.0}}</name>
44
<url>http://www.eclipse.org/org/documents/epl-v10.php</url>
55
<distribution>Manual</distribution>
66
</license>
77
<license>
8-
<name>GNU Lesser GPL 2.1</name>
8+
<name>{{GNU Lesser GPL 2.1}}</name>
99
<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
1010
<distribution>manual</distribution>
1111
</license>

‎src/licensedcode/data/rules/epl-1.0_or_lgpl-2.1-plus_5.RULE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<licenses>
22
<license>
3-
<name>Eclipse Public License 1.0</name>
3+
<name>{{Eclipse Public License 1.0}}</name>
44
<url>http://www.eclipse.org/org/documents/epl-v10.php</url>
55
<distribution>Manual</distribution>
66
</license>
77
<license>
8-
<name>GNU Lesser GPL 2.1</name>
8+
<name>{{GNU Lesser GPL 2.1}}</name>
99
<url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
1010
<distribution>manual</distribution>
1111
</license>

‎tests/licensedcode/data/datadriven/lic1/jenkinsci-role-strategy-plugin.txt

+107-38
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,109 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
7-
<groupId>io.jenkins.systemgroovy.demo</groupId>
8-
<artifactId>parent</artifactId>
9-
<name>role-strategy-plugin-slowdown-config</name>
10-
<description>Configuration to view slowdown in the plugin</description>
11-
<version>1.0-SNAPSHOT</version>
12-
13-
<developers>
14-
<developer>
15-
<name>Oleg Nenashev</name>
16-
<organization>Jenkins project</organization>
17-
<organizationUrl>https://jenkins.io</organizationUrl>
18-
</developer>
19-
</developers>
20-
21-
<licenses>
22-
<license>
23-
<name>The MIT License (MIT)</name>
24-
<url>http://opensource.org/licenses/MIT</url>
25-
<distribution>repo</distribution>
26-
</license>
27-
</licenses>
28-
29-
<modules>
30-
<module>init_scripts</module>
31-
</modules>
32-
33-
<repositories>
34-
<repository>
35-
<id>repo.jenkins-ci.org</id>
36-
<url>https://repo.jenkins-ci.org/public/</url>
37-
</repository>
38-
</repositories>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
393

4+
<parent>
5+
<groupId>org.jenkins-ci.plugins</groupId>
6+
<artifactId>plugin</artifactId>
7+
<version>4.18</version>
8+
<relativePath />
9+
</parent>
10+
11+
<artifactId>role-strategy</artifactId>
12+
<packaging>hpi</packaging>
13+
<version>${revision}${changelist}</version>
14+
<name>Role-based Authorization Strategy</name>
15+
<url>https://github.com/jenkinsci/role-strategy-plugin</url>
16+
17+
<scm>
18+
<connection>scm:git:ssh://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
19+
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}-plugin.git</developerConnection>
20+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
21+
<tag>${scmTag}</tag>
22+
</scm>
23+
24+
<developers>
25+
<developer>
26+
<id>tmaurel</id>
27+
<name>Thomas Maurel</name>
28+
<timezone>+1</timezone>
29+
</developer>
30+
<developer>
31+
<id>rseguy</id>
32+
<name>Romain Seguy</name>
33+
<timezone>+1</timezone>
34+
</developer>
35+
<developer>
36+
<name>Oleg Nenashev</name>
37+
<id>oleg_nenashev</id>
38+
<email>o.v.nenashev@gmail.com</email>
39+
</developer>
40+
</developers>
41+
42+
<properties>
43+
<revision>3.2.1</revision>
44+
<changelist>-SNAPSHOT</changelist>
45+
<jenkins.version>2.222.4</jenkins.version>
46+
<java.level>8</java.level>
47+
<useBeta>true</useBeta>
48+
</properties>
49+
50+
<repositories>
51+
<repository>
52+
<id>repo.jenkins-ci.org</id>
53+
<url>https://repo.jenkins-ci.org/public/</url>
54+
</repository>
55+
</repositories>
56+
57+
<pluginRepositories>
58+
<pluginRepository>
59+
<id>repo.jenkins-ci.org</id>
60+
<url>https://repo.jenkins-ci.org/public/</url>
61+
</pluginRepository>
62+
</pluginRepositories>
63+
64+
<licenses>
65+
<license>
66+
<name>MIT License</name>
67+
<url>https://opensource.org/licenses/MIT</url>
68+
<distribution>repo</distribution>
69+
</license>
70+
</licenses>
71+
72+
<dependencyManagement>
73+
<dependencies>
74+
<dependency>
75+
<groupId>io.jenkins.tools.bom</groupId>
76+
<artifactId>bom-2.222.x</artifactId>
77+
<version>887.vae9c8ac09ff7</version>
78+
<scope>import</scope>
79+
<type>pom</type>
80+
</dependency>
81+
</dependencies>
82+
</dependencyManagement>
83+
84+
<dependencies>
85+
<dependency>
86+
<groupId>org.jenkins-ci.plugins</groupId>
87+
<artifactId>matrix-auth</artifactId>
88+
</dependency>
89+
<dependency>
90+
<groupId>io.jenkins.plugins</groupId>
91+
<artifactId>caffeine-api</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.jenkins-ci.plugins</groupId>
95+
<artifactId>cloudbees-folder</artifactId>
96+
<scope>test</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>io.jenkins</groupId>
100+
<artifactId>configuration-as-code</artifactId>
101+
<optional>true</optional>
102+
</dependency>
103+
<dependency>
104+
<groupId>io.jenkins.configuration-as-code</groupId>
105+
<artifactId>test-harness</artifactId>
106+
<scope>test</scope>
107+
</dependency>
108+
</dependencies>
40109
</project>

0 commit comments

Comments
 (0)