Skip to content

Commit b160b57

Browse files
authored
Merge pull request #2503 from ekxide/iox-2491-relicense-iceoryx_platform-iceoryx_hoofs-scripts-ci-and-git-hooks
iox-#2491 Relicense 'iceoryx_platform', 'iceoryx_hoofs', scripts, ci and git hooks
2 parents f93a0e6 + 0dd1679 commit b160b57

File tree

763 files changed

+3881
-4533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

763 files changed

+3881
-4533
lines changed

CONTRIBUTING.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,13 @@ class Foo
377377

378378
### Header
379379

380-
Each source file needs to have this header:
380+
All files are licensed as Apache-2.0. In addition, the files in
381+
`iceoryx_platform`, `iceoryx_hoofs`, `tools/ci`, `tools/git-hoods` and
382+
`tools/scripts` are dual-licensed as Apache-2.0 or MIT.
383+
384+
Each source file needs to have one of these header, depending on their location.
385+
386+
Apache-2.0:
381387

382388
```cpp
383389
// Copyright (c) [YEAR OF INITIAL CONTRIBUTION] - [YEAR LAST CONTRIBUTION] by [CONTRIBUTOR]. All rights reserved.
@@ -397,6 +403,25 @@ Each source file needs to have this header:
397403
// SPDX-License-Identifier: Apache-2.0
398404
```
399405

406+
Apache-2.0 or MIT:
407+
408+
```cpp
409+
// Copyright (c) [YEAR OF INITIAL CONTRIBUTION] - [YEAR LAST CONTRIBUTION] by [CONTRIBUTOR]. All rights reserved.
410+
//
411+
// This program and the accompanying materials are made available under the
412+
// terms of the Apache Software License 2.0 which is available at
413+
// https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
414+
// which is available at https://opensource.org/licenses/MIT.
415+
//
416+
// Unless required by applicable law or agreed to in writing, software
417+
// distributed under the License is distributed on an "AS IS" BASIS,
418+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
419+
// See the License for the specific language governing permissions and
420+
// limitations under the License.
421+
//
422+
// SPDX-License-Identifier: Apache-2.0 OR MIT
423+
```
424+
400425
**_NOTE:_** The date is either a year or a range of years with the first and last years of the range separated by a dash.
401426
For example: "2004" (initial and last contribution in the same year) or "2000 - 2004". The first year is when the contents
402427
of the file were first created and the last year is when the contents were last modified. The years of contribution should

NOTICE.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,15 @@ This program and the accompanying materials are made available under the terms
2020
of the Apache License, Version 2.0 which is available at
2121
<https://www.apache.org/licenses/LICENSE-2.0>.
2222

23-
SPDX-License-Identifier: Apache-2.0
23+
> SPDX-License-Identifier: Apache-2.0
24+
25+
Some of the files are dual-licensed and also made available under the terms of
26+
the MIT License which is available at <https://opensource.org/licenses/MIT>.
27+
28+
> SPDX-License-Identifier: Apache-2.0 OR MIT
29+
30+
Please refer to the copyright header in each individual file for the specific
31+
license(s) that apply to that file.
2432

2533
## Source Code
2634

doc/website/release-notes/iceoryx-unreleased.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@
262262
- Document workaround for documentation in internal headers [#1293](https://github.com/eclipse-iceoryx/iceoryx/issues/1293)
263263
- The default branch is now `main` [#2270](https://github.com/eclipse-iceoryx/iceoryx/issues/2270)
264264

265+
**License changes**
266+
267+
- Relicense iceoryx_hoofs, iceoryx_platform, scripts, CI setup and git hooks from "Apache-2.0" to "Apache-2.0 or MIT" (dual license) [#2491](https://github.com/eclipse-iceoryx/iceoryx/issues/2491)
268+
265269
**New API features:**
266270

267271
- None
@@ -1507,6 +1511,6 @@
15071511
15081512
65. The non-functional `iox::popo::Node` was removed
15091513
1510-
66. add optional timeout parameter in sendRequestToRouDi
1514+
66. add optional timeout parameter in sendRequestToRouDi
15111515
15121516
67. add timeout in terminator request

iceoryx_hoofs/BUILD.bazel

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# Copyright (c) 2022 - 2023 by Apex.AI Inc. All rights reserved.
22
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
3+
# This program and the accompanying materials are made available under the
4+
# terms of the Apache Software License 2.0 which is available at
5+
# https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
6+
# which is available at https://opensource.org/licenses/MIT.
87
#
98
# Unless required by applicable law or agreed to in writing, software
109
# distributed under the License is distributed on an "AS IS" BASIS,
1110
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1211
# See the License for the specific language governing permissions and
1312
# limitations under the License.
1413
#
15-
# SPDX-License-Identifier: Apache-2.0
14+
# SPDX-License-Identifier: Apache-2.0 OR MIT
1615

1716
load("@rules_cc//cc:defs.bzl", "cc_library")
1817
load("//bazel:configure_file.bzl", "configure_file")

iceoryx_hoofs/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# Copyright (c) 2019 - 2021 by Robert Bosch GmbH. All rights reserved.
22
# Copyright (c) 2020 - 2023 by Apex.AI Inc. All rights reserved.
33
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Apache Software License 2.0 which is available at
6+
# https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
7+
# which is available at https://opensource.org/licenses/MIT.
98
#
109
# Unless required by applicable law or agreed to in writing, software
1110
# distributed under the License is distributed on an "AS IS" BASIS,
1211
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1312
# See the License for the specific language governing permissions and
1413
# limitations under the License.
1514
#
16-
# SPDX-License-Identifier: Apache-2.0
15+
# SPDX-License-Identifier: Apache-2.0 OR MIT
1716

1817
cmake_minimum_required(VERSION 3.16)
1918

iceoryx_hoofs/LICENSE-MIT

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Permission is hereby granted, free of charge, to any
2+
person obtaining a copy of this software and associated
3+
documentation files (the "Software"), to deal in the
4+
Software without restriction, including without
5+
limitation the rights to use, copy, modify, merge,
6+
publish, distribute, sublicense, and/or sell copies of
7+
the Software, and to permit persons to whom the Software
8+
is furnished to do so, subject to the following
9+
conditions:
10+
11+
The above copyright notice and this permission notice
12+
shall be included in all copies or substantial portions
13+
of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
16+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
17+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
18+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
19+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
22+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

iceoryx_hoofs/buffer/include/iox/buffer_info.hpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
// Copyright 2023, Eclipse Foundation and the iceoryx contributors. All rights reserved.
22
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
3+
// This program and the accompanying materials are made available under the
4+
// terms of the Apache Software License 2.0 which is available at
5+
// https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
6+
// which is available at https://opensource.org/licenses/MIT.
87
//
98
// Unless required by applicable law or agreed to in writing, software
109
// distributed under the License is distributed on an "AS IS" BASIS,
1110
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1211
// See the License for the specific language governing permissions and
1312
// limitations under the License.
1413
//
15-
// SPDX-License-Identifier: Apache-2.0
14+
// SPDX-License-Identifier: Apache-2.0 OR MIT
1615
#ifndef IOX_HOOFS_BUFFER_BUFFER_INFO_HPP
1716
#define IOX_HOOFS_BUFFER_BUFFER_INFO_HPP
1817

iceoryx_hoofs/buffer/include/iox/detail/stack.inl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
// Copyright (c) 2021 - 2023 by Apex.AI Inc. All rights reserved.
22
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
3+
// This program and the accompanying materials are made available under the
4+
// terms of the Apache Software License 2.0 which is available at
5+
// https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
6+
// which is available at https://opensource.org/licenses/MIT.
87
//
98
// Unless required by applicable law or agreed to in writing, software
109
// distributed under the License is distributed on an "AS IS" BASIS,
1110
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1211
// See the License for the specific language governing permissions and
1312
// limitations under the License.
1413
//
15-
// SPDX-License-Identifier: Apache-2.0
14+
// SPDX-License-Identifier: Apache-2.0 OR MIT
1615
#ifndef IOX_HOOFS_BUFFER_STACK_INL
1716
#define IOX_HOOFS_BUFFER_STACK_INL
1817

iceoryx_hoofs/buffer/include/iox/stack.hpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
// Copyright (c) 2021 - 2022 by Apex.AI Inc. All rights reserved.
22
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
3+
// This program and the accompanying materials are made available under the
4+
// terms of the Apache Software License 2.0 which is available at
5+
// https://www.apache.org/licenses/LICENSE-2.0, or the MIT license
6+
// which is available at https://opensource.org/licenses/MIT.
87
//
98
// Unless required by applicable law or agreed to in writing, software
109
// distributed under the License is distributed on an "AS IS" BASIS,
1110
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1211
// See the License for the specific language governing permissions and
1312
// limitations under the License.
1413
//
15-
// SPDX-License-Identifier: Apache-2.0
14+
// SPDX-License-Identifier: Apache-2.0 OR MIT
1615
#ifndef IOX_HOOFS_BUFFER_STACK_HPP
1716
#define IOX_HOOFS_BUFFER_STACK_HPP
1817

0 commit comments

Comments
 (0)