GUACAMOLE-38: Remove bundled aopalliance license.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/66294518 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/66294518 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/66294518 Branch: refs/heads/staging/1.0.0 Commit: 6629451892f7ae160a0cfdea15b309b80da744fe Parents: cfd1673 Author: Nick Couchman <vn...@apache.org> Authored: Sat Apr 28 08:28:03 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Jun 1 13:40:52 2018 -0400 ---------------------------------------------------------------------- .../src/licenses/LICENSE | 19 ------------------- .../src/licenses/bundled/README | 4 ---- .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 ---- 3 files changed, 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/66294518/extensions/guacamole-auth-quickconnect/src/licenses/LICENSE ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/licenses/LICENSE b/extensions/guacamole-auth-quickconnect/src/licenses/LICENSE index e8788bb..d645695 100644 --- a/extensions/guacamole-auth-quickconnect/src/licenses/LICENSE +++ b/extensions/guacamole-auth-quickconnect/src/licenses/LICENSE @@ -200,22 +200,3 @@ 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. - - -============================================================================== - -APACHE GUACAMOLE SUBCOMPONENTS - -Apache Guacamole includes a number of subcomponents with separate copyright -notices and license terms. Your use of these subcomponents is subject to the -terms and conditions of the following licenses. - - -AOP Alliance (http://aopalliance.sourceforge.net/) --------------------------------------------------- - - Version: 1.0 - From: 'AOP Alliance' (http://aopalliance.sourceforge.net/members.html) - License(s): - Public Domain (bundled/aopalliance-1.0/LICENSE) - http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/66294518/extensions/guacamole-auth-quickconnect/src/licenses/bundled/README ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/licenses/bundled/README b/extensions/guacamole-auth-quickconnect/src/licenses/bundled/README deleted file mode 100644 index 47ba19d..0000000 --- a/extensions/guacamole-auth-quickconnect/src/licenses/bundled/README +++ /dev/null @@ -1,4 +0,0 @@ -Apache Guacamole includes a number of subcomponents with separate copyright -notices and license terms. Your use of these subcomponents is subject to the -terms and conditions of their respective licenses, included within this -directory for reference. http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/66294518/extensions/guacamole-auth-quickconnect/src/licenses/bundled/aopalliance-1.0/LICENSE ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/licenses/bundled/aopalliance-1.0/LICENSE b/extensions/guacamole-auth-quickconnect/src/licenses/bundled/aopalliance-1.0/LICENSE deleted file mode 100644 index 8e0e378..0000000 --- a/extensions/guacamole-auth-quickconnect/src/licenses/bundled/aopalliance-1.0/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -From http://aopalliance.sourceforge.net/: - - LICENCE: all the source code provided by AOP Alliance is Public Domain. -