Skip to content

Commit 83840df

Browse files
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

Lines changed: 122 additions & 53 deletions

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

Lines changed: 2 additions & 2 deletions
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>
Lines changed: 1 addition & 1 deletion
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>
Lines changed: 1 addition & 1 deletion
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>
Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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>
Lines changed: 1 addition & 1 deletion
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>
Lines changed: 1 addition & 1 deletion
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>
Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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>

0 commit comments

Comments
 (0)