Improve LICENSE/NOTICE treatment of bundled non-ASF files. (#341)
Restructure declaration of the licenses of the two bundled files
fakengx.lua and fakeredis.lua following the guidance at
http://www.apache.org/dev/licensing-howto.html#bundled-vs-non-bundled.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
deleted file mode 100644
index a6c99e1..0000000
--- a/DEPENDENCIES.md
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-#
-# 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
-#
-# 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.
-#
--->
-# Library dependencies for openwhisk-apigateway
-
-Like other open source projects, openwhisk-apigateway is dependent on open source libraries.
-We list them here to assure that all code dependencies have Apache 2.0 compatible licenses.
-
-| Library name | Licenses Type | License/Project Link | Notes |
-| ------| ------ | ------ | ------ |
-| fakengx | MIT | https://github.com/bsm/fakengx | Modified to support some Cloud Foundry specific use cases
-| fakeredis | MIT | https://github.com/catwell/fakeredis | Modified to support using the OpenResty redis library
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695..b7dee09 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -200,3 +200,13 @@
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.
+
+========================================================================
+MIT License
+========================================================================
+
+This project bundles the file fakengx.lua which is distributed
+under the MIT license. For details, see tests/fakengx.lua.
+
+This project bundles the file fakeredis.lua which is distributed
+under the MIT license. For details, see tests/fakeredis.lua.
diff --git a/NOTICE.txt b/NOTICE.txt
index a463188..365233b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -3,12 +3,3 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-========================================================================
-MIT License
-========================================================================
-
-The following components are provided under the MIT License. See project link for details.
-
- (MIT License) fakengx (bsm/fakengx - https://github.com/bsm/fakengx)
- (MIT License) fakeredis (catwell/fakeredis - https://github.com/catwell/fakeredis)
diff --git a/tests/fakengx.lua b/tests/fakengx.lua
index 7a0ec1e..bae2d2a 100644
--- a/tests/fakengx.lua
+++ b/tests/fakengx.lua
@@ -1,19 +1,24 @@
+-- Copyright (c) 2012 Dimitrij Denissenko
--
--- 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
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of
+-- this software and associated documentation files (the "Software"), to deal in
+-- the Software without restriction, including without limitation the rights to
+-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-- of the Software, and to permit persons to whom the Software is furnished to do
+-- so, subject to the following conditions:
--
--- http://www.apache.org/licenses/LICENSE-2.0
+-- The above copyright notice and this permission notice shall be included in all
+-- copies or substantial portions of the Software.
--
--- 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.
---
+-- 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
+
+-- fakengx.lua was copied from https://github.com/bsm/fakengx
local bit = require 'bit'
local socket = require 'socket'
diff --git a/tests/fakeredis.lua b/tests/fakeredis.lua
index ba185ba..083a585 100644
--- a/tests/fakeredis.lua
+++ b/tests/fakeredis.lua
@@ -1,20 +1,26 @@
+-- Copyright (C) 2012-2016 by Pierre Chapuis
--
--- 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
+-- Permission is hereby granted, free of charge, to any person obtaining a copy
+-- of this software and associated documentation files (the "Software"), to deal
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
--
--- http://www.apache.org/licenses/LICENSE-2.0
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
--
--- 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.
+-- 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-- THE SOFTWARE.
--
+-- fakeredis.lua was copied from https://github.com/catwell/fakeredis
+
local unpack = table.unpack or unpack
local cjson = require 'cjson'
--- Bit operations
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 051670e..fa6f985 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -28,8 +28,9 @@
export OPENWHISK_HOME=$WHISKDIR
# run scancode util. against project source using the ASF strict configuration
+# exclude two bundled files from other open source projects that are MIT licensed
cd $UTILDIR
-scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg --gitignore $SCRIPTDIR/scancodeExclusions $ROOTDIR
# Install OpenWhisk
cd $OPENWHISK_HOME/ansible
diff --git a/tools/travis/scancodeExclusions b/tools/travis/scancodeExclusions
new file mode 100644
index 0000000..d74dc12
--- /dev/null
+++ b/tools/travis/scancodeExclusions
@@ -0,0 +1,3 @@
+# bundled files under MIT license; exclude from scan
+tests/fakengx.lua
+tests/fakeredis.lua
