On 01/04/2020 13:10, Gilles Sadowski wrote:
Hello.

Le mer. 1 avr. 2020 à 12:58, <aherb...@apache.org> a écrit :
This is an automated email from the ASF dual-hosted git repository.

aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git

commit 5f0686220dfd6e94b922e076ef6809de3233cdc4
Author: aherbert <aherb...@apache.org>
AuthorDate: Wed Apr 1 09:31:16 2020 +0100

     Added Boost license for derived works in Complex.
---
  LICENSE.txt                                        | 44 ++++++++++++++++++----
  commons-numbers-complex/LICENSE.txt                | 44 ++++++++++++++++++----
My understanding of [1] is that these texts must go to the
     NOTICE
file(s).

I interpret this using the section on 'BUNDLING PERMISSIVELY-LICENSED DEPENDENCIES'

Here it states that we can add the 3rd party license within the LICENSE file.


This page describes 'WHAT ARE REQUIRED THIRD-PARTY NOTICES?' [2]

"Apache releases should contain a copy of each license, usually contained in the LICENSE document. For many licenses this is a sufficient notice. For some licenses some additional notice is required. In many cases, this will be included within the dependent artifact."


So I think that we put the 3rd party notice in LICENSE and then add to NOTICE only if the license text has additional notice requirements. From reading each included licence it appears to me that the LICENSE is all that is required and the 3rd party works have no additional notice requirement.


[2] http://apache.org/legal/resolved.html#required-third-party-notices


Side-note: Files "LICENCE.txt" and "NOTICE.txt" should be renamed
(cf. NUMBERS-146).

I can do this if you like.

Alex


Best,
Gilles

[1] http://www.apache.org/dev/licensing-howto.html

  .../apache/commons/numbers/complex/Complex.java    | 24 +++++++++++-
  3 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 2a5f502..2ae0957 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -206,11 +206,39 @@ Class "org.apache.commons.numbers.complex.Complex" 
contains
  Java code partly ported from the "Freely Distributable Math Library" in C.
  The source files contain the following notice:

- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
+  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+  Developed at SunSoft, a Sun Microsystems, Inc. business.
+  Permission to use, copy, modify, and distribute this
+  software is freely granted, provided that this notice
+  is preserved.
+
+================================================================================
+
+Class "org.apache.commons.numbers.complex.Complex" contains
+Java code partly ported from the "Boost C++ Libraries" <boost/math/complex>.
+The source files contain the following notice:
+
+  Boost Software License - Version 1.0 - August 17th, 2003
+
+  Permission is hereby granted, free of charge, to any person or organization
+  obtaining a copy of the software and accompanying documentation covered by
+  this license (the "Software") to use, reproduce, display, distribute,
+  execute, and transmit the Software, and to prepare derivative works of the
+  Software, and to permit third-parties to whom the Software is furnished to
+  do so, all subject to the following:
+
+  The copyright notices in the Software and this entire statement, including
+  the above license grant, this restriction and the following disclaimer,
+  must be included in all copies of the Software, in whole or in part, and
+  all derivative works of the Software, unless such copies or derivative
+  works are solely in the form of machine-executable object code generated by
+  a source language processor.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
diff --git a/commons-numbers-complex/LICENSE.txt 
b/commons-numbers-complex/LICENSE.txt
index 2a5f502..2ae0957 100644
--- a/commons-numbers-complex/LICENSE.txt
+++ b/commons-numbers-complex/LICENSE.txt
@@ -206,11 +206,39 @@ Class "org.apache.commons.numbers.complex.Complex" 
contains
  Java code partly ported from the "Freely Distributable Math Library" in C.
  The source files contain the following notice:

- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
+  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+  Developed at SunSoft, a Sun Microsystems, Inc. business.
+  Permission to use, copy, modify, and distribute this
+  software is freely granted, provided that this notice
+  is preserved.
+
+================================================================================
+
+Class "org.apache.commons.numbers.complex.Complex" contains
+Java code partly ported from the "Boost C++ Libraries" <boost/math/complex>.
+The source files contain the following notice:
+
+  Boost Software License - Version 1.0 - August 17th, 2003
+
+  Permission is hereby granted, free of charge, to any person or organization
+  obtaining a copy of the software and accompanying documentation covered by
+  this license (the "Software") to use, reproduce, display, distribute,
+  execute, and transmit the Software, and to prepare derivative works of the
+  Software, and to permit third-parties to whom the Software is furnished to
+  do so, all subject to the following:
+
+  The copyright notices in the Software and this entire statement, including
+  the above license grant, this restriction and the following disclaimer,
+  must be included in all copies of the Software, in whole or in part, and
+  all derivative works of the Software, unless such copies or derivative
+  works are solely in the form of machine-executable object code generated by
+  a source language processor.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
diff --git 
a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
 
b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
index dcb4cff..5a53698 100644
--- 
a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
+++ 
b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
@@ -1307,6 +1307,14 @@ public final class Complex implements Serializable  {
       * <p>This function exists to allow implementation of the identity
       * {@code acosh(z) = +-i acos(z)}.
       *
+     * <p>Adapted from {@code <boost/math/complex/acos.hpp>}.
+     * The original notice is shown below and the licence is shown in full in 
LICENSE.txt:
+     * <pre>
+     * (C) Copyright John Maddock 2005.
+     * Distributed under the Boost Software License, Version 1.0. (See 
accompanying
+     * file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+     * </pre>
+     *
       * @param real Real part.
       * @param imaginary Imaginary part.
       * @param constructor Constructor.
@@ -1475,8 +1483,13 @@ public final class Complex implements Serializable  {
       * <p>This function exists to allow implementation of the identity
       * {@code asinh(z) = -i asin(iz)}.
       *
-     * <p>The code has been adapted from the <a 
href="https://www.boost.org/";>Boost</a>
-     * {@code c++} implementation {@code <boost/math/complex/asin.hpp>}.</p>
+     * <p>Adapted from {@code <boost/math/complex/asin.hpp>}.
+     * The original notice is shown below and the licence is shown in full in 
LICENSE.txt:
+     * <pre>
+     * (C) Copyright John Maddock 2005.
+     * Distributed under the Boost Software License, Version 1.0. (See 
accompanying
+     * file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+     * </pre>
       *
       * @param real Real part.
       * @param imaginary Imaginary part.
@@ -1727,6 +1740,13 @@ public final class Complex implements Serializable  {
       * <p>This function exists to allow implementation of the identity
       * {@code atan(z) = -i atanh(iz)}.
       *
+     * The original notice is shown below and the licence is shown in full in 
LICENSE.txt:
+     * <pre>
+     * (C) Copyright John Maddock 2005.
+     * Distributed under the Boost Software License, Version 1.0. (See 
accompanying
+     * file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+     * </pre>
+     *
       * @param real Real part.
       * @param imaginary Imaginary part.
       * @param constructor Constructor.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org

Reply via email to