From 31a0100c02c3860b8231fc974f8cd9350d0c6333 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 31 Mar 2021 12:36:08 -0700 Subject: [PATCH] GUACAMOLE-1298: Trim down NOTICE files to only those attribution notices that are required. From https://infra.apache.org/licensing-howto.html#bundle-asf-product: > > Modifications to NOTICE > ----------------------- > > The NOTICE file is reserved for a certain subset of legally required > notifications which are not satisfied by either the text of LICENSE or > the presence of licensing information embedded within the bundled > dependency. Aside from Apache-licensed dependencies which supply NOTICE > files of their own, it is uncommon for a dependency to require additions > to NOTICE. > > Copyright notifications which have been relocated, rather than > removed, from source files must be preserved in NOTICE. However, > elements such as the copyright notifications embedded within BSD and MIT > licenses do not need to be duplicated in NOTICE. You can leave those > notices in their original locations. > > It is important to keep NOTICE as brief and simple as possible, as each > addition places a burden on downstream consumers. > > *Do not* add anything to NOTICE which is not legally required. > --- .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../{NOTICE.txt => NOTICE} | 0 .../apache-mina-2.1.3/{NOTICE.txt => NOTICE} | 0 doc/licenses/cas-client-3.4.1/NOTICE | 36 ---------------- doc/licenses/directory-api-2.0.0/NOTICE | 4 +- doc/licenses/generate-license-files.sh | 2 - .../jakarta-validation-api-2.0.2/NOTICE | 11 +++++ .../jakarta-validation-api-2.0.2/NOTICE.md | 43 ------------------- doc/licenses/jaxb-fi-1.2.16/NOTICE | 14 ------ .../jcommander-1.72/{notice.md => NOTICE} | 0 .../joda-time-2.10.3/{NOTICE.txt => NOTICE} | 0 .../jose4j-0.5.5/{NOTICE.txt => NOTICE} | 0 doc/licenses/mybatis-3.2.8/NOTICE | 23 ---------- doc/licenses/mybatis-guice-3.6/NOTICE | 23 ---------- 25 files changed, 12 insertions(+), 144 deletions(-) rename doc/licenses/apache-commons-beanutils-1.7.0/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-chain-1.2/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-codec-1.12/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-collections-3.2/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-collections-4.3/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-configuration-1.5/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-digester-1.8/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-lang-2.3/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-lang-3.4/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-lang-3.9/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-logging-1.1.1/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-pool-1.5.4/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-commons-pool-2.6.2/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/apache-mina-2.1.3/{NOTICE.txt => NOTICE} (100%) create mode 100644 doc/licenses/jakarta-validation-api-2.0.2/NOTICE delete mode 100644 doc/licenses/jakarta-validation-api-2.0.2/NOTICE.md rename doc/licenses/jcommander-1.72/{notice.md => NOTICE} (100%) rename doc/licenses/joda-time-2.10.3/{NOTICE.txt => NOTICE} (100%) rename doc/licenses/jose4j-0.5.5/{NOTICE.txt => NOTICE} (100%) diff --git a/doc/licenses/apache-commons-beanutils-1.7.0/NOTICE.txt b/doc/licenses/apache-commons-beanutils-1.7.0/NOTICE similarity index 100% rename from doc/licenses/apache-commons-beanutils-1.7.0/NOTICE.txt rename to doc/licenses/apache-commons-beanutils-1.7.0/NOTICE diff --git a/doc/licenses/apache-commons-chain-1.2/NOTICE.txt b/doc/licenses/apache-commons-chain-1.2/NOTICE similarity index 100% rename from doc/licenses/apache-commons-chain-1.2/NOTICE.txt rename to doc/licenses/apache-commons-chain-1.2/NOTICE diff --git a/doc/licenses/apache-commons-codec-1.12/NOTICE.txt b/doc/licenses/apache-commons-codec-1.12/NOTICE similarity index 100% rename from doc/licenses/apache-commons-codec-1.12/NOTICE.txt rename to doc/licenses/apache-commons-codec-1.12/NOTICE diff --git a/doc/licenses/apache-commons-collections-3.2/NOTICE.txt b/doc/licenses/apache-commons-collections-3.2/NOTICE similarity index 100% rename from doc/licenses/apache-commons-collections-3.2/NOTICE.txt rename to doc/licenses/apache-commons-collections-3.2/NOTICE diff --git a/doc/licenses/apache-commons-collections-4.3/NOTICE.txt b/doc/licenses/apache-commons-collections-4.3/NOTICE similarity index 100% rename from doc/licenses/apache-commons-collections-4.3/NOTICE.txt rename to doc/licenses/apache-commons-collections-4.3/NOTICE diff --git a/doc/licenses/apache-commons-configuration-1.5/NOTICE.txt b/doc/licenses/apache-commons-configuration-1.5/NOTICE similarity index 100% rename from doc/licenses/apache-commons-configuration-1.5/NOTICE.txt rename to doc/licenses/apache-commons-configuration-1.5/NOTICE diff --git a/doc/licenses/apache-commons-digester-1.8/NOTICE.txt b/doc/licenses/apache-commons-digester-1.8/NOTICE similarity index 100% rename from doc/licenses/apache-commons-digester-1.8/NOTICE.txt rename to doc/licenses/apache-commons-digester-1.8/NOTICE diff --git a/doc/licenses/apache-commons-lang-2.3/NOTICE.txt b/doc/licenses/apache-commons-lang-2.3/NOTICE similarity index 100% rename from doc/licenses/apache-commons-lang-2.3/NOTICE.txt rename to doc/licenses/apache-commons-lang-2.3/NOTICE diff --git a/doc/licenses/apache-commons-lang-3.4/NOTICE.txt b/doc/licenses/apache-commons-lang-3.4/NOTICE similarity index 100% rename from doc/licenses/apache-commons-lang-3.4/NOTICE.txt rename to doc/licenses/apache-commons-lang-3.4/NOTICE diff --git a/doc/licenses/apache-commons-lang-3.9/NOTICE.txt b/doc/licenses/apache-commons-lang-3.9/NOTICE similarity index 100% rename from doc/licenses/apache-commons-lang-3.9/NOTICE.txt rename to doc/licenses/apache-commons-lang-3.9/NOTICE diff --git a/doc/licenses/apache-commons-logging-1.1.1/NOTICE.txt b/doc/licenses/apache-commons-logging-1.1.1/NOTICE similarity index 100% rename from doc/licenses/apache-commons-logging-1.1.1/NOTICE.txt rename to doc/licenses/apache-commons-logging-1.1.1/NOTICE diff --git a/doc/licenses/apache-commons-pool-1.5.4/NOTICE.txt b/doc/licenses/apache-commons-pool-1.5.4/NOTICE similarity index 100% rename from doc/licenses/apache-commons-pool-1.5.4/NOTICE.txt rename to doc/licenses/apache-commons-pool-1.5.4/NOTICE diff --git a/doc/licenses/apache-commons-pool-2.6.2/NOTICE.txt b/doc/licenses/apache-commons-pool-2.6.2/NOTICE similarity index 100% rename from doc/licenses/apache-commons-pool-2.6.2/NOTICE.txt rename to doc/licenses/apache-commons-pool-2.6.2/NOTICE diff --git a/doc/licenses/apache-mina-2.1.3/NOTICE.txt b/doc/licenses/apache-mina-2.1.3/NOTICE similarity index 100% rename from doc/licenses/apache-mina-2.1.3/NOTICE.txt rename to doc/licenses/apache-mina-2.1.3/NOTICE diff --git a/doc/licenses/cas-client-3.4.1/NOTICE b/doc/licenses/cas-client-3.4.1/NOTICE index 8b26daa03..a699597c4 100644 --- a/doc/licenses/cas-client-3.4.1/NOTICE +++ b/doc/licenses/cas-client-3.4.1/NOTICE @@ -1,38 +1,2 @@ -Licensed to Apereo under one or more contributor license -agreements. See the NOTICE file distributed with this work -for additional information regarding copyright ownership. -Apereo licenses this file to you 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 the following location: - - http://www.apache.org/licenses/LICENSE-2.0 - -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. - This project includes: - AOP alliance under Public Domain - Apache Log4j under The Apache Software License, Version 2.0 - Apache XML Security under The Apache Software License, Version 2.0 - Commons Codec under The Apache Software License, Version 2.0 Jasig CAS Client for Java - Core under Apache License Version 2.0 - Java Servlet API under CDDL + GPLv2 with classpath exception - JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0 - JavaMail API under Common Development and Distribution License (CDDL) v1.0 - JCL 1.1.1 implemented over SLF4J under MIT License - JUnit under Common Public License Version 1.0 - SLF4J API Module under MIT License - SLF4J Simple Binding under MIT License - spring-aop under The Apache Software License, Version 2.0 - spring-asm under The Apache Software License, Version 2.0 - spring-beans under The Apache Software License, Version 2.0 - spring-context under The Apache Software License, Version 2.0 - spring-core under The Apache Software License, Version 2.0 - spring-expression under The Apache Software License, Version 2.0 - spring-test under The Apache Software License, Version 2.0 - diff --git a/doc/licenses/directory-api-2.0.0/NOTICE b/doc/licenses/directory-api-2.0.0/NOTICE index 234f9059a..d4f56e376 100644 --- a/doc/licenses/directory-api-2.0.0/NOTICE +++ b/doc/licenses/directory-api-2.0.0/NOTICE @@ -4,9 +4,7 @@ Copyright 2003-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -jBCrypt 0.4.1 license --------------------------------------------------------------------------------------------------- -jBCrypt is subject to the following license: +This product includes/uses jBCrypt which is subject to the following license: /* * Copyright (c) 2006 Damien Miller diff --git a/doc/licenses/generate-license-files.sh b/doc/licenses/generate-license-files.sh index c402371b0..6486f155a 100755 --- a/doc/licenses/generate-license-files.sh +++ b/doc/licenses/generate-license-files.sh @@ -327,8 +327,6 @@ EOF echo >> "$OUTPUT_DIR/LICENSE" trim_file "$LICENSE_FILE" >> "$OUTPUT_DIR/LICENSE" fi - else - error "No recognizable license file within $LICENSE_INFO_DIR" fi # Copy NOTICE, if provided diff --git a/doc/licenses/jakarta-validation-api-2.0.2/NOTICE b/doc/licenses/jakarta-validation-api-2.0.2/NOTICE new file mode 100644 index 000000000..20468229e --- /dev/null +++ b/doc/licenses/jakarta-validation-api-2.0.2/NOTICE @@ -0,0 +1,11 @@ +# Notices for Eclipse Jakarta Bean Validation + +This content is produced and maintained by the Eclipse Jakarta Bean Validation +project. + +* Project home: https://projects.eclipse.org/projects/ee4j.bean-validation + +## Trademarks + + Jakarta Bean Validation is a trademark of the Eclipse Foundation. + diff --git a/doc/licenses/jakarta-validation-api-2.0.2/NOTICE.md b/doc/licenses/jakarta-validation-api-2.0.2/NOTICE.md deleted file mode 100644 index fede039d4..000000000 --- a/doc/licenses/jakarta-validation-api-2.0.2/NOTICE.md +++ /dev/null @@ -1,43 +0,0 @@ -# Notices for Eclipse Jakarta Bean Validation - -This content is produced and maintained by the Eclipse Jakarta Bean Validation -project. - -* Project home: https://projects.eclipse.org/projects/ee4j.bean-validation - -## Trademarks - - Jakarta Bean Validation is a trademark of the Eclipse Foundation. - -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Declared Project Licenses - -This program and the accompanying materials are made available under the terms -of the Apache License, Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0. - -SPDX-License-Identifier: Apache-2.0 - -## Source Code - -The project maintains the following source code repositories: - - * [The specification repository](https://github.com/eclipse-ee4j/beanvalidation-spec) - * [The API repository](https://github.com/eclipse-ee4j/beanvalidation-api) - * [The TCK repository](https://github.com/eclipse-ee4j/beanvalidation-tck) - -## Third-party Content - -This project leverages the following third party content. - -Test dependencies: - - * [TestNG](https://github.com/cbeust/testng) - Apache License 2.0 - * [JCommander](https://github.com/cbeust/jcommander) - Apache License 2.0 - * [SnakeYAML](https://bitbucket.org/asomov/snakeyaml/src) - Apache License 2.0 - diff --git a/doc/licenses/jaxb-fi-1.2.16/NOTICE b/doc/licenses/jaxb-fi-1.2.16/NOTICE index 7bff4be42..42eedf780 100644 --- a/doc/licenses/jaxb-fi-1.2.16/NOTICE +++ b/doc/licenses/jaxb-fi-1.2.16/NOTICE @@ -9,17 +9,3 @@ project. Eclipse Implementation of JAXB is a trademark of the Eclipse Foundation. -## Copyright - -All content is the property of the respective authors or their employers. For -more information regarding authorship of content, please consult the listed -source code repository logs. - -## Cryptography - -Content may contain encryption software. The country in which you are currently -may have restrictions on the import, possession, and use, and/or re-export to -another country, of encryption software. BEFORE using any encryption software, -please check the country's laws, regulations and policies concerning the import, -possession, or use, and re-export of encryption software, to see if this is -permitted. diff --git a/doc/licenses/jcommander-1.72/notice.md b/doc/licenses/jcommander-1.72/NOTICE similarity index 100% rename from doc/licenses/jcommander-1.72/notice.md rename to doc/licenses/jcommander-1.72/NOTICE diff --git a/doc/licenses/joda-time-2.10.3/NOTICE.txt b/doc/licenses/joda-time-2.10.3/NOTICE similarity index 100% rename from doc/licenses/joda-time-2.10.3/NOTICE.txt rename to doc/licenses/joda-time-2.10.3/NOTICE diff --git a/doc/licenses/jose4j-0.5.5/NOTICE.txt b/doc/licenses/jose4j-0.5.5/NOTICE similarity index 100% rename from doc/licenses/jose4j-0.5.5/NOTICE.txt rename to doc/licenses/jose4j-0.5.5/NOTICE diff --git a/doc/licenses/mybatis-3.2.8/NOTICE b/doc/licenses/mybatis-3.2.8/NOTICE index 929f42e53..35d17fd22 100644 --- a/doc/licenses/mybatis-3.2.8/NOTICE +++ b/doc/licenses/mybatis-3.2.8/NOTICE @@ -4,18 +4,6 @@ iBATIS Copyright 2010 The Apache Software Foundation - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - 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. - OGNL //-------------------------------------------------------------------------- // Copyright (c) 2004, Drew Davidson and Luke Blanshard @@ -55,14 +43,3 @@ Refactored SqlBuilder class (SQL, AbstractSQL) Copyright 2010 Adam Gent - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - 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/doc/licenses/mybatis-guice-3.6/NOTICE b/doc/licenses/mybatis-guice-3.6/NOTICE index f09a57747..328bb03af 100644 --- a/doc/licenses/mybatis-guice-3.6/NOTICE +++ b/doc/licenses/mybatis-guice-3.6/NOTICE @@ -10,29 +10,6 @@ iBATIS Copyright 2010 The Apache Software Foundation - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - 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. - Google Guice Copyright 2010 The Apache Software Foundation - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - 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.