Skip to content

Commit

Permalink
further L&N tweaks (sstart using short-form for some licenses)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulk-asert committed Jul 22, 2015
1 parent 9e389cf commit 199aae5
Show file tree
Hide file tree
Showing 21 changed files with 417 additions and 1,319 deletions.
72 changes: 7 additions & 65 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -203,33 +203,11 @@

--------------------------------------------------------------------

ASCIIDOC LICENSE
Asciidoc License

The following file is used within documentation:

src/spec/assets/css/style.css

The MIT License

Copyright (C) 2012-2015 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.
This product uses the style.css from asciidoctor.org within
documentation. The file is available under the MIT License.
For details, see licenses/asciidoc-style-license.txt.

--------------------------------------------------------------------

Expand All @@ -241,11 +219,8 @@ The following file in the optional groovy-groovysh component:

was derived from JLine 2.12, and the following patch:
https://github.com/jline/jline2/issues/90

Copyright (c) 2002-2012, the original author or authors.
This software is distributable under the BSD license. See the terms of the
BSD license in the documentation provided with this software.
http:https://www.opensource.org/licenses/bsd-license.php
JLine2 is made available under a BSD License.
For details, see licenses/jline2-license.

--------------------------------------------------------------------

Expand Down Expand Up @@ -288,40 +263,7 @@ The following files in the optional groovy-jsr223 component:

were derived from reference implementation files developed by Sun in
collaboration with the Groovy community. The reference implementation
files had the following license:

Copyright (c) 2006, Sun Microsystems, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

- Neither the name of the Sun Microsystems, Inc. nor the names of
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
license details can be found in: licenses/jsr223-license.txt

--------------------------------------------------------------------

Expand Down
4 changes: 4 additions & 0 deletions gradle/assemble.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,10 @@ ext.distSpec = copySpec {
}
from('src/tools/org/codehaus/groovy/tools/groovy.ico')
}
into('licenses') {
from 'licenses'
include '*-license.txt'
}
into('embeddable') {
from jarAll.archivePath
from { new File(jarAll.archivePath.parent, "${jarAll.baseName}-${jarAll.appendix}-${jarAll.version}-indy.jar") }
Expand Down
Loading

0 comments on commit 199aae5

Please sign in to comment.