clean up license/notice files some more

evandun · Jul 16, 2015 · 3df7d72 · 3df7d72
1 parent 730652f
commit 3df7d72
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 13 deletions.
diff --git a/LICENSE b/LICENSE
@@ -204,6 +204,21 @@
 ---------------------------------------------------------------------
 JSR223 License
 
+The following file in the optional groovy-groovysh component:
+
+ org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+
+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
+
+---------------------------------------------------------------------
+JSR223 License
+
 The following files in the optional groovy-jsr223 component:
 
  src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java

diff --git a/NOTICE b/NOTICE
@@ -7,3 +7,7 @@ The Apache Software Foundation (http:https://www.apache.org/).
 This product includes/uses source files adapted from the JSR-223 reference
 implementation which has the following notice
 Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+
+This product includes/uses a source file adapted from the JLine project
+which is distributable under the BSD license and has the following notice
+Copyright (c) 2002-2012, the original author or authors.
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
@@ -290,6 +290,21 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
+---------------------------------------------------------------------
+JSR223 License
+
+The following file in the optional groovy-groovysh component:
+
+ org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+
+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://www.opensource.org/licenses/bsd-license.php
+
 ---------------------------------------------------------------------
 JLine License
 

diff --git a/licenses/LICENSE-JARJAR b/licenses/LICENSE-JARJAR
@@ -262,6 +262,21 @@ THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------
 JSR223 License
 
+The following file in the optional groovy-groovysh component:
+
+ org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+
+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
+
+---------------------------------------------------------------------
+JSR223 License
+
 The following files in the optional groovy-jsr223 component:
 
  src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java

diff --git a/licenses/src/jline-patch.txt b/licenses/src/jline-patch.txt
@@ -0,0 +1,13 @@
+JSR223 License
+
+The following file in the optional groovy-groovysh component:
+
+ org.codehaus.groovy.tools.shell.completion/FileNameCompleter.java
+
+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
diff --git a/...ovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/...ovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
@@ -1,4 +1,14 @@
 /*
+ * Adapted from JLine which has the following license
+ *
+ * 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
+ *
+ * Subsequent modifications by the Groovy community have been done under the Apache License v2:
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
@@ -19,20 +29,9 @@
 package org.codehaus.groovy.tools.shell.completion
 
 import jline.console.completer.Completer
+import jline.internal.Configuration
 
-/*
- * 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
- */
-
-
-import jline.internal.Configuration;
-
-import static jline.internal.Preconditions.checkNotNull;
+import static jline.internal.Preconditions.checkNotNull
 
 /**
  * PATCHED copy from jline 2.12, with