Merge pull request #2773 from softsense/issue-2637-allow-license-rules-to-require-the-presence-of-certain-defining-keywords

Allow license rules to require the presence of certain defining keywords

Author: pombredanne

AUTHORS.rst

@@ -0,0 +1 @@
+This SDK is distributed under the Apache License, Version 2.0, see LICENSE for more information.

CHANGELOG.rst

@@ -0,0 +1,3 @@
+license_expression: apache-2.0
+is_license_notice: yes
+relevance: 100

docs/source/how-to-guides/add_new_license_detection_rule.rst

@@ -1,6 +1,6 @@
 <licenses>
         <license>
-            <name>Apache License 2.0</name>
+            <name>{{Apache License 2.0}}</name>
             <url>http://repository.jboss.org/licenses/apache-2.0.txt</url>
             <distribution>repo</distribution>
         </license>

src/licensedcode/data/rules/apache-2.0_1026.RULE

@@ -1 +1 @@
-Code is released under the [Apache 2.0 license](LICENSE). This `README.md` file and the [`CONTRIBUTING.md`](CONTRIBUTING.md) file are licensed under the Creative Commons Attribution 4.0 International License under the terms and conditions set forth in the file [`LICENSE.docs`](LICENSE.docs). You may obtain a duplicate copy of the same license, titled CC BY-SA 4.0, at http://creativecommons.org/licenses/by-sa/4.0/.
+Code is released under the [{{Apache 2.0}} license](LICENSE). This `README.md` file and the [`CONTRIBUTING.md`](CONTRIBUTING.md) file are licensed under the {{Creative Commons Attribution 4.0 International License}} under the terms and conditions set forth in the file [`LICENSE.docs`](LICENSE.docs). You may obtain a duplicate copy of the same license, titled CC BY-SA 4.0, at http://creativecommons.org/licenses/by-sa/4.0/.

src/licensedcode/data/rules/apache-2.0_1026.yml

@@ -1,11 +1,11 @@
 <licenses>
     <license>
-      <name>The Apache Software License, Version 2.0</name>
+      <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>Eclipse Public License - v 2.0</name>
+      <name>{{Eclipse Public License}} - v 2.0</name>
       <url>http://www.eclipse.org/legal/epl-v20.html</url>
       <distribution>repo</distribution>
     </license>

src/licensedcode/data/rules/apache-2.0_571.RULE

@@ -1,11 +1,11 @@
 <licenses>
     <license>
-      <name>The Apache Software License, Version 2.0</name>
+      <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>Eclipse Public License - v 2.0</name>
+      <name>{{Eclipse Public License - v 2.0}}</name>
       <url>http://www.eclipse.org/legal/epl-v20.html</url>
       <distribution>repo</distribution>
     </license>

src/licensedcode/data/rules/apache-2.0_and_cc-by-sa-4.0_2.RULE

@@ -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>
+<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>