Update software license

Ortus-Solutions · Feb 14, 2024 · 4990709 · 4990709
1 parent 01230e8
commit 4990709
Show file tree

Hide file tree

Showing 6 changed files with 335 additions and 457 deletions.
diff --git a/build/brew-template.rb b/build/brew-template.rb
@@ -3,7 +3,7 @@ class Commandbox < Formula
   homepage "https://www.ortussolutions.com/products/commandbox"
   url "@repoPRDURL@/ortussolutions/commandbox/@stable-version@/commandbox-bin-@stable-version@.zip"
   sha256 "@stable-sha256@"
-  license "LGPL-3.0-or-later"
+  license "Apache-2.0"
 
   head do
     url "@repoURL@/ortussolutions/commandbox/@version@/commandbox-bin-@version@.zip?build=@buildnumber@"

diff --git a/license.txt b/license.txt
@@ -1,165 +1,22 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+********************************************************************************
+Copyright Since 2014 CommandBox CLI by Ortus Solutions, Corp
+www.ortussolutions.com
+********************************************************************************
+CommandBox is open source. However, if you use this product please know that it is bound to the following License.
+If you use CommandBox, please make mention of it in your code or web site or add a Powered By CommandBox icon.
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Apache License, Version 2.0
 
+Copyright Since [2014] [Ortus Solutions,Corp]
 
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
+Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
 
-  0. Additional Definitions.
+ http://www.apache.org/licenses/LICENSE-2.0
 
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/readme.md b/readme.md
@@ -61,11 +61,11 @@ And constructed with the following guidelines:
 
 ## COMMANDBOX LICENSE
 
-CommandBox is open source and bound to the LGPL v3 GNU LESSER GENERAL PUBLIC LICENSE Copyright & TradeMark since 2014, Ortus Solutions, Corp
+CommandBox is open source and bound to the Apache License, Version 2.0 Copyright & TradeMark since 2014, Ortus Solutions, Corp
 
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify it under the terms of the Apache License as published by the Apache Software Foundation.
 
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the APACHE LICENSE for more details.
 
 ## CREDITS & CONTRIBUTIONS
 

diff --git a/src/java/cliloader/NonClosingInputStream.java b/src/java/cliloader/NonClosingInputStream.java
@@ -2,82 +2,81 @@
  * Copyright (C) 2012 Ortus Solutions, Corp
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
+ * modify it under the terms of the APACHE LICENSE, VERSION 2.0
+ * as published by the Apache Software Foundation.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * APACHE LICENSE for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
+ * You should have received a copy of the APACHE LICENSE, VERSION 2.0
+ * along with this library.
  */
 package cliloader;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-public class NonClosingInputStream extends InputStream{
-	private final boolean		closeWrapped;
-	private final InputStream	in;
+public class NonClosingInputStream extends InputStream {
+	private final boolean closeWrapped;
+	private final InputStream in;
 
-	public NonClosingInputStream( final InputStream in ){
-		this( in, false );
+	public NonClosingInputStream(final InputStream in) {
+		this(in, false);
 	}
 
-	public NonClosingInputStream( final InputStream in,
-			final boolean closeWrapped ){
+	public NonClosingInputStream(final InputStream in,
+			final boolean closeWrapped) {
 		this.in = in;
 		this.closeWrapped = closeWrapped;
 	}
 
 	@Override
-	public int available() throws IOException{
+	public int available() throws IOException {
 		return this.in.available();
 	}
 
 	@Override
-	public void close() throws IOException{
-		if( this.closeWrapped ) {
+	public void close() throws IOException {
+		if (this.closeWrapped) {
 			this.in.close();
 		}
 	}
 
 	@Override
-	public synchronized void mark( final int readlimit ){
-		this.in.mark( readlimit );
+	public synchronized void mark(final int readlimit) {
+		this.in.mark(readlimit);
 	}
 
 	@Override
-	public boolean markSupported(){
+	public boolean markSupported() {
 		return this.in.markSupported();
 	}
 
 	@Override
-	public int read() throws IOException{
+	public int read() throws IOException {
 		return this.in.read();
 	}
 
 	@Override
-	public int read( final byte[] b ) throws IOException{
-		return this.in.read( b );
+	public int read(final byte[] b) throws IOException {
+		return this.in.read(b);
 	}
 
 	@Override
-	public int read( final byte[] b, final int off, final int len )
-			throws IOException{
-		return this.in.read( b, off, len );
+	public int read(final byte[] b, final int off, final int len)
+			throws IOException {
+		return this.in.read(b, off, len);
 	}
 
 	@Override
-	public synchronized void reset() throws IOException{
+	public synchronized void reset() throws IOException {
 		this.in.reset();
 	}
 
 	@Override
-	public long skip( final long n ) throws IOException{
-		return this.in.skip( n );
+	public long skip(final long n) throws IOException {
+		return this.in.skip(n);
 	}
 }