Repository: incubator-taverna-plugin-bioinformatics Updated Branches: refs/heads/master 4d67ab4a1 -> 0cd19f59c
Clarify CacheImpl remains LGPL 2.1 .. as it might not have been part of the software grant to Apache signed by Univ of Manchester, as it does not seem that Martin Senger had signed a Software Grant Agreement with Manchester. Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/commit/aa249b29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/tree/aa249b29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/diff/aa249b29 Branch: refs/heads/master Commit: aa249b298e802c611d08b4f00999ef72491ae9ab Parents: 4d67ab4 Author: Stian Soiland-Reyes <[email protected]> Authored: Fri Jun 29 13:39:41 2018 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Fri Jun 29 13:39:41 2018 +0100 ---------------------------------------------------------------------- LICENSE | 9 +++++++++ NOTICE | 3 ++- .../t2/activities/biomoby/query/CacheImpl.java | 17 ++--------------- 3 files changed, 13 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/blob/aa249b29/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index d645695..13c1a54 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,12 @@ 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-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java + + This file is a component of the Taverna project, + and is licensed under the GNU LGPL. + Copyright Edward Kawas, Martin Senger, The BioMoby Project + +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/blob/aa249b29/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 077276c..8199955 100644 --- a/NOTICE +++ b/NOTICE @@ -11,4 +11,5 @@ These have been licensed to the Apache Software Foundation under a software gran --------------------------------------------------------- TODO: taverna-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java says (c) Martin Senger and is licensed as LGPL - did University of Manchester -have a ICLA from Senger so that this file can relicensed as Apache License? +have a ICLA from Senger so that this file could have been relicensed as Apache License 2.0 +as part of their software grant? http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-bioinformatics/blob/aa249b29/taverna-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java ---------------------------------------------------------------------- diff --git a/taverna-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java b/taverna-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java index ef88d2d..49f808f 100644 --- a/taverna-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java +++ b/taverna-biomoby-activity-ui/src/main/java/net/sf/taverna/t2/activities/biomoby/query/CacheImpl.java @@ -2,24 +2,11 @@ * This file is a component of the Taverna project, * and is licensed under the GNU LGPL. * Copyright Edward Kawas, Martin Senger, The BioMoby Project - */ -package net.sf.taverna.t2.activities.biomoby.query; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF 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 * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html * - * 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. */ +package net.sf.taverna.t2.activities.biomoby.query; import java.io.BufferedOutputStream; import java.io.BufferedReader;
