Repository: incubator-taverna-engine Updated Branches: refs/heads/master 403dbc4a5 -> a06c81d00
TAVERNA-985 Remove BSD3 license from NOTICE It is still in taverna-execution-hadoop/src/main/resources/META-INF/NOTICE so that it will be reproduced with its JAR (satisfying clause 2) Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/a06c81d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/a06c81d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/a06c81d0 Branch: refs/heads/master Commit: a06c81d002f671293779024a03626f4fbda83e06 Parents: 403dbc4 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Jun 20 14:55:04 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jun 20 14:55:04 2016 +0100 ---------------------------------------------------------------------- LICENSE | 4 ++++ NOTICE | 27 --------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a06c81d0/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index d645695..82777c1 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,7 @@ 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. +--------------------------------------------------------- +taverna-execution-hadoop/src/main/java/org/pingel/util/CrossProduct.java +is licensed under a BSD-3 license, see its file headers for details. +--------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a06c81d0/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 6420c6f..7eb66b2 100644 --- a/NOTICE +++ b/NOTICE @@ -9,30 +9,3 @@ Portions of this software were originally based on the following: These have been licensed to the Apache Software Foundation under a software grant. --------------------------------------------------------- -taverna-execution-hadoop/src/main/java/org/pingel/util/CrossProduct.java - - Copyright (c) 2008 Adam Pingel - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. ----------------------------------------------------------
