You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2020/06/29 13:04:54 UTC
[incubator-daffodil] branch master updated: Fix Scala license
information bundled in daffodil-lib jar
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 0ddaea2 Fix Scala license information bundled in daffodil-lib jar
0ddaea2 is described below
commit 0ddaea2c29bbed35e2a4e62233545bb9357db68d
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jun 25 09:27:07 2020 -0400
Fix Scala license information bundled in daffodil-lib jar
Change missed in 67f5fb010432dc27d97a90a1c11382d517470edb
Also add LICENSE/NOTICE to daffodil-cli jar. Although this jar isn't
distributed via maven repositories, it is packaged in binary helpers,
and so should contain license information.
DAFFODIL-2355
---
.../src/main/resources/META-INF/LICENSE | 117 ---------------------
.../src/main/resources/META-INF/NOTICE | 0
daffodil-lib/src/main/resources/META-INF/LICENSE | 35 ------
daffodil-lib/src/main/resources/META-INF/NOTICE | 16 +++
4 files changed, 16 insertions(+), 152 deletions(-)
diff --git a/daffodil-lib/src/main/resources/META-INF/LICENSE b/daffodil-cli/src/main/resources/META-INF/LICENSE
similarity index 65%
copy from daffodil-lib/src/main/resources/META-INF/LICENSE
copy to daffodil-cli/src/main/resources/META-INF/LICENSE
index 0636fdf..d645695 100644
--- a/daffodil-lib/src/main/resources/META-INF/LICENSE
+++ b/daffodil-cli/src/main/resources/META-INF/LICENSE
@@ -200,120 +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 DAFFODIL SUBCOMPONENTS:
-
-The Apache Daffodil (incubating) project contains subcomponents with separate
-copyright notices and license terms. Your use of the source code for these
-subcomponents is subject to the terms and conditions of the following licenses.
-
-
- This product bundles source from 'Passera', including all files under the
- following directories:
- - passera/
- - passera/
- These files are available under the BSD-2-Clause license:
-
- Copyright (c) 2011-2013, Nate Nystrom
- 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.
-
- 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
-
- This product bundles source from 'Scala', including the following files:
- - org/apache/daffodil/util/UniquenessCache.class
- These files are available under the BSD-3-Clause licnese:
-
- Copyright (c) 2002- EPFL
- Copyright (c) 2011- Lightbend, Inc.
-
- 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 EPFL 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
- This product bundles material copied or derived from W3C, including the
- following files:
- - org/apache/daffodil/xsd/XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd)
- - org/apache/daffodil/xsd/XMLSchema.xsd (https://www.w3.org/2001/XMLSchema.xsd)
- - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd)
- - org/apache/daffodil/xsd/datatypes.dtd (https://www.w3.org/2001/datatypes.dtd)
- - org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd (https://www.w3.org/2001/XMLSchema.dtd)
- These files are available under the W3C Software and Document Licnese:
-
- By obtaining and/or copying this work, you (the licensee) agree that you have
- read, understood, and will comply with the following terms and conditions.
-
- Permission to copy, modify, and distribute this work, with or without
- modification, for any purpose and without fee or royalty is hereby granted,
- provided that you include the following on ALL copies of the work or portions
- thereof, including modifications:
-
- * The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
-
- * Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the W3C Software and Document Short Notice should be
- included.
-
- * Notice of any changes or modifications, through a copyright statement on the
- new code or document such as "This software or document includes material
- copied from or derived from [title and URI of the W3C document]. Copyright ©
- [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
-
- Disclaimers
-
- THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
- REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
- LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
- PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY
- THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-
- The name and trademarks of copyright holders may NOT be used in advertising
- or publicity pertaining to the work without specific, written prior
- permission. Title to copyright in this work will at all times remain with
- copyright holders.
diff --git a/daffodil-lib/src/main/resources/META-INF/NOTICE b/daffodil-cli/src/main/resources/META-INF/NOTICE
similarity index 100%
copy from daffodil-lib/src/main/resources/META-INF/NOTICE
copy to daffodil-cli/src/main/resources/META-INF/NOTICE
diff --git a/daffodil-lib/src/main/resources/META-INF/LICENSE b/daffodil-lib/src/main/resources/META-INF/LICENSE
index 0636fdf..8df56fa 100644
--- a/daffodil-lib/src/main/resources/META-INF/LICENSE
+++ b/daffodil-lib/src/main/resources/META-INF/LICENSE
@@ -238,41 +238,6 @@ subcomponents is subject to the terms and conditions of the following licenses.
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.
- This product bundles source from 'Scala', including the following files:
- - org/apache/daffodil/util/UniquenessCache.class
- These files are available under the BSD-3-Clause licnese:
-
- Copyright (c) 2002- EPFL
- Copyright (c) 2011- Lightbend, Inc.
-
- 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 EPFL 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
This product bundles material copied or derived from W3C, including the
following files:
- org/apache/daffodil/xsd/XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd)
diff --git a/daffodil-lib/src/main/resources/META-INF/NOTICE b/daffodil-lib/src/main/resources/META-INF/NOTICE
index 7b46610..7e289ff 100644
--- a/daffodil-lib/src/main/resources/META-INF/NOTICE
+++ b/daffodil-lib/src/main/resources/META-INF/NOTICE
@@ -8,3 +8,19 @@ Based on source code originally developed by
- The Univerisity of Illinois National Center for Supercomputing Applications (http://www.ncsa.illinois.edu/)
- Tresys Technology (http://www.tresys.com/)
- International Business Machines Corporation (http://www.ibm.com)
+
+The following NOTICE information applies to components distributed with this project:
+
+This product includes derived works from Scala
+ Scala
+ Copyright (c) 2002-2020 EPFL
+ Copyright (c) 2011-2020 Lightbend, Inc.
+
+ Scala includes software developed at
+ LAMP/EPFL (https://lamp.epfl.ch/) and
+ Lightbend, Inc. (https://www.lightbend.com/).
+
+ The derived work is adapted from scala/src/library/scala/Symbol.scala:
+ https://github.com/scala/scala/blob/904e3a5d2b9616b9c533d77d0c51652b138e8659/src/library/scala/Symbol.scala
+ and can be found in:
+ daffodil-lib/src/main/scala/org/apache/daffodil/util/UniquenessCache.scala