Fix #299, #300: License cleanup

bobbylight · Jul 7, 2019 · 44a2de5 · 44a2de5
1 parent b396431
commit 44a2de5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ the box, it supports syntax highlighting for 40+ programming languages, code fol
 and has add-on libraries for code completion and spell checking.  Syntax highlighting for additional languages
 [can be added](https://github.com/bobbylight/RSyntaxTextArea/wiki) via tools such as [JFlex](http://jflex.de).
 
-RSyntaxTextArea is available under a [modified BSD license](https://github.com/bobbylight/RSyntaxTextArea/blob/master/RSyntaxTextArea/src/main/dist/RSyntaxTextArea.License.txt).
+RSyntaxTextArea is available under a [BSD 3-Clause license](https://github.com/bobbylight/RSyntaxTextArea/blob/master/RSyntaxTextArea/src/main/resources/META-INF/LICENSE).
 For more information, visit [http://bobbylight.github.io/RSyntaxTextArea/](http://bobbylight.github.io/RSyntaxTextArea/).
 
 Available in the [Maven Central repository](http://search.maven.org/#search%7Cga%7C1%7Crsyntaxtextarea%20jar) (`com.fifesoft:rsyntaxtextarea:XXX`).

diff --git a/RSyntaxTextArea/build.gradle b/RSyntaxTextArea/build.gradle
@@ -37,6 +37,7 @@ ext.sharedManifest = manifest {
 		'Specification-Version': version,
 		'Implementation-Title': 'org.fife.ui',
 		'Implementation-Version': version,
+		'Bundle-License': 'BSD-3-Clause',
 		// Not sure why Require-Capability is not being added by the osgi plugin...
 		'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=' + javaVersion + '))"')
 }
@@ -142,8 +143,8 @@ uploadArchives {
 					url 'http://www.fifesoft.com/rsyntaxtextarea/'
 					licenses {
 						license {
-							name 'Modified BSD License'
-							url 'http://fifesoft.com/rsyntaxtextarea/RSyntaxTextArea.License.txt'
+							name 'BSD-3-Clause'
+							url 'https://github.com/bobbylight/RSyntaxTextArea/tree/master/RSyntaxTextArea/src/main/resources/META-INF/LICENSE'
 							distribution 'repo'
 						}
 					}

diff --git a/RSyntaxTextArea/src/main/dist/RSyntaxTextArea.License.txt b/RSyntaxTextArea/src/main/dist/RSyntaxTextArea.License.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2012, Robert Futrell
+Copyright (c) 2019, Robert Futrell
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 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.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/RSyntaxTextArea/src/main/dist/readme.txt b/RSyntaxTextArea/src/main/dist/readme.txt
@@ -16,7 +16,7 @@ robert -at- fifesoft dot com.
 * License
 
   RSyntaxTextArea is licensed under a modified BSD license.  Please see the
-  included RSyntaxTextArea.License.txt file.
+  included src/main/resources/META-INF/LICENSE file.
 
 * Compiling
 

diff --git a/RSyntaxTextArea/src/main/resources/META-INF/LICENSE b/RSyntaxTextArea/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2019, Robert Futrell
+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 author nor the names of its 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 <COPYRIGHT HOLDER> 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.