summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2016-08-19 04:03:05 +0000
committerDavid Pursehouse <dpursehouse@collab.net>2016-08-19 04:05:06 +0000
commit34670ba11b72ac95afbe4c7ed0c9ee4080b577f6 (patch)
treefe788a9f687a0e267a95d2baee5d86842444eed4
parentf57d2b8f830710d6e25d501f4dc8d76f2d2e71f2 (diff)
Add correct license for asciidoctor
Change If1ee984c77 introduced asciidoctor, but incorrectly set the license as Apache2. In fact it is licensed under MIT [1]. Add the correct license. [1] https://github.com/asciidoctor/asciidoctor/blob/master/LICENSE.adoc Change-Id: I7301b2efbc25daa48e63cef36259c904574c19a4
-rw-r--r--lib/BUCK1
-rw-r--r--lib/LICENSE-asciidoctor21
-rw-r--r--lib/asciidoctor/BUCK2
3 files changed, 23 insertions, 1 deletions
diff --git a/lib/BUCK b/lib/BUCK
index 978a9c64bb..abcbb74b19 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -7,6 +7,7 @@ define_license(name = 'MPL1.1')
define_license(name = 'PublicDomain')
define_license(name = 'antlr')
define_license(name = 'args4j')
+define_license(name = 'asciidoctor')
define_license(name = 'automaton')
define_license(name = 'bouncycastle')
define_license(name = 'clippy')
diff --git a/lib/LICENSE-asciidoctor b/lib/LICENSE-asciidoctor
new file mode 100644
index 0000000000..d7e3a20c87
--- /dev/null
+++ b/lib/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/lib/asciidoctor/BUCK b/lib/asciidoctor/BUCK
index 66a12c1c78..e6f10b1b4c 100644
--- a/lib/asciidoctor/BUCK
+++ b/lib/asciidoctor/BUCK
@@ -45,7 +45,7 @@ maven_jar(
name = 'asciidoctor',
id = 'org.asciidoctor:asciidoctorj:1.5.0',
sha1 = '192df5660f72a0fb76966dcc64193b94fba65f99',
- license = 'Apache2.0',
+ license = 'asciidoctor',
visibility = [],
attach_source = False,
)