From 381db11eb6437c1e729b2ea160f83eab4890c459 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 31 Jan 2025 15:37:18 +0100 Subject: [PATCH 1/3] Add SPDX-FileCopyrightText and SPDX-FileType to source file header Signed-off-by: Arthit Suriyawongkul --- src/main/java/org/spdx/Configuration.java | 4 ++-- .../org/spdx/library/LicenseInfoFactory.java | 4 ++-- .../java/org/spdx/library/ListedLicenses.java | 4 ++-- .../java/org/spdx/library/ModelCopyManager.java | 4 ++-- .../spdx/library/SpdxConversionException.java | 4 ++-- .../java/org/spdx/library/SpdxModelFactory.java | 4 ++-- .../library/conversion/ExternalMapInfo.java | 4 ++-- .../spdx/library/conversion/ISpdxConverter.java | 4 ++-- .../library/conversion/Spdx2to3Converter.java | 4 ++-- .../spdx/library/conversion/package-info.java | 10 +++++----- .../java/org/spdx/library/package-info.java | 11 ++++++----- .../storage/listedlicense/CrossRefJson.java | 4 ++-- .../storage/listedlicense/ExceptionJson.java | 4 ++-- .../storage/listedlicense/ExceptionJsonTOC.java | 4 ++-- .../listedlicense/IListedLicenseStore.java | 4 ++-- .../listedlicense/LicenseCreationInfo.java | 4 ++-- .../listedlicense/LicenseCreatorAgent.java | 4 ++-- .../spdx/storage/listedlicense/LicenseJson.java | 4 ++-- .../storage/listedlicense/LicenseJsonTOC.java | 5 +++-- .../SpdxListedLicenseLocalStore.java | 10 +++++----- .../SpdxListedLicenseModelStore.java | 4 ++-- .../SpdxListedLicenseWebStore.java | 4 ++-- .../SpdxV2ListedLicenseModelStore.java | 4 ++-- .../SpdxV3ListedLicenseModelStore.java | 4 ++-- .../storage/listedlicense/package-info.java | 5 +++-- .../spdx/storage/simple/ExtendedSpdxStore.java | 4 ++-- .../org/spdx/storage/simple/InMemSpdxStore.java | 4 ++-- .../spdx/storage/simple/StoredTypedItem.java | 17 +++++++++++++++++ .../org/spdx/storage/simple/package-info.java | 4 ++-- .../java/org/spdx/utility/DownloadCache.java | 4 ++-- .../compare/CompareTemplateOutputHandler.java | 4 ++-- .../compare/FilterTemplateOutputHandler.java | 10 ++++++---- .../utility/compare/LicenseCompareHelper.java | 4 ++-- .../utility/compare/SpdxCompareException.java | 17 +++++++++++++++++ .../org/spdx/utility/compare/SpdxComparer.java | 4 ++-- .../compare/SpdxExternalRefDifference.java | 5 ++--- .../spdx/utility/compare/SpdxFileComparer.java | 4 ++-- .../utility/compare/SpdxFileDifference.java | 4 ++-- .../spdx/utility/compare/SpdxItemComparer.java | 4 ++-- .../utility/compare/SpdxItemDifference.java | 4 ++-- .../utility/compare/SpdxLicenseDifference.java | 4 ++-- .../utility/compare/SpdxPackageComparer.java | 4 ++-- .../utility/compare/SpdxSnippetComparer.java | 4 ++-- .../utility/compare/TemplateRegexMatcher.java | 4 ++-- .../org/spdx/utility/compare/package-info.java | 4 ++-- .../license/LicenseExpressionParser.java | 4 ++-- .../utility/license/LicenseParserException.java | 17 +++++++++++++++++ .../org/spdx/utility/license/package-info.java | 4 ++-- .../java/org/spdx/utility/package-info.java | 4 ++-- .../IFileChecksumGenerator.java | 7 ++++--- .../JavaSha1ChecksumGenerator.java | 7 ++++--- .../VerificationCodeGenerator.java | 7 ++++--- .../utility/verificationcode/package-info.java | 5 +++-- 53 files changed, 174 insertions(+), 115 deletions(-) diff --git a/src/main/java/org/spdx/Configuration.java b/src/main/java/org/spdx/Configuration.java index fc2b7651..43e3de08 100644 --- a/src/main/java/org/spdx/Configuration.java +++ b/src/main/java/org/spdx/Configuration.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2023 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2023 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/LicenseInfoFactory.java b/src/main/java/org/spdx/library/LicenseInfoFactory.java index e790842d..4b8d31f2 100644 --- a/src/main/java/org/spdx/library/LicenseInfoFactory.java +++ b/src/main/java/org/spdx/library/LicenseInfoFactory.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/ListedLicenses.java b/src/main/java/org/spdx/library/ListedLicenses.java index 98f2500c..bebf2212 100644 --- a/src/main/java/org/spdx/library/ListedLicenses.java +++ b/src/main/java/org/spdx/library/ListedLicenses.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/ModelCopyManager.java b/src/main/java/org/spdx/library/ModelCopyManager.java index 01a713a0..3cc10a8a 100644 --- a/src/main/java/org/spdx/library/ModelCopyManager.java +++ b/src/main/java/org/spdx/library/ModelCopyManager.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/SpdxConversionException.java b/src/main/java/org/spdx/library/SpdxConversionException.java index 105cd552..fe3e33d0 100644 --- a/src/main/java/org/spdx/library/SpdxConversionException.java +++ b/src/main/java/org/spdx/library/SpdxConversionException.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/SpdxModelFactory.java b/src/main/java/org/spdx/library/SpdxModelFactory.java index e3c82603..3c7c1b4b 100644 --- a/src/main/java/org/spdx/library/SpdxModelFactory.java +++ b/src/main/java/org/spdx/library/SpdxModelFactory.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/conversion/ExternalMapInfo.java b/src/main/java/org/spdx/library/conversion/ExternalMapInfo.java index 17e9d8e5..c0061142 100644 --- a/src/main/java/org/spdx/library/conversion/ExternalMapInfo.java +++ b/src/main/java/org/spdx/library/conversion/ExternalMapInfo.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/conversion/ISpdxConverter.java b/src/main/java/org/spdx/library/conversion/ISpdxConverter.java index 669d38e9..862d3da3 100644 --- a/src/main/java/org/spdx/library/conversion/ISpdxConverter.java +++ b/src/main/java/org/spdx/library/conversion/ISpdxConverter.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java b/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java index f16fc101..c0b0739f 100644 --- a/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java +++ b/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/library/conversion/package-info.java b/src/main/java/org/spdx/library/conversion/package-info.java index d00ea860..56d60f61 100644 --- a/src/main/java/org/spdx/library/conversion/package-info.java +++ b/src/main/java/org/spdx/library/conversion/package-info.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/main/java/org/spdx/library/package-info.java b/src/main/java/org/spdx/library/package-info.java index fbb84ae2..acaa0d2f 100644 --- a/src/main/java/org/spdx/library/package-info.java +++ b/src/main/java/org/spdx/library/package-info.java @@ -1,20 +1,21 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. */ + /** * Functions for reading, writing, and manipulating SPDX documents *

diff --git a/src/main/java/org/spdx/storage/listedlicense/CrossRefJson.java b/src/main/java/org/spdx/storage/listedlicense/CrossRefJson.java index 4b8b157d..8f103c36 100644 --- a/src/main/java/org/spdx/storage/listedlicense/CrossRefJson.java +++ b/src/main/java/org/spdx/storage/listedlicense/CrossRefJson.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/ExceptionJson.java b/src/main/java/org/spdx/storage/listedlicense/ExceptionJson.java index 785cde7d..5f6606a1 100644 --- a/src/main/java/org/spdx/storage/listedlicense/ExceptionJson.java +++ b/src/main/java/org/spdx/storage/listedlicense/ExceptionJson.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/ExceptionJsonTOC.java b/src/main/java/org/spdx/storage/listedlicense/ExceptionJsonTOC.java index cb5ddc86..356fbd72 100644 --- a/src/main/java/org/spdx/storage/listedlicense/ExceptionJsonTOC.java +++ b/src/main/java/org/spdx/storage/listedlicense/ExceptionJsonTOC.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/IListedLicenseStore.java b/src/main/java/org/spdx/storage/listedlicense/IListedLicenseStore.java index 3690a526..37e692b7 100644 --- a/src/main/java/org/spdx/storage/listedlicense/IListedLicenseStore.java +++ b/src/main/java/org/spdx/storage/listedlicense/IListedLicenseStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/LicenseCreationInfo.java b/src/main/java/org/spdx/storage/listedlicense/LicenseCreationInfo.java index 902ccecb..4ecd0a30 100644 --- a/src/main/java/org/spdx/storage/listedlicense/LicenseCreationInfo.java +++ b/src/main/java/org/spdx/storage/listedlicense/LicenseCreationInfo.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/LicenseCreatorAgent.java b/src/main/java/org/spdx/storage/listedlicense/LicenseCreatorAgent.java index b1925b7a..a47a9e16 100644 --- a/src/main/java/org/spdx/storage/listedlicense/LicenseCreatorAgent.java +++ b/src/main/java/org/spdx/storage/listedlicense/LicenseCreatorAgent.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/LicenseJson.java b/src/main/java/org/spdx/storage/listedlicense/LicenseJson.java index 08da52ad..a8e7a1f4 100644 --- a/src/main/java/org/spdx/storage/listedlicense/LicenseJson.java +++ b/src/main/java/org/spdx/storage/listedlicense/LicenseJson.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/LicenseJsonTOC.java b/src/main/java/org/spdx/storage/listedlicense/LicenseJsonTOC.java index d52cf3a6..875d2b38 100644 --- a/src/main/java/org/spdx/storage/listedlicense/LicenseJsonTOC.java +++ b/src/main/java/org/spdx/storage/listedlicense/LicenseJsonTOC.java @@ -1,5 +1,7 @@ /** - * Copyright (c) 2018 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2018 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +29,6 @@ import org.spdx.library.model.v2.license.SpdxListedLicense; - /** * Table of Contents for the listed license list as represented as a JSON index file * at spdx.org/licenses/licenses.json diff --git a/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStore.java b/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStore.java index fd15fe1e..8fc457c0 100644 --- a/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStore.java +++ b/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStore.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseModelStore.java b/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseModelStore.java index 8598853a..a85d89d1 100644 --- a/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseModelStore.java +++ b/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseModelStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStore.java b/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStore.java index 80fa672a..4dd1a4fd 100644 --- a/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStore.java +++ b/src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/SpdxV2ListedLicenseModelStore.java b/src/main/java/org/spdx/storage/listedlicense/SpdxV2ListedLicenseModelStore.java index cca46647..03cd7694 100644 --- a/src/main/java/org/spdx/storage/listedlicense/SpdxV2ListedLicenseModelStore.java +++ b/src/main/java/org/spdx/storage/listedlicense/SpdxV2ListedLicenseModelStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/SpdxV3ListedLicenseModelStore.java b/src/main/java/org/spdx/storage/listedlicense/SpdxV3ListedLicenseModelStore.java index f9c5d93b..10b19f39 100644 --- a/src/main/java/org/spdx/storage/listedlicense/SpdxV3ListedLicenseModelStore.java +++ b/src/main/java/org/spdx/storage/listedlicense/SpdxV3ListedLicenseModelStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/listedlicense/package-info.java b/src/main/java/org/spdx/storage/listedlicense/package-info.java index af65e300..2b3d78ea 100644 --- a/src/main/java/org/spdx/storage/listedlicense/package-info.java +++ b/src/main/java/org/spdx/storage/listedlicense/package-info.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Storage for SPDX listed licenses *

diff --git a/src/main/java/org/spdx/storage/simple/ExtendedSpdxStore.java b/src/main/java/org/spdx/storage/simple/ExtendedSpdxStore.java index baa8991d..87f8b47e 100644 --- a/src/main/java/org/spdx/storage/simple/ExtendedSpdxStore.java +++ b/src/main/java/org/spdx/storage/simple/ExtendedSpdxStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java b/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java index f27cec70..0ac2a50e 100644 --- a/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java +++ b/src/main/java/org/spdx/storage/simple/InMemSpdxStore.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/storage/simple/StoredTypedItem.java b/src/main/java/org/spdx/storage/simple/StoredTypedItem.java index 309a61bf..43687135 100644 --- a/src/main/java/org/spdx/storage/simple/StoredTypedItem.java +++ b/src/main/java/org/spdx/storage/simple/StoredTypedItem.java @@ -1,3 +1,20 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.storage.simple; import java.util.ArrayList; diff --git a/src/main/java/org/spdx/storage/simple/package-info.java b/src/main/java/org/spdx/storage/simple/package-info.java index bb8425e0..e6e2e564 100644 --- a/src/main/java/org/spdx/storage/simple/package-info.java +++ b/src/main/java/org/spdx/storage/simple/package-info.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/DownloadCache.java b/src/main/java/org/spdx/utility/DownloadCache.java index 07841588..3cdb7548 100644 --- a/src/main/java/org/spdx/utility/DownloadCache.java +++ b/src/main/java/org/spdx/utility/DownloadCache.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2023 Peter Monks - *

+ * SPDX-FileCopyrightText: Copyright (c) 2023 Peter Monks + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/CompareTemplateOutputHandler.java b/src/main/java/org/spdx/utility/compare/CompareTemplateOutputHandler.java index 1d7ef751..1b4637f4 100644 --- a/src/main/java/org/spdx/utility/compare/CompareTemplateOutputHandler.java +++ b/src/main/java/org/spdx/utility/compare/CompareTemplateOutputHandler.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/FilterTemplateOutputHandler.java b/src/main/java/org/spdx/utility/compare/FilterTemplateOutputHandler.java index 2d63b705..66e72cba 100644 --- a/src/main/java/org/spdx/utility/compare/FilterTemplateOutputHandler.java +++ b/src/main/java/org/spdx/utility/compare/FilterTemplateOutputHandler.java @@ -1,12 +1,14 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. diff --git a/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java b/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java index 410c72c3..0915a0d6 100644 --- a/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java +++ b/src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxCompareException.java b/src/main/java/org/spdx/utility/compare/SpdxCompareException.java index 68eb6a5f..855fc2b9 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxCompareException.java +++ b/src/main/java/org/spdx/utility/compare/SpdxCompareException.java @@ -1,3 +1,20 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.utility.compare; /** diff --git a/src/main/java/org/spdx/utility/compare/SpdxComparer.java b/src/main/java/org/spdx/utility/compare/SpdxComparer.java index fcb399c5..d58fd264 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxComparer.java +++ b/src/main/java/org/spdx/utility/compare/SpdxComparer.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxExternalRefDifference.java b/src/main/java/org/spdx/utility/compare/SpdxExternalRefDifference.java index a818cb58..5c1fc479 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxExternalRefDifference.java +++ b/src/main/java/org/spdx/utility/compare/SpdxExternalRefDifference.java @@ -1,8 +1,7 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/spdx/utility/compare/SpdxFileComparer.java b/src/main/java/org/spdx/utility/compare/SpdxFileComparer.java index 078f9b71..76a9ea02 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxFileComparer.java +++ b/src/main/java/org/spdx/utility/compare/SpdxFileComparer.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxFileDifference.java b/src/main/java/org/spdx/utility/compare/SpdxFileDifference.java index 719b7d46..c72c2fc4 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxFileDifference.java +++ b/src/main/java/org/spdx/utility/compare/SpdxFileDifference.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxItemComparer.java b/src/main/java/org/spdx/utility/compare/SpdxItemComparer.java index 251af280..b2a67e35 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxItemComparer.java +++ b/src/main/java/org/spdx/utility/compare/SpdxItemComparer.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxItemDifference.java b/src/main/java/org/spdx/utility/compare/SpdxItemDifference.java index 45dff2c3..03178479 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxItemDifference.java +++ b/src/main/java/org/spdx/utility/compare/SpdxItemDifference.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxLicenseDifference.java b/src/main/java/org/spdx/utility/compare/SpdxLicenseDifference.java index 410de2c6..34e2287a 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxLicenseDifference.java +++ b/src/main/java/org/spdx/utility/compare/SpdxLicenseDifference.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxPackageComparer.java b/src/main/java/org/spdx/utility/compare/SpdxPackageComparer.java index 84860ccd..58cc619e 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxPackageComparer.java +++ b/src/main/java/org/spdx/utility/compare/SpdxPackageComparer.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/SpdxSnippetComparer.java b/src/main/java/org/spdx/utility/compare/SpdxSnippetComparer.java index ebba5b11..65b11ec0 100644 --- a/src/main/java/org/spdx/utility/compare/SpdxSnippetComparer.java +++ b/src/main/java/org/spdx/utility/compare/SpdxSnippetComparer.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/TemplateRegexMatcher.java b/src/main/java/org/spdx/utility/compare/TemplateRegexMatcher.java index 7d6cebc6..f987153a 100644 --- a/src/main/java/org/spdx/utility/compare/TemplateRegexMatcher.java +++ b/src/main/java/org/spdx/utility/compare/TemplateRegexMatcher.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2023 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2023 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/compare/package-info.java b/src/main/java/org/spdx/utility/compare/package-info.java index ca3c1e5f..b75ed319 100644 --- a/src/main/java/org/spdx/utility/compare/package-info.java +++ b/src/main/java/org/spdx/utility/compare/package-info.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/license/LicenseExpressionParser.java b/src/main/java/org/spdx/utility/license/LicenseExpressionParser.java index 73ee81fb..6b084821 100644 --- a/src/main/java/org/spdx/utility/license/LicenseExpressionParser.java +++ b/src/main/java/org/spdx/utility/license/LicenseExpressionParser.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/license/LicenseParserException.java b/src/main/java/org/spdx/utility/license/LicenseParserException.java index 6f9c09d5..5fe2c22b 100644 --- a/src/main/java/org/spdx/utility/license/LicenseParserException.java +++ b/src/main/java/org/spdx/utility/license/LicenseParserException.java @@ -1,3 +1,20 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.utility.license; import org.spdx.core.InvalidSPDXAnalysisException; diff --git a/src/main/java/org/spdx/utility/license/package-info.java b/src/main/java/org/spdx/utility/license/package-info.java index 8eb221ec..de6be124 100644 --- a/src/main/java/org/spdx/utility/license/package-info.java +++ b/src/main/java/org/spdx/utility/license/package-info.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/package-info.java b/src/main/java/org/spdx/utility/package-info.java index d9cd5e2b..834fb573 100644 --- a/src/main/java/org/spdx/utility/package-info.java +++ b/src/main/java/org/spdx/utility/package-info.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/spdx/utility/verificationcode/IFileChecksumGenerator.java b/src/main/java/org/spdx/utility/verificationcode/IFileChecksumGenerator.java index d2bfea2a..144b553f 100644 --- a/src/main/java/org/spdx/utility/verificationcode/IFileChecksumGenerator.java +++ b/src/main/java/org/spdx/utility/verificationcode/IFileChecksumGenerator.java @@ -1,5 +1,7 @@ /** - * Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,8 +14,7 @@ * 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. - * -*/ + */ package org.spdx.utility.verificationcode; import java.io.File; diff --git a/src/main/java/org/spdx/utility/verificationcode/JavaSha1ChecksumGenerator.java b/src/main/java/org/spdx/utility/verificationcode/JavaSha1ChecksumGenerator.java index 996a4547..68299cea 100644 --- a/src/main/java/org/spdx/utility/verificationcode/JavaSha1ChecksumGenerator.java +++ b/src/main/java/org/spdx/utility/verificationcode/JavaSha1ChecksumGenerator.java @@ -1,5 +1,7 @@ /** - * Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,8 +14,7 @@ * 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. - * -*/ + */ package org.spdx.utility.verificationcode; import java.io.File; diff --git a/src/main/java/org/spdx/utility/verificationcode/VerificationCodeGenerator.java b/src/main/java/org/spdx/utility/verificationcode/VerificationCodeGenerator.java index 3816bd70..6a9e7d1c 100644 --- a/src/main/java/org/spdx/utility/verificationcode/VerificationCodeGenerator.java +++ b/src/main/java/org/spdx/utility/verificationcode/VerificationCodeGenerator.java @@ -1,5 +1,7 @@ /** - * Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,8 +14,7 @@ * 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. - * -*/ + */ package org.spdx.utility.verificationcode; import java.io.File; diff --git a/src/main/java/org/spdx/utility/verificationcode/package-info.java b/src/main/java/org/spdx/utility/verificationcode/package-info.java index c844a202..48b216c2 100644 --- a/src/main/java/org/spdx/utility/verificationcode/package-info.java +++ b/src/main/java/org/spdx/utility/verificationcode/package-info.java @@ -1,6 +1,6 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - *

+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 *

* Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Classes used to generate PackageVerificationCodes * From 7fbc548db4848c2d38b80261873830306df6173a Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 31 Jan 2025 16:03:36 +0100 Subject: [PATCH 2/3] Convert more headers Signed-off-by: Arthit Suriyawongkul --- .../spdx/library/LicenseInfoFactoryTest.java | 10 ++--- .../library/LicenseInfoFactoryTestV2.java | 10 ++--- .../org/spdx/library/ListedLicensesTest.java | 41 ++++++++++--------- .../spdx/library/ModelCopyManagerTest.java | 10 ++--- .../spdx/library/ModelCopyManagerTestV2.java | 10 ++--- .../spdx/library/ModelSpecConverterTest.java | 10 ++--- .../conversion/ExternalMapInfoTest.java | 10 ++--- .../conversion/Spdx2to3ConverterTest.java | 10 ++--- .../listedlicense/ExceptionJsonTOCTest.java | 10 ++--- .../listedlicense/ExceptionJsonTest.java | 10 ++--- .../LicenseCreationInfoTest.java | 10 ++--- .../LicenseCreatorAgentTest.java | 10 ++--- .../listedlicense/LicenseJsonTOCTest.java | 10 ++--- .../listedlicense/LicenseJsonTest.java | 10 ++--- .../SpdxListedLicenseLocalStoreTest.java | 10 ++--- .../SpdxListedLicenseWebStoreTest.java | 10 ++--- .../storage/simple/InMemSpdxStoreTest.java | 10 ++--- .../storage/simple/StoredTypedItemTest.java | 10 ++--- .../compare/CompareConsistencyHelper.java | 3 ++ .../FilterTemplateOutputHandlerTest.java | 10 ++--- .../compare/LicenseCompareHelperTest.java | 19 +++++---- .../compare/LicenseCompareHelperTestV2.java | 19 +++++---- .../utility/compare/SpdxComparerTest.java | 19 +++++---- .../utility/compare/SpdxFileComparerTest.java | 19 +++++---- .../utility/compare/SpdxItemComparerTest.java | 10 ++--- .../compare/SpdxPackageComparerTest.java | 2 + .../TestCompareTemplateOutputHandler.java | 2 + .../license/LicenseExpressionParserTest.java | 10 ++--- .../LicenseExpressionParserTestV2.java | 10 ++--- .../VerificationCodeGeneratorTest.java | 3 ++ 30 files changed, 181 insertions(+), 156 deletions(-) diff --git a/src/test/java/org/spdx/library/LicenseInfoFactoryTest.java b/src/test/java/org/spdx/library/LicenseInfoFactoryTest.java index cd1e841f..b7e5c7c2 100644 --- a/src/test/java/org/spdx/library/LicenseInfoFactoryTest.java +++ b/src/test/java/org/spdx/library/LicenseInfoFactoryTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/library/LicenseInfoFactoryTestV2.java b/src/test/java/org/spdx/library/LicenseInfoFactoryTestV2.java index af2cf5fc..d556ab9f 100644 --- a/src/test/java/org/spdx/library/LicenseInfoFactoryTestV2.java +++ b/src/test/java/org/spdx/library/LicenseInfoFactoryTestV2.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/library/ListedLicensesTest.java b/src/test/java/org/spdx/library/ListedLicensesTest.java index 622e1a3e..4ea88971 100644 --- a/src/test/java/org/spdx/library/ListedLicensesTest.java +++ b/src/test/java/org/spdx/library/ListedLicensesTest.java @@ -1,4 +1,23 @@ +/* + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2019 Black Duck Software Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.library; + import java.util.List; import java.util.Optional; @@ -12,27 +31,11 @@ import junit.framework.TestCase; -/* - * Copyright (c) 2019 Source Auditor Inc. - * - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed 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. - */ /** + * Test listed licenses + * * @author yevster@gmail.com, Black Duck Software - * SPDX-License-Identifier: Apache-2.0 */ public class ListedLicensesTest extends TestCase { @@ -167,4 +170,4 @@ public void testGetExceptionIdProperty() throws InvalidSPDXAnalysisException { assertTrue(idProp.get() instanceof String); assertEquals(id, idProp.get()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/spdx/library/ModelCopyManagerTest.java b/src/test/java/org/spdx/library/ModelCopyManagerTest.java index ae00919e..723224a8 100644 --- a/src/test/java/org/spdx/library/ModelCopyManagerTest.java +++ b/src/test/java/org/spdx/library/ModelCopyManagerTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/library/ModelCopyManagerTestV2.java b/src/test/java/org/spdx/library/ModelCopyManagerTestV2.java index a24b9ff7..c0742553 100644 --- a/src/test/java/org/spdx/library/ModelCopyManagerTestV2.java +++ b/src/test/java/org/spdx/library/ModelCopyManagerTestV2.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/library/ModelSpecConverterTest.java b/src/test/java/org/spdx/library/ModelSpecConverterTest.java index 37844b06..81b95a93 100644 --- a/src/test/java/org/spdx/library/ModelSpecConverterTest.java +++ b/src/test/java/org/spdx/library/ModelSpecConverterTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/library/conversion/ExternalMapInfoTest.java b/src/test/java/org/spdx/library/conversion/ExternalMapInfoTest.java index 65730d66..cbbbec53 100644 --- a/src/test/java/org/spdx/library/conversion/ExternalMapInfoTest.java +++ b/src/test/java/org/spdx/library/conversion/ExternalMapInfoTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java b/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java index 3747b6a6..3efa681e 100644 --- a/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java +++ b/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTOCTest.java b/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTOCTest.java index 2a892cd7..e59894ed 100644 --- a/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTOCTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTOCTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTest.java b/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTest.java index ef6301ce..ab9505e5 100644 --- a/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/ExceptionJsonTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/LicenseCreationInfoTest.java b/src/test/java/org/spdx/storage/listedlicense/LicenseCreationInfoTest.java index 819e23c1..97bf302a 100644 --- a/src/test/java/org/spdx/storage/listedlicense/LicenseCreationInfoTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/LicenseCreationInfoTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/LicenseCreatorAgentTest.java b/src/test/java/org/spdx/storage/listedlicense/LicenseCreatorAgentTest.java index 8268e5f5..23b211c2 100644 --- a/src/test/java/org/spdx/storage/listedlicense/LicenseCreatorAgentTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/LicenseCreatorAgentTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2024 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTOCTest.java b/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTOCTest.java index 9fd35fa8..dc588477 100644 --- a/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTOCTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTOCTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java b/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java index e7a0fc6d..4d5b3bf0 100644 --- a/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/LicenseJsonTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStoreTest.java b/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStoreTest.java index eb0a950e..7391ba74 100644 --- a/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStoreTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStoreTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java b/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java index cf704903..b9853db1 100644 --- a/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java +++ b/src/test/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStoreTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java b/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java index 4207f7fe..5a140bb7 100644 --- a/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java +++ b/src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/storage/simple/StoredTypedItemTest.java b/src/test/java/org/spdx/storage/simple/StoredTypedItemTest.java index 9a9922fb..057592fa 100644 --- a/src/test/java/org/spdx/storage/simple/StoredTypedItemTest.java +++ b/src/test/java/org/spdx/storage/simple/StoredTypedItemTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java b/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java index fc57c76a..5d7adaf6 100644 --- a/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java +++ b/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java @@ -10,6 +10,9 @@ import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicense; +/** + * Compare consistency helper + */ public class CompareConsistencyHelper { /** diff --git a/src/test/java/org/spdx/utility/compare/FilterTemplateOutputHandlerTest.java b/src/test/java/org/spdx/utility/compare/FilterTemplateOutputHandlerTest.java index bb06c71f..5b4f3933 100644 --- a/src/test/java/org/spdx/utility/compare/FilterTemplateOutputHandlerTest.java +++ b/src/test/java/org/spdx/utility/compare/FilterTemplateOutputHandlerTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2023 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2023 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTest.java b/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTest.java index 28aae183..4761cc2b 100644 --- a/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTest.java +++ b/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTest.java @@ -1,20 +1,21 @@ -/** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * +/* + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. - * -*/ + */ package org.spdx.utility.compare; import java.io.BufferedReader; @@ -55,6 +56,8 @@ import junit.framework.TestCase; /** + * Test license compare helper + * * @author Gary O'Neall */ @SuppressWarnings("deprecation") diff --git a/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTestV2.java b/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTestV2.java index b4e6d6b9..de882aba 100644 --- a/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTestV2.java +++ b/src/test/java/org/spdx/utility/compare/LicenseCompareHelperTestV2.java @@ -1,20 +1,21 @@ -/** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * +/* + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. - * -*/ + */ package org.spdx.utility.compare; import java.io.BufferedReader; @@ -52,6 +53,8 @@ import junit.framework.TestCase; /** + * Test license compare helper V2 + * * @author Gary O'Neall */ @SuppressWarnings("deprecation") diff --git a/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java index 6ba34140..acd316c8 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxComparerTest.java @@ -1,20 +1,21 @@ -/** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * +/* + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. - * -*/ + */ package org.spdx.utility.compare; import java.io.IOException; @@ -76,6 +77,8 @@ /** + * Test SPDX comparer + * * @author Gary O'Neall */ public class SpdxComparerTest extends TestCase { diff --git a/src/test/java/org/spdx/utility/compare/SpdxFileComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxFileComparerTest.java index cebad55a..ebdaabaa 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxFileComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxFileComparerTest.java @@ -1,20 +1,21 @@ -/** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * +/* + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. - * -*/ + */ package org.spdx.utility.compare; import java.io.File; @@ -46,6 +47,8 @@ /** + * Test SPDX file comparer + * * @author Gary O'Neall */ public class SpdxFileComparerTest extends TestCase { diff --git a/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java index 2657fb65..af68a85a 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java index 33fd1406..282c8d1e 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java @@ -53,6 +53,8 @@ /** + * Test SPDX package comparer + * * @author Gary O'Neall */ public class SpdxPackageComparerTest extends TestCase { diff --git a/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java b/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java index b9dff6d3..e64305c3 100644 --- a/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java +++ b/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java @@ -33,6 +33,8 @@ import org.spdx.licenseTemplate.LicenseTemplateRule.RuleType; /** + * Test compare template output handler + * * @author Source Auditor */ public class TestCompareTemplateOutputHandler { diff --git a/src/test/java/org/spdx/utility/license/LicenseExpressionParserTest.java b/src/test/java/org/spdx/utility/license/LicenseExpressionParserTest.java index 29c59ebe..147abbb1 100644 --- a/src/test/java/org/spdx/utility/license/LicenseExpressionParserTest.java +++ b/src/test/java/org/spdx/utility/license/LicenseExpressionParserTest.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/utility/license/LicenseExpressionParserTestV2.java b/src/test/java/org/spdx/utility/license/LicenseExpressionParserTestV2.java index 909e513a..2c75d9f7 100644 --- a/src/test/java/org/spdx/utility/license/LicenseExpressionParserTestV2.java +++ b/src/test/java/org/spdx/utility/license/LicenseExpressionParserTestV2.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2019 Source Auditor Inc. - * + * SPDX-FileCopyrightText: Copyright (c) 2019 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * + *

* Licensed 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. diff --git a/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java b/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java index 847a2064..64bfdcaa 100644 --- a/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java +++ b/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java @@ -19,6 +19,9 @@ import junit.framework.TestCase; +/** + * Test verification code generator + */ public class VerificationCodeGeneratorTest extends TestCase { static final String SOURCE_PATH = "TestFiles" + File.separator + "spdx-parser-source"; From c1896c1809c4227eacd7284b96872aff480aa8a1 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 31 Jan 2025 16:17:55 +0100 Subject: [PATCH 3/3] Add missing copyright headers Use the date from first GitHub commit Signed-off-by: Arthit Suriyawongkul --- .../listedlicense/CrossRefJsonV2Test.java | 17 +++++++++++++++++ .../compare/CompareConsistencyHelper.java | 17 +++++++++++++++++ .../utility/compare/SpdxItemComparerTest.java | 2 ++ .../compare/SpdxPackageComparerTest.java | 15 ++++++++------- .../compare/SpdxSnippetComparerTest.java | 2 ++ .../TestCompareTemplateOutputHandler.java | 15 ++++++++------- .../VerificationCodeGeneratorTest.java | 17 +++++++++++++++++ 7 files changed, 71 insertions(+), 14 deletions(-) diff --git a/src/test/java/org/spdx/storage/listedlicense/CrossRefJsonV2Test.java b/src/test/java/org/spdx/storage/listedlicense/CrossRefJsonV2Test.java index 179be90f..41d8e025 100644 --- a/src/test/java/org/spdx/storage/listedlicense/CrossRefJsonV2Test.java +++ b/src/test/java/org/spdx/storage/listedlicense/CrossRefJsonV2Test.java @@ -1,3 +1,20 @@ +/* + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.storage.listedlicense; import java.util.ArrayList; diff --git a/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java b/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java index 5d7adaf6..17359906 100644 --- a/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java +++ b/src/test/java/org/spdx/utility/compare/CompareConsistencyHelper.java @@ -1,3 +1,20 @@ +/* + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.utility.compare; import java.util.Arrays; diff --git a/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java index af68a85a..215b177f 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxItemComparerTest.java @@ -43,6 +43,8 @@ import junit.framework.TestCase; /** + * Test SPDX item comparer + * * @author Gary O'Neall */ public class SpdxItemComparerTest extends TestCase { diff --git a/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java index 282c8d1e..b59e86c1 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxPackageComparerTest.java @@ -1,19 +1,20 @@ -/** - * Copyright (c) 2015 Source Auditor Inc. - * +/* + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. - * -*/ + */ package org.spdx.utility.compare; import java.util.Arrays; diff --git a/src/test/java/org/spdx/utility/compare/SpdxSnippetComparerTest.java b/src/test/java/org/spdx/utility/compare/SpdxSnippetComparerTest.java index f94198b3..93268291 100644 --- a/src/test/java/org/spdx/utility/compare/SpdxSnippetComparerTest.java +++ b/src/test/java/org/spdx/utility/compare/SpdxSnippetComparerTest.java @@ -45,6 +45,8 @@ /** + * Test SPDX snippet comparer + * * @author Gary O'Neall */ public class SpdxSnippetComparerTest extends TestCase { diff --git a/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java b/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java index e64305c3..960186a5 100644 --- a/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java +++ b/src/test/java/org/spdx/utility/compare/TestCompareTemplateOutputHandler.java @@ -1,19 +1,20 @@ -/** - * Copyright (c) 2013 Source Auditor Inc. - * +/* + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

* Licensed 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. - * -*/ + */ package org.spdx.utility.compare; import static org.junit.Assert.*; diff --git a/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java b/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java index 64bfdcaa..46f35ea6 100644 --- a/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java +++ b/src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java @@ -1,3 +1,20 @@ +/* + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + *

+ * Licensed 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. + */ package org.spdx.utility.verificationcode;