Merge "Make the basicTextFormattingWorks() test more strict" into stable-2.12
diff --git a/lib/asciidoctor/BUCK b/lib/asciidoctor/BUCK
index b57373a..0b23fdf 100644
--- a/lib/asciidoctor/BUCK
+++ b/lib/asciidoctor/BUCK
@@ -1,5 +1,6 @@
include_defs('//bucklets/maven_jar.bucklet')
+define_license('asciidoctor')
define_license('jruby')
java_library(
@@ -15,7 +16,7 @@
name = 'asciidoctor',
id = 'org.asciidoctor:asciidoctorj:1.5.4.1',
sha1 = 'f7ddfb2bbed2f8da3f9ad0d1a5514f04b4274a5a',
- license = 'Apache2.0',
+ license = 'asciidoctor',
attach_source = False,
)
diff --git a/lib/asciidoctor/LICENSE-asciidoctor b/lib/asciidoctor/LICENSE-asciidoctor
new file mode 100644
index 0000000..d7e3a20
--- /dev/null
+++ b/lib/asciidoctor/LICENSE-asciidoctor
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (C) 2012-2016 Dan Allen, Ryan Waldron and the Asciidoctor Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/main/resources/Documentation/about.md b/src/main/resources/Documentation/about.md
index 2749ff4..6be38e2 100644
--- a/src/main/resources/Documentation/about.md
+++ b/src/main/resources/Documentation/about.md
@@ -59,7 +59,7 @@
<a href="http://www.methods.co.nz/asciidoc/userguide.html">Aciidoc</a>
</td>
<td>
- asciidoctorj: <a href="../../../Documentation/licenses.html#Apache2_0">Apache2.0</a><br/>
+ asciidoctorj: <a href="licenses.html#MIT-asciidoctor">MIT License</a><br/>
jruby: <a href="licenses.html#EPL1_0">Eclipse Public License 1.0</a>
</td>
<td>
diff --git a/src/main/resources/Documentation/licenses.md b/src/main/resources/Documentation/licenses.md
index 4e7b72c..cdb02a8 100644
--- a/src/main/resources/Documentation/licenses.md
+++ b/src/main/resources/Documentation/licenses.md
@@ -94,3 +94,32 @@
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
````
+
+<a id="MIT-asciidoctor">
+MIT License of Asciidoctor
+--------------------------
+
+````
+The MIT License
+
+Copyright (C) 2012-2016 Dan Allen, Ryan Waldron and the Asciidoctor Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+````
+
