Skip to content

Commit

Permalink
Update LICENSE based on RAT results
Browse files Browse the repository at this point in the history
  • Loading branch information
pnoltes committed Sep 19, 2023
1 parent 5f26e5b commit ee40d11
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 67 deletions.
17 changes: 17 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# 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.

BasedOnStyle: LLVM
Language: Cpp
IndentWidth: 4
Expand Down
69 changes: 11 additions & 58 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -233,30 +233,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

---------------------------------------------------------------------------------

Mongoose (mongoose.h/c)

Copyright (c) 2004-2011 Sergey Lyubka

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:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

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.

---------------------------------------------------------------------------------

This product bundles fmemopen.h/.c & open_memstream.h/.c from Pyhull v1.5.4, which is available under the
MIT license. For details, see remote_services/dynamic_function_interface/memstream.

Expand Down Expand Up @@ -308,30 +284,6 @@ 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.

---------------------------------------------------------------------------------

Civetweb (civetweb.c/h)

Copyright (c) 2013-2018 the Civetweb developers
Copyright (c) 2004-2013 Sergey Lyubka

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:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

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.

---------------------------------------------------------------------------------

Expand Down Expand Up @@ -362,31 +314,32 @@ SOFTWARE.

---------------------------------------------------------------------------------

This product uses has_rtti.cpp (libs/framework/include/celix/Utils.h),
which is available under the BSD new license. For more details see
https://gist.github.com/brimston3/2be168bb423c83b0f469c0be56e66d31
This product uses Two-Level Segregated Fit memory allocator implementation
(bundles/remote_services/remote_service_admin_shm_v2/shm_pool/src/tlsf.(c|h)), which is available under the
BSD license.
For more details see https://github.com/mattconte/tlsf

Copyright (c) 1998, Regents of the University of California
Copyright (c) 2006-2016, Matthew Conte
All rights reserved.

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.
* Neither the name of the University of California, Berkeley nor the
* 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 REGENTS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
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 REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
DISCLAIMED. IN NO EVENT SHALL MATTHEW CONTE 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.
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion cmake/celix_project/ApacheRat.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (ENABLE_APACHE_RAT)
find_package(Java COMPONENTS Runtime)
if(Java_Runtime_FOUND)
include(FetchContent)
set(APACHE_RAT_URL "https://dlcdn.apache.org//creadur/apache-rat-0.14/apache-rat-0.14-bin.tar.gz")
set(APACHE_RAT_URL "http://archive.apache.org/dist/creadur/apache-rat-0.14/apache-rat-0.14-bin.tar.gz")
set(APACHE_RAT_HASH "17119289839dc573dd29039ca09bd86f729f1108308f6681292125418fd7bceeaf7d1a40b83eb01daf7d3dd66fbcc0a68d5431741314e748f7b878e8967459e9") #matching hash for the apache rat download

FetchContent_Declare(download_apache_rat
Expand Down
13 changes: 5 additions & 8 deletions rat-excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@

Files having a separate license should be ignored.
For Celix these include
- Mongoose
- Civetweb
- Doxygen scripts for CMake (Doxyfile.in, UseDoxygen.cmake)
- memstream

Also there are several files which can't have a license statement.
- *.in Input files used by CMake to generate files for deployment,
should not contain comments.
- .project Eclipse project file, not in the release but generated by CMake.
Excluded to prevent false positives when using RAT on a dev tree.
- Template files for code generation.

Doxyfile.in
Expand Down Expand Up @@ -53,16 +49,17 @@ fmemopen.h
open_memstream.c
open_memstream.h

# thpool and memstream documentation files
./utils/public/include/memstream/README.md
# TLSF - Two Level Segregated Fit memory allocator
tlsf.c
tlsf.h

.travis.yml
#Rust Cargo lock files (generated by cargo)
Cargo.lock

(.)*\.descriptor

scope.*\.json


#MIT - C Thread Pool
thpool.c
thpool.h
Expand Down

0 comments on commit ee40d11

Please sign in to comment.