diff --git a/LICENSE b/LICENSE index 76e7222b..e14f8ed0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,31 +1,29 @@ -BSD 4-Clause License +BSD 3-Clause License -Copyright (c) 2017, NEC -All rights reserved. +Copyright (c) 2021, NEC +All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +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. - * All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes - software developed by NEC Laboratories Europe and its contributors. - * Neither the name of NEC Laboratories Europe nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -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. +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. Neither the name of the copyright holder 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 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. \ No newline at end of file diff --git a/README.md b/README.md index 698f50f5..9b529d9c 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ check the FIWARE Catalogue entry for - [Testing](#testing) - [Quality Assurance](#quality-assurance) - [Roadmap](./doc/roadmap.md) -- [More Information](#more-information) -- [License](#license) +- [Publications](#publications) + ## Background @@ -112,14 +112,9 @@ follows: ![ ](https://img.shields.io/badge/dynamic/json.svg?label=Performance&url=https://fiware.github.io/catalogue/json/fogflow.json&query=$.performance&colorB=blue) ![ ](https://img.shields.io/badge/dynamic/json.svg?label=Stability&url=https://fiware.github.io/catalogue/json/fogflow.json&query=$.stability&colorB=blue) -## More Information - -- [Tutorial](http://fogflow.readthedocs.io/en/latest/index.html) -- [IoT-J paper](http://ieeexplore.ieee.org/document/8022859/) - -## License +## Publications -FogFlow is licensed under -[BSD-4-Clause](https://spdx.org/licenses/BSD-4-Clause.html). +- B. Cheng, G. Solmaz, F. Cirillo, E. Kovacs, K. Terasawa and A. Kitazawa, “[FogFlow: Easy Programming of IoT Services Over Cloud and Edges for Smart Cities](https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8022859),” in IEEE Internet of Things Journal, vol. 5, no. 2, pp. 696-707, April 2018, doi: 10.1109/JIOT.2017.2747214. [IoT Journal, 2020 Best Paper Award Runner-Up](https://ieee-iotj.org/awards/) +- Cheng, Bin, Jonathan Fuerst, Gurkan Solmaz, and Takuya Sanada. "[Fog function: Serverless fog computing for data intensive iot services](https://arxiv.org/pdf/1907.08278)." In 2019 IEEE International Conference on Services Computing (SCC), pp. 28-35. IEEE, 2019. [IEEE SCC, 2019 Best Paper Award](https://conferences.computer.org/services/2019/proceedings/bestpapers2019.html) -© 2017 NEC +© 2021 NEC \ No newline at end of file