chore: revisit license headers

jkowalleck · jkowalleck · commit 1e963bd3d7e6 · 2023-10-09T10:32:47.000+02:00
Signed-off-by: Jan Kowalleck &lt;jan.kowalleck@gmail.com&gt;
diff --git a/cyclonedx/__init__.py b/cyclonedx/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Python library for generating and representing CycloneDX software bill-of-materials.
diff --git a/cyclonedx/exception/__init__.py b/cyclonedx/exception/__init__.py
@@ -11,7 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-#
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Exceptions that are specific to the CycloneDX library implementation.
diff --git a/cyclonedx/exception/factory.py b/cyclonedx/exception/factory.py
@@ -11,7 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-#
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Exceptions relating to specific conditions that occur when factoring a model.
diff --git a/cyclonedx/exception/model.py b/cyclonedx/exception/model.py
@@ -11,7 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-#
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Exceptions relating to specific conditions that occur when modelling CycloneDX BOM.
diff --git a/cyclonedx/exception/output.py b/cyclonedx/exception/output.py
@@ -11,7 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-#
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Exceptions that are for specific error scenarios during the output of a Model to a SBOM.
diff --git a/cyclonedx/model/bom.py b/cyclonedx/model/bom.py
@@ -14,6 +14,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
+
+
 import warnings
 from datetime import datetime
 from itertools import chain
diff --git a/cyclonedx/output/__init__.py b/cyclonedx/output/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Set of classes and methods for outputting our libraries internal Bom model to CycloneDX documents in varying formats
diff --git a/cyclonedx/parser/__init__.py b/cyclonedx/parser/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Set of classes and methods which allow for quick creation of a Bom instance from your environment or Python project.
diff --git a/cyclonedx/schema/__init__.py b/cyclonedx/schema/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 from enum import Enum, auto, unique
 from typing import Any, Type, TypeVar
diff --git a/cyclonedx/schema/_res/__init__.py b/cyclonedx/schema/_res/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 from os.path import dirname, join
 from typing import Dict, Optional
diff --git a/cyclonedx/serialization/__init__.py b/cyclonedx/serialization/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 """
 Set of helper classes for use with ``serializable`` when conducting (de-)serialization.
diff --git a/cyclonedx/spdx.py b/cyclonedx/spdx.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 __all__ = [
     'is_supported_id', 'fixup_id',
diff --git a/cyclonedx/validation/__init__.py b/cyclonedx/validation/__init__.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 from abc import ABC, abstractmethod
 from importlib import import_module
diff --git a/cyclonedx/validation/json.py b/cyclonedx/validation/json.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 __all__ = ['JsonValidator', 'JsonStrictValidator']
 
diff --git a/cyclonedx/validation/xml.py b/cyclonedx/validation/xml.py
@@ -11,6 +11,8 @@
 # limitations under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
+# Copyright (c) OWASP Foundation. All Rights Reserved.
+
 
 __all__ = ['XmlValidator']
 
diff --git a/typings/sortedcontainers.pyi b/typings/sortedcontainers.pyi
@@ -1,9 +1,9 @@
 # Correct as of 27 May 2022
 # sortedcontainers does not have PEP561 type hints, and there are no published typeshed hints.
-# The contents of this file were obtained from 
+# The contents of this file were obtained from
 #  https://github.com/althonos/python-sortedcontainers/blob/d0a225d7fd0fb4c54532b8798af3cbeebf97e2d5/sortedcontainers/sortedset.pyi
 
-from typing import (  # Iterator,; Tuple,; Type,
+from typing import (  # Iterator,; Tuple,; Type, Set
     Any,
     Callable,
     Hashable,
@@ -12,7 +12,6 @@ from typing import (  # Iterator,; Tuple,; Type,
     MutableSet,
     Optional,
     Sequence,
-    Set,
     TypeVar,
     Union,
     overload,

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`# limitations under the License.`
`12`	`12`	`#`
`13`	`13`	`# SPDX-License-Identifier: Apache-2.0`
	`14`	`+# Copyright (c) OWASP Foundation. All Rights Reserved.`
	`15`	`+`
`14`	`16`
`15`	`17`	`"""`
`16`	`18`	`Python library for generating and representing CycloneDX software bill-of-materials.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`# limitations under the License.`
`12`	`12`	`#`
`13`	`13`	`# SPDX-License-Identifier: Apache-2.0`
`14`		`-#`
	`14`	`+# Copyright (c) OWASP Foundation. All Rights Reserved.`
	`15`	`+`
`15`	`16`
`16`	`17`	`"""`
`17`	`18`	`Exceptions that are specific to the CycloneDX library implementation.`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`#`
`15`	`15`	`# SPDX-License-Identifier: Apache-2.0`
`16`	`16`	`# Copyright (c) OWASP Foundation. All Rights Reserved.`
	`17`	`+`
	`18`	`+`
`17`	`19`	`import warnings`
`18`	`20`	`from datetime import datetime`
`19`	`21`	`from itertools import chain`