From 935d4087288c0838a4cc2b0a88e0a03e562e7f4e Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 1 Feb 2025 06:14:28 +0100 Subject: [PATCH 1/9] Standardise SPDX header in source files Also fix few typos Signed-off-by: Arthit Suriyawongkul --- CONTRIBUTING.md | 12 ++++++--- .../ExistingSpdxDocumentV2Compat.java | 3 ++- .../examples/SimpleSpdxDocumentV2Compat.java | 3 ++- .../java/org/spdx/tools/CompareSpdxDocs.java | 21 ++++----------- .../spdx/tools/GenerateVerificationCode.java | 19 +++----------- .../spdx/tools/InvalidFileNameException.java | 19 +++----------- src/main/java/org/spdx/tools/Main.java | 19 ++------------ .../spdx/tools/MatchingStandardLicenses.java | 20 +++----------- .../org/spdx/tools/OnlineToolException.java | 19 +++----------- .../spdx/tools/RdfSchemaToJsonContext.java | 19 +++----------- .../org/spdx/tools/RdfSchemaToJsonSchema.java | 21 +++------------ .../java/org/spdx/tools/RdfSchemaToXsd.java | 26 +++++-------------- .../java/org/spdx/tools/SpdxConverter.java | 17 ++---------- .../spdx/tools/SpdxConverterException.java | 21 +++------------ .../java/org/spdx/tools/SpdxToolsHelper.java | 7 +++-- .../spdx/tools/SpdxVerificationException.java | 21 +++------------ src/main/java/org/spdx/tools/SpdxVersion.java | 18 ++----------- src/main/java/org/spdx/tools/SpdxViewer.java | 23 +++------------- src/main/java/org/spdx/tools/Verify.java | 20 +++----------- .../compare/AbstractFileCompareSheet.java | 19 +++----------- .../org/spdx/tools/compare/AbstractSheet.java | 17 +++--------- .../org/spdx/tools/compare/CompareHelper.java | 19 +++----------- .../org/spdx/tools/compare/CreatorSheet.java | 21 ++++----------- .../compare/DocumentAnnotationSheet.java | 19 +++----------- .../compare/DocumentRelationshipSheet.java | 19 +++----------- .../org/spdx/tools/compare/DocumentSheet.java | 22 ++++------------ .../compare/ExternalReferencesSheet.java | 19 +++----------- .../tools/compare/ExtractedLicenseSheet.java | 21 ++++----------- .../tools/compare/FileAnnotationSheet.java | 19 +++----------- .../tools/compare/FileAttributionSheet.java | 19 +++----------- .../spdx/tools/compare/FileChecksumSheet.java | 21 ++++----------- .../spdx/tools/compare/FileCommentSheet.java | 19 +++----------- .../tools/compare/FileConcludedSheet.java | 21 ++++----------- .../tools/compare/FileContributorsSheet.java | 19 +++----------- .../tools/compare/FileCopyrightSheet.java | 19 +++----------- .../compare/FileLicenseCommentsSheet.java | 21 ++++----------- .../tools/compare/FileLicenseInfoSheet.java | 21 ++++----------- .../spdx/tools/compare/FileNoticeSheet.java | 19 +++----------- .../tools/compare/FileRelationshipSheet.java | 19 +++----------- .../spdx/tools/compare/FileSpdxIdSheet.java | 22 ++++------------ .../org/spdx/tools/compare/FileTypeSheet.java | 21 ++++----------- .../compare/MultiDocumentSpreadsheet.java | 21 ++++----------- .../compare/NormalizedFileNameComparator.java | 19 +++----------- .../org/spdx/tools/compare/PackageSheet.java | 23 +++++----------- .../org/spdx/tools/compare/SnippetSheet.java | 24 +++++------------ .../spdx/tools/compare/VerificationSheet.java | 23 +++++----------- .../org/spdx/tools/compare/package-info.java | 21 +++------------ .../tools/schema/AbstractOwlRdfConverter.java | 16 ++---------- .../spdx/tools/schema/OwlToJsonContext.java | 16 ++---------- .../spdx/tools/schema/OwlToJsonSchema.java | 19 +++----------- .../java/org/spdx/tools/schema/OwlToXsd.java | 16 ++---------- .../spdx/tools/schema/SchemaException.java | 19 +++----------- .../org/spdx/tools/schema/package-info.java | 17 +++--------- .../org/spdx/tools/CompareSpdxDocsTest.java | 25 ++++-------------- .../org/spdx/tools/SpdxConverterTestV2.java | 21 +++------------ .../org/spdx/tools/SpdxConverterTestV3.java | 6 +++-- .../sourcefiles/AbstractFileCompareSheet.java | 19 +++----------- testResources/sourcefiles/AbstractSheet.java | 17 +++--------- testResources/sourcefiles/CompareHelper.java | 19 +++----------- testResources/sourcefiles/CreatorSheet.java | 21 ++++----------- .../sourcefiles/DocumentAnnotationSheet.java | 19 +++----------- .../DocumentRelationshipSheet.java | 19 +++----------- testResources/sourcefiles/DocumentSheet.java | 21 ++++----------- .../sourcefiles/ExternalReferencesSheet.java | 19 +++----------- .../sourcefiles/ExtractedLicenseSheet.java | 21 ++++----------- .../sourcefiles/FileAnnotationSheet.java | 19 +++----------- .../sourcefiles/FileAttributionSheet.java | 19 +++----------- .../sourcefiles/FileChecksumSheet.java | 21 ++++----------- .../sourcefiles/FileCommentSheet.java | 21 ++++----------- .../sourcefiles/FileConcludedSheet.java | 23 ++++------------ .../sourcefiles/FileContributorsSheet.java | 20 +++----------- .../sourcefiles/FileCopyrightSheet.java | 20 +++----------- .../sourcefiles/FileLicenseCommentsSheet.java | 22 ++++------------ .../sourcefiles/FileLicenseInfoSheet.java | 22 ++++------------ .../sourcefiles/FileNoticeSheet.java | 20 +++----------- .../sourcefiles/FileRelationshipSheet.java | 20 +++----------- .../sourcefiles/FileSpdxIdSheet.java | 23 +++++----------- testResources/sourcefiles/FileTypeSheet.java | 22 ++++------------ .../sourcefiles/MultiDocumentSpreadsheet.java | 22 ++++------------ .../NormalizedFileNameComparator.java | 20 +++----------- testResources/sourcefiles/PackageSheet.java | 22 ++++------------ testResources/sourcefiles/SnippetSheet.java | 22 ++++------------ .../sourcefiles/VerificationSheet.java | 22 ++++------------ testResources/sourcefiles/package-info.java | 21 +++------------ 84 files changed, 346 insertions(+), 1280 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index edf73a4..c4a6f5f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,11 @@ +--- +SPDX-FileType: DOCUMENTATION SPDX-License-Identifier: CC-BY-4.0 +--- Contributing ============ + Thank you for your interest in `tools-java`. The project is open-source software, and bug reports, suggestions, and most especially patches are welcome. All contributions must include a "Signed-off-by" line in the commit message. @@ -10,12 +14,14 @@ This indicates that the contribution is made pursuant to the [Developer Certific Issues ------ + `tools-java` has a [project page on GitHub](https://github.com/spdx/tools-java/) where you can [create an issue](https://github.com/spdx/tools-java/issues/new) to report a bug, make a suggestion, or propose a substantial change or improvement that you might like to make. You may also wish to contact the SPDX working group technical team through its mailing list, [spdx-tech@lists.spdx.org](mailto:spdx-tech@lists.spdx.org). If you would like to work on a fix for any issue, please assign the issue to yourself prior to creating a patch. Patches ------- + The source code for `spdx-tools` is hosted on [github.com/spdx/tools-java](https://github.com/spdx/tools-java). Please review [open pull requests](https://github.com/spdx/tools-java/pulls) and [active branches](https://github.com/spdx/tools-java/branches) before committing time to a substantial revision. Work along similar lines may already be in progress. To submit a patch via GitHub, fork the repository, create a topic branch from `master` for your work, and send a pull request when ready. If you would prefer to send a patch or grant access to pull from your own Git repository, please contact the project's contributors by e-mail. @@ -24,20 +30,19 @@ To contribute an implementation of a feature defined by a version of the SPDX sp Once implemented, submit a pull request with `spec/X.X` branch as the parent branch. - Licensing --------- New **code files** should include a [short-form SPDX ID](https://spdx.org/ids) at the top, indicating the project license for code, which is Apache-2.0. This should look like the following: -``` +```java // SPDX-License-Identifier: Apache-2.0 ``` Developer Certificate of Origin (DCO) ------------------------------------- -``` +```text Developer Certificate of Origin Version 1.1 @@ -76,4 +81,3 @@ By making a contribution to this project, I certify that: maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. ``` - diff --git a/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java b/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java index 2d0b245..226ad06 100644 --- a/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java +++ b/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java @@ -1,6 +1,7 @@ /** + * SPDX-FileCopyrightText: Copyright (c) 2021 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * Copyright (c) 2021 Source Auditor Inc. */ package org.spdx.examples; diff --git a/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java b/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java index 07be22c..117569d 100644 --- a/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java +++ b/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java @@ -1,6 +1,7 @@ /** + * SPDX-FileCopyrightText: Copyright (c) 2021 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * Copyright (c) 2021 Source Auditor Inc. */ package org.spdx.examples; diff --git a/src/main/java/org/spdx/tools/CompareSpdxDocs.java b/src/main/java/org/spdx/tools/CompareSpdxDocs.java index 6894031..c0a8ad3 100644 --- a/src/main/java/org/spdx/tools/CompareSpdxDocs.java +++ b/src/main/java/org/spdx/tools/CompareSpdxDocs.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools; import java.io.File; diff --git a/src/main/java/org/spdx/tools/GenerateVerificationCode.java b/src/main/java/org/spdx/tools/GenerateVerificationCode.java index f84ff34..308783e 100644 --- a/src/main/java/org/spdx/tools/GenerateVerificationCode.java +++ b/src/main/java/org/spdx/tools/GenerateVerificationCode.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2011 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; import java.io.File; diff --git a/src/main/java/org/spdx/tools/InvalidFileNameException.java b/src/main/java/org/spdx/tools/InvalidFileNameException.java index 8e3e404..f27ab1b 100644 --- a/src/main/java/org/spdx/tools/InvalidFileNameException.java +++ b/src/main/java/org/spdx/tools/InvalidFileNameException.java @@ -1,26 +1,13 @@ /** - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. */ package org.spdx.tools; /** - * Illegal paramater fro a file name + * Illegal parameter fro a file name * @author Gary O'Neall - * */ public class InvalidFileNameException extends Exception { diff --git a/src/main/java/org/spdx/tools/Main.java b/src/main/java/org/spdx/tools/Main.java index 94ddfdb..1c658e0 100644 --- a/src/main/java/org/spdx/tools/Main.java +++ b/src/main/java/org/spdx/tools/Main.java @@ -1,20 +1,6 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; @@ -26,7 +12,6 @@ * Dispatch individual tools * * @author Gary O'Neall - * */ public class Main { diff --git a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java index 9d0ddc2..62e1b80 100644 --- a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java +++ b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2014 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2014 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; import java.io.File; @@ -30,7 +19,6 @@ * license ID's that are equivalent using the SPDX Legal team's license matching * guidelines (http://spdx.org/spdx-license-list/matching-guidelines) * @author Gary O'Neall - * */ public class MatchingStandardLicenses { diff --git a/src/main/java/org/spdx/tools/OnlineToolException.java b/src/main/java/org/spdx/tools/OnlineToolException.java index ac84aef..cc827aa 100644 --- a/src/main/java/org/spdx/tools/OnlineToolException.java +++ b/src/main/java/org/spdx/tools/OnlineToolException.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2017 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2017 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; /** diff --git a/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java b/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java index da78787..ebc4f97 100644 --- a/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java +++ b/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java @@ -1,19 +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. - * 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.tools; @@ -35,9 +23,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** - * Convert an RDF schema file containing SPDX property to a JSON context file for all properties in the SPDX namspace + * Convert an RDF schema file containing SPDX property to a JSON context file for all properties in the SPDX namespace * @author Gary O'Neall - * */ public class RdfSchemaToJsonContext { diff --git a/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java b/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java index af32803..123fe98 100644 --- a/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java +++ b/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java @@ -1,19 +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. - * 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.tools; @@ -37,9 +25,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** - * Convert an RDF schema file containing SPDX property to a JSON schema file for all properties in the SPDX namspace + * Convert an RDF schema file containing SPDX property to a JSON schema file for all properties in the SPDX namespace * @author Gary O'Neall - * */ public class RdfSchemaToJsonSchema { @@ -120,7 +107,7 @@ public static void main(String[] args) { public static void usage() { System.out.println("Usage:"); - System.out.println("RdfSchemaToJsonScema rdfSchemaFile jsonSchemaFile"); + System.out.println("RdfSchemaToJsonSchema rdfSchemaFile jsonSchemaFile"); System.out.println("\trdfSchemaFile RDF schema file in RDF/XML format"); System.out.println("\tjsonSchemaFile output JSON Schema file"); } diff --git a/src/main/java/org/spdx/tools/RdfSchemaToXsd.java b/src/main/java/org/spdx/tools/RdfSchemaToXsd.java index 5eed1d3..864bfa6 100644 --- a/src/main/java/org/spdx/tools/RdfSchemaToXsd.java +++ b/src/main/java/org/spdx/tools/RdfSchemaToXsd.java @@ -1,4 +1,10 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -16,29 +22,9 @@ import org.spdx.tools.schema.OwlToXsd; import org.spdx.tools.schema.SchemaException; - -/** - * Copyright (c) 2020 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. - */ - /** * Convert an RDF OWL document to an XML Schema * @author Gary O'Neall - * */ public class RdfSchemaToXsd { diff --git a/src/main/java/org/spdx/tools/SpdxConverter.java b/src/main/java/org/spdx/tools/SpdxConverter.java index 765d230..4109649 100644 --- a/src/main/java/org/spdx/tools/SpdxConverter.java +++ b/src/main/java/org/spdx/tools/SpdxConverter.java @@ -1,19 +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. - * 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.tools; @@ -47,7 +35,6 @@ * * the covert(...) methods can be called programmatically to convert files * @author Gary O'Neall - * */ public class SpdxConverter { static final Logger logger = LoggerFactory.getLogger(SpdxConverter.class); diff --git a/src/main/java/org/spdx/tools/SpdxConverterException.java b/src/main/java/org/spdx/tools/SpdxConverterException.java index bef43d2..5bfdafb 100644 --- a/src/main/java/org/spdx/tools/SpdxConverterException.java +++ b/src/main/java/org/spdx/tools/SpdxConverterException.java @@ -1,29 +1,14 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; /** - * @author Gary O'Neall - * * Exceptions related to the SPDX converter utility * + * @author Gary O'Neall */ public class SpdxConverterException extends Exception { diff --git a/src/main/java/org/spdx/tools/SpdxToolsHelper.java b/src/main/java/org/spdx/tools/SpdxToolsHelper.java index 5c525b7..ee9bb6a 100644 --- a/src/main/java/org/spdx/tools/SpdxToolsHelper.java +++ b/src/main/java/org/spdx/tools/SpdxToolsHelper.java @@ -1,8 +1,7 @@ /** - * Copyright (c) 2020 Source Auditor Inc. - * - * SPDX-License-Identifier: Apache-2.0 - * + * 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 diff --git a/src/main/java/org/spdx/tools/SpdxVerificationException.java b/src/main/java/org/spdx/tools/SpdxVerificationException.java index 65faf49..7c1cf41 100644 --- a/src/main/java/org/spdx/tools/SpdxVerificationException.java +++ b/src/main/java/org/spdx/tools/SpdxVerificationException.java @@ -1,29 +1,14 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; /** - * @author Gary O'Neall - * * Exceptions for the SPDX Verify tools * + * @author Gary O'Neall */ public class SpdxVerificationException extends Exception { diff --git a/src/main/java/org/spdx/tools/SpdxVersion.java b/src/main/java/org/spdx/tools/SpdxVersion.java index b432b60..e0643f4 100644 --- a/src/main/java/org/spdx/tools/SpdxVersion.java +++ b/src/main/java/org/spdx/tools/SpdxVersion.java @@ -1,20 +1,6 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; diff --git a/src/main/java/org/spdx/tools/SpdxViewer.java b/src/main/java/org/spdx/tools/SpdxViewer.java index 269a894..b9d7440 100644 --- a/src/main/java/org/spdx/tools/SpdxViewer.java +++ b/src/main/java/org/spdx/tools/SpdxViewer.java @@ -1,21 +1,9 @@ -package org.spdx.tools; /** - * Copyright (c) 2010 Source Auditor Inc. - * - * 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2010 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 */ - +package org.spdx.tools; import java.io.File; import java.io.PrintWriter; @@ -37,7 +25,6 @@ * @author Gary O'Neall * @version 0.1 */ - public class SpdxViewer { static final int MIN_ARGS = 1; @@ -48,9 +35,7 @@ public class SpdxViewer { * Pretty Printer for an SPDX Document * * @param args args[0] SPDX file path; args[1] [RDFXML|JSON|XLS|XLSX|YAML|TAG] an optional file type - if not present, file type of the to file will be used - * */ - public static void main(String[] args) { if (args.length < MIN_ARGS) { System.err diff --git a/src/main/java/org/spdx/tools/Verify.java b/src/main/java/org/spdx/tools/Verify.java index 84b9a59..304cf88 100644 --- a/src/main/java/org/spdx/tools/Verify.java +++ b/src/main/java/org/spdx/tools/Verify.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; import java.io.File; @@ -46,7 +35,6 @@ /** * Verifies an SPDX document and lists any verification errors * @author Gary O'Neall - * */ public class Verify { diff --git a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java index e42492f..ab1aaf9 100644 --- a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java +++ b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.List; diff --git a/src/main/java/org/spdx/tools/compare/AbstractSheet.java b/src/main/java/org/spdx/tools/compare/AbstractSheet.java index e44cfb4..e37b2a9 100644 --- a/src/main/java/org/spdx/tools/compare/AbstractSheet.java +++ b/src/main/java/org/spdx/tools/compare/AbstractSheet.java @@ -1,18 +1,7 @@ /** - * Copyright (c) 2011 Source Auditor Inc. - * - * 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/CompareHelper.java b/src/main/java/org/spdx/tools/compare/CompareHelper.java index ad7121f..cef6413 100644 --- a/src/main/java/org/spdx/tools/compare/CompareHelper.java +++ b/src/main/java/org/spdx/tools/compare/CompareHelper.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.net.URI; diff --git a/src/main/java/org/spdx/tools/compare/CreatorSheet.java b/src/main/java/org/spdx/tools/compare/CreatorSheet.java index 882760b..f66f058 100644 --- a/src/main/java/org/spdx/tools/compare/CreatorSheet.java +++ b/src/main/java/org/spdx/tools/compare/CreatorSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Arrays; diff --git a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java index 28af862..3e287dc 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java index 9237bd6..5503e18 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/src/main/java/org/spdx/tools/compare/DocumentSheet.java b/src/main/java/org/spdx/tools/compare/DocumentSheet.java index bcbb8d2..718bd39 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.List; @@ -36,7 +25,6 @@ * The first row summarizes which fields are different, the subsequent rows are the * specific date from each result * @author Gary O'Neall - * */ public class DocumentSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java index 7c3cb2f..51d0c2a 100644 --- a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java +++ b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java index 0c23d7c..a051cab 100644 --- a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java +++ b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java index 21b372f..7837906 100644 --- a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java index 36a9020..531057f 100644 --- a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Collection; diff --git a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java index f063b54..a99beca 100644 --- a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Objects; diff --git a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java index c809b24..e19cb76 100644 --- a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Optional; diff --git a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java index 24f6cfb..171f677 100644 --- a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java index 5812a9a..d0223b7 100644 --- a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Collection; diff --git a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java index 6de6819..2ca4270 100644 --- a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java index 8c71fc7..3fa541b 100644 --- a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Optional; diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java index 7881578..a30ca83 100644 --- a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Collection; diff --git a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java index 0832232..4645f23 100644 --- a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Optional; diff --git a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java index c389860..f93d1b8 100644 --- a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java index d870ebc..a263c96 100644 --- a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -22,8 +11,7 @@ import org.spdx.utility.compare.SpdxComparer; /** - * @author Gary - * + * @author Gary O'Neall */ public class FileSpdxIdSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java index 0e8c954..17fe24b 100644 --- a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Arrays; diff --git a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java index 7aefc16..5a47c85 100644 --- a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java +++ b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.io.File; diff --git a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java index e98437c..5d3c9d6 100644 --- a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java +++ b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/src/main/java/org/spdx/tools/compare/PackageSheet.java b/src/main/java/org/spdx/tools/compare/PackageSheet.java index 2d33d62..406ac91 100644 --- a/src/main/java/org/spdx/tools/compare/PackageSheet.java +++ b/src/main/java/org/spdx/tools/compare/PackageSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Arrays; @@ -39,12 +28,12 @@ import org.spdx.utility.compare.SpdxCompareException; import org.spdx.utility.compare.SpdxComparer; import org.spdx.utility.compare.SpdxPackageComparer; + /** * Document level fields for comparison spreadsheet * Column1 is the document field name, column2 indicates if all docs are equal, * columns3 through columnN are document specific field values * @author Gary O'Neall - * */ public class PackageSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/SnippetSheet.java b/src/main/java/org/spdx/tools/compare/SnippetSheet.java index ac0dbe7..f172bbd 100644 --- a/src/main/java/org/spdx/tools/compare/SnippetSheet.java +++ b/src/main/java/org/spdx/tools/compare/SnippetSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2016 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2016 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Arrays; @@ -38,9 +27,8 @@ import org.spdx.utility.compare.SpdxSnippetComparer; /** - * Comparsion sheet for SPDX Snippets - * @author Gary O'Neall - * + * Comparison sheet for SPDX Snippets + * @author Gary O'Neal */ public class SnippetSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/VerificationSheet.java b/src/main/java/org/spdx/tools/compare/VerificationSheet.java index 235a998..86e3da3 100644 --- a/src/main/java/org/spdx/tools/compare/VerificationSheet.java +++ b/src/main/java/org/spdx/tools/compare/VerificationSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.List; @@ -28,9 +17,9 @@ /** * Worksheet containing verification errors + * * Columns are package names, rows are individual verification errors * @author Gary O'Neall - * */ public class VerificationSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/package-info.java b/src/main/java/org/spdx/tools/compare/package-info.java index 9b41c4a..9bf2e0f 100644 --- a/src/main/java/org/spdx/tools/compare/package-info.java +++ b/src/main/java/org/spdx/tools/compare/package-info.java @@ -1,26 +1,11 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ /** - * @author Gary O'Neall - * * Classes related to the Compare SPDX Docs utilities * + * @author Gary O'Neall */ package org.spdx.tools.compare; \ No newline at end of file diff --git a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java index af16822..d268786 100644 --- a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java +++ b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java @@ -1,19 +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. - * 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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java index 792fa37..53905c5 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java +++ b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java @@ -1,19 +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. - * 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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java b/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java index 790c87f..d1a5c4d 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java +++ b/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java @@ -1,19 +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. - * 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.tools.schema; @@ -46,10 +34,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** - * @author Gary O'Neall - * * Converts from RDF/OWL RDF/XML documents to JSON Schema draft 7 * + * @author Gary O'Neall */ public class OwlToJsonSchema extends AbstractOwlRdfConverter { diff --git a/src/main/java/org/spdx/tools/schema/OwlToXsd.java b/src/main/java/org/spdx/tools/schema/OwlToXsd.java index 24c4741..fff8d58 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToXsd.java +++ b/src/main/java/org/spdx/tools/schema/OwlToXsd.java @@ -1,19 +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. - * 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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/SchemaException.java b/src/main/java/org/spdx/tools/schema/SchemaException.java index e009b2b..d57e263 100644 --- a/src/main/java/org/spdx/tools/schema/SchemaException.java +++ b/src/main/java/org/spdx/tools/schema/SchemaException.java @@ -1,25 +1,12 @@ /** - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. */ package org.spdx.tools.schema; /** - * @author gary - * + * @author Gary O'Neall */ public class SchemaException extends Exception { diff --git a/src/main/java/org/spdx/tools/schema/package-info.java b/src/main/java/org/spdx/tools/schema/package-info.java index a317a47..f682dc9 100644 --- a/src/main/java/org/spdx/tools/schema/package-info.java +++ b/src/main/java/org/spdx/tools/schema/package-info.java @@ -1,20 +1,9 @@ /** - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. */ + /** * This package contains classes implementing tools for managing various schemas for the SPDX documents. * diff --git a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java index 8f1f85c..6792a9b 100644 --- a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java +++ b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java @@ -1,20 +1,6 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; @@ -41,10 +27,9 @@ import junit.framework.TestCase; /** - * @author Gary O'Neall - * * Test cases for CompareSpdxDocs * + * @author Gary O'Neall */ public class CompareSpdxDocsTest extends TestCase { @@ -65,7 +50,7 @@ public class CompareSpdxDocsTest extends TestCase { static final String TEST_XML_FILE_PATH_23 = TEST_DIR + File.separator + "SPDXXMLExample-v2.3.spdx.xml"; static final String TEST_YAML_FILE_PATH_23 = TEST_DIR + File.separator + "SPDXYAMLExample-2.3.spdx.yaml"; - static final String TEST_DIFF_FILE_COMMNENT_FILE_PATH = TEST_DIR + File.separator + "DifferentFileComment.spdx.yaml"; + static final String TEST_DIFF_FILE_COMMENT_FILE_PATH = TEST_DIR + File.separator + "DifferentFileComment.spdx.yaml"; @@ -137,7 +122,7 @@ public void testCompareDocumentsv22() throws OnlineToolException, SpreadsheetExc public void testDifferentDocuments() throws OnlineToolException, SpreadsheetException { String outputFilePath = tempDirPath + File.separator + "comp.xlsx"; String[] params = new String[] {outputFilePath, - TEST_YAML_FILE_PATH_22, TEST_DIFF_FILE_COMMNENT_FILE_PATH + TEST_YAML_FILE_PATH_22, TEST_DIFF_FILE_COMMENT_FILE_PATH }; CompareSpdxDocs.onlineFunction(params); MultiDocumentSpreadsheet result = new MultiDocumentSpreadsheet(new File(outputFilePath), false, true); diff --git a/src/test/java/org/spdx/tools/SpdxConverterTestV2.java b/src/test/java/org/spdx/tools/SpdxConverterTestV2.java index 547ff58..e91d479 100644 --- a/src/test/java/org/spdx/tools/SpdxConverterTestV2.java +++ b/src/test/java/org/spdx/tools/SpdxConverterTestV2.java @@ -1,20 +1,6 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; @@ -47,8 +33,7 @@ import junit.framework.TestCase; /** - * @author gary - * + * @author Gary O'Neall */ public class SpdxConverterTestV2 extends TestCase { diff --git a/src/test/java/org/spdx/tools/SpdxConverterTestV3.java b/src/test/java/org/spdx/tools/SpdxConverterTestV3.java index 5a55663..618126a 100644 --- a/src/test/java/org/spdx/tools/SpdxConverterTestV3.java +++ b/src/test/java/org/spdx/tools/SpdxConverterTestV3.java @@ -1,6 +1,7 @@ /** + * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 - * Copyright (c) 2024 Source Auditor Inc. */ package org.spdx.tools; @@ -30,8 +31,9 @@ import junit.framework.TestCase; /** - * @author gary + * Test SPDX converter v3 * + * @author Gary O'Neall */ public class SpdxConverterTestV3 extends TestCase { diff --git a/testResources/sourcefiles/AbstractFileCompareSheet.java b/testResources/sourcefiles/AbstractFileCompareSheet.java index 2e481a4..1f194d0 100644 --- a/testResources/sourcefiles/AbstractFileCompareSheet.java +++ b/testResources/sourcefiles/AbstractFileCompareSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.List; diff --git a/testResources/sourcefiles/AbstractSheet.java b/testResources/sourcefiles/AbstractSheet.java index 88a2be1..de7c9f4 100644 --- a/testResources/sourcefiles/AbstractSheet.java +++ b/testResources/sourcefiles/AbstractSheet.java @@ -1,18 +1,7 @@ /** - * Copyright (c) 2011 Source Auditor Inc. - * - * 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools.compare; diff --git a/testResources/sourcefiles/CompareHelper.java b/testResources/sourcefiles/CompareHelper.java index c90a146..2571377 100644 --- a/testResources/sourcefiles/CompareHelper.java +++ b/testResources/sourcefiles/CompareHelper.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.net.URI; diff --git a/testResources/sourcefiles/CreatorSheet.java b/testResources/sourcefiles/CreatorSheet.java index 4f2bc7e..d4a995f 100644 --- a/testResources/sourcefiles/CreatorSheet.java +++ b/testResources/sourcefiles/CreatorSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Arrays; diff --git a/testResources/sourcefiles/DocumentAnnotationSheet.java b/testResources/sourcefiles/DocumentAnnotationSheet.java index 9b879cc..610969c 100644 --- a/testResources/sourcefiles/DocumentAnnotationSheet.java +++ b/testResources/sourcefiles/DocumentAnnotationSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/testResources/sourcefiles/DocumentRelationshipSheet.java b/testResources/sourcefiles/DocumentRelationshipSheet.java index 84c4da3..fcb81b7 100644 --- a/testResources/sourcefiles/DocumentRelationshipSheet.java +++ b/testResources/sourcefiles/DocumentRelationshipSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/testResources/sourcefiles/DocumentSheet.java b/testResources/sourcefiles/DocumentSheet.java index 0b9f378..eafd67a 100644 --- a/testResources/sourcefiles/DocumentSheet.java +++ b/testResources/sourcefiles/DocumentSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.List; diff --git a/testResources/sourcefiles/ExternalReferencesSheet.java b/testResources/sourcefiles/ExternalReferencesSheet.java index f5f3ecd..00296bb 100644 --- a/testResources/sourcefiles/ExternalReferencesSheet.java +++ b/testResources/sourcefiles/ExternalReferencesSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/testResources/sourcefiles/ExtractedLicenseSheet.java b/testResources/sourcefiles/ExtractedLicenseSheet.java index d18f7fe..01a2460 100644 --- a/testResources/sourcefiles/ExtractedLicenseSheet.java +++ b/testResources/sourcefiles/ExtractedLicenseSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.io.Serializable; diff --git a/testResources/sourcefiles/FileAnnotationSheet.java b/testResources/sourcefiles/FileAnnotationSheet.java index 1b1f3f7..c517de7 100644 --- a/testResources/sourcefiles/FileAnnotationSheet.java +++ b/testResources/sourcefiles/FileAnnotationSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; diff --git a/testResources/sourcefiles/FileAttributionSheet.java b/testResources/sourcefiles/FileAttributionSheet.java index 1850612..ad5775f 100644 --- a/testResources/sourcefiles/FileAttributionSheet.java +++ b/testResources/sourcefiles/FileAttributionSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Collection; diff --git a/testResources/sourcefiles/FileChecksumSheet.java b/testResources/sourcefiles/FileChecksumSheet.java index 1f0f248..4926a03 100644 --- a/testResources/sourcefiles/FileChecksumSheet.java +++ b/testResources/sourcefiles/FileChecksumSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Objects; diff --git a/testResources/sourcefiles/FileCommentSheet.java b/testResources/sourcefiles/FileCommentSheet.java index 10597b8..ef0ab08 100644 --- a/testResources/sourcefiles/FileCommentSheet.java +++ b/testResources/sourcefiles/FileCommentSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -23,7 +12,7 @@ import org.spdx.utility.compare.SpdxComparer; /** - * Sheet continaing results for file comment comparison + * Sheet containing results for file comment comparison * @author Gary O'Neall * */ diff --git a/testResources/sourcefiles/FileConcludedSheet.java b/testResources/sourcefiles/FileConcludedSheet.java index c1e96db..caef38f 100644 --- a/testResources/sourcefiles/FileConcludedSheet.java +++ b/testResources/sourcefiles/FileConcludedSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -23,10 +12,8 @@ import org.spdx.utility.compare.SpdxCompareException; import org.spdx.utility.compare.SpdxComparer; - /** * @author Source Auditor - * */ public class FileConcludedSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileContributorsSheet.java b/testResources/sourcefiles/FileContributorsSheet.java index 165e812..08b86b4 100644 --- a/testResources/sourcefiles/FileContributorsSheet.java +++ b/testResources/sourcefiles/FileContributorsSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Collection; @@ -27,7 +16,6 @@ /** * Sheet with results for file AttributionText comparison results * @author Gary O'Neall - * */ public class FileContributorsSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileCopyrightSheet.java b/testResources/sourcefiles/FileCopyrightSheet.java index d63e014..f45b236 100644 --- a/testResources/sourcefiles/FileCopyrightSheet.java +++ b/testResources/sourcefiles/FileCopyrightSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -25,7 +14,6 @@ /** * Sheet comparing file copyrights * @author Gary O'Neall - * */ public class FileCopyrightSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileLicenseCommentsSheet.java b/testResources/sourcefiles/FileLicenseCommentsSheet.java index a34abe1..b4f7889 100644 --- a/testResources/sourcefiles/FileLicenseCommentsSheet.java +++ b/testResources/sourcefiles/FileLicenseCommentsSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -26,7 +15,6 @@ /** * Sheet of comparison results for file license comments * @author Gary O'Neall - * */ public class FileLicenseCommentsSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileLicenseInfoSheet.java b/testResources/sourcefiles/FileLicenseInfoSheet.java index 7760f9c..d847efe 100644 --- a/testResources/sourcefiles/FileLicenseInfoSheet.java +++ b/testResources/sourcefiles/FileLicenseInfoSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Collection; @@ -30,7 +19,6 @@ /** * Sheet of the comparison results for the file seen licenses * @author Gary O'Neall - * */ public class FileLicenseInfoSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileNoticeSheet.java b/testResources/sourcefiles/FileNoticeSheet.java index 03d1652..6e27aa3 100644 --- a/testResources/sourcefiles/FileNoticeSheet.java +++ b/testResources/sourcefiles/FileNoticeSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Optional; @@ -27,7 +16,6 @@ /** * Sheet for file notice comparison results * @author Gary O'Neall - * */ public class FileNoticeSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileRelationshipSheet.java b/testResources/sourcefiles/FileRelationshipSheet.java index e424286..d3c3ac8 100644 --- a/testResources/sourcefiles/FileRelationshipSheet.java +++ b/testResources/sourcefiles/FileRelationshipSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -25,7 +14,6 @@ /** * Sheet comparing file relationships * @author Gary O'Neall - * */ public class FileRelationshipSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileSpdxIdSheet.java b/testResources/sourcefiles/FileSpdxIdSheet.java index 1ca68bf..2866ba6 100644 --- a/testResources/sourcefiles/FileSpdxIdSheet.java +++ b/testResources/sourcefiles/FileSpdxIdSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2015 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import org.apache.poi.ss.usermodel.Workbook; @@ -22,8 +11,8 @@ import org.spdx.utility.compare.SpdxComparer; /** - * @author Gary - * + * Sheet containing file SPDX ID + * @author Gary O'Neall */ public class FileSpdxIdSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileTypeSheet.java b/testResources/sourcefiles/FileTypeSheet.java index c6fb446..56fa640 100644 --- a/testResources/sourcefiles/FileTypeSheet.java +++ b/testResources/sourcefiles/FileTypeSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Arrays; @@ -29,7 +18,6 @@ /** * Sheet containing File Type * @author Gary O'Neall - * */ public class FileTypeSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/MultiDocumentSpreadsheet.java b/testResources/sourcefiles/MultiDocumentSpreadsheet.java index bba8104..b786f06 100644 --- a/testResources/sourcefiles/MultiDocumentSpreadsheet.java +++ b/testResources/sourcefiles/MultiDocumentSpreadsheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.io.File; @@ -59,7 +48,6 @@ * - verification: List of any verification errors * * @author Gary O'Neall - * */ public class MultiDocumentSpreadsheet { diff --git a/testResources/sourcefiles/NormalizedFileNameComparator.java b/testResources/sourcefiles/NormalizedFileNameComparator.java index e98437c..351f77a 100644 --- a/testResources/sourcefiles/NormalizedFileNameComparator.java +++ b/testResources/sourcefiles/NormalizedFileNameComparator.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.io.Serializable; @@ -25,7 +14,6 @@ * - File separator character is "/" * - Must begin with "./" * @author Gary O'Neall - * */ public class NormalizedFileNameComparator implements Comparator>, Serializable { diff --git a/testResources/sourcefiles/PackageSheet.java b/testResources/sourcefiles/PackageSheet.java index f6d3d0e..9ec328d 100644 --- a/testResources/sourcefiles/PackageSheet.java +++ b/testResources/sourcefiles/PackageSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.Arrays; @@ -43,7 +32,6 @@ * Column1 is the document field name, column2 indicates if all docs are equal, * columns3 through columnN are document specific field values * @author Gary O'Neall - * */ public class PackageSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/SnippetSheet.java b/testResources/sourcefiles/SnippetSheet.java index 0147ecb..1bbfa2f 100644 --- a/testResources/sourcefiles/SnippetSheet.java +++ b/testResources/sourcefiles/SnippetSheet.java @@ -1,19 +1,8 @@ /** - * Copyright (c) 2016 Source Auditor Inc. - * - * 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. - * -*/ + * SPDX-FileCopyrightText: Copyright (c) 2016 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.compare; import java.util.Arrays; @@ -38,9 +27,8 @@ import org.spdx.utility.compare.SpdxSnippetComparer; /** - * Comparsion sheet for SPDX Snippets + * Comparison sheet for SPDX Snippets * @author Gary O'Neall - * */ public class SnippetSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/VerificationSheet.java b/testResources/sourcefiles/VerificationSheet.java index 235a998..d1e46f3 100644 --- a/testResources/sourcefiles/VerificationSheet.java +++ b/testResources/sourcefiles/VerificationSheet.java @@ -1,20 +1,9 @@ /** - * Copyright (c) 2013 Source Auditor Inc. - * Copyright (c) 2013 Black Duck Software Inc. - * - * 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. - * -*/ + * 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 + */ package org.spdx.tools.compare; import java.util.List; @@ -30,7 +19,6 @@ * Worksheet containing verification errors * Columns are package names, rows are individual verification errors * @author Gary O'Neall - * */ public class VerificationSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/package-info.java b/testResources/sourcefiles/package-info.java index 9b41c4a..9bf2e0f 100644 --- a/testResources/sourcefiles/package-info.java +++ b/testResources/sourcefiles/package-info.java @@ -1,26 +1,11 @@ /** - * Copyright (c) 2020 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. - * + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ /** - * @author Gary O'Neall - * * Classes related to the Compare SPDX Docs utilities * + * @author Gary O'Neall */ package org.spdx.tools.compare; \ No newline at end of file From 47cf60d81bd937d751265eeab750defffde19209 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 1 Feb 2025 07:48:35 +0100 Subject: [PATCH 2/9] Add missing copyright headers Signed-off-by: Arthit Suriyawongkul --- .../examples/ExistingSpdxDocumentV2Compat.java | 5 ++--- .../spdx/examples/SimpleSpdxDocumentV2Compat.java | 1 - src/main/java/org/spdx/tools/CompareSpdxDocs.java | 1 - .../org/spdx/tools/GenerateVerificationCode.java | 1 - .../java/org/spdx/tools/OnlineToolException.java | 14 ++++++-------- src/main/java/org/spdx/tools/SpdxToolsHelper.java | 1 - .../tools/compare/AbstractFileCompareSheet.java | 1 - .../java/org/spdx/tools/compare/AbstractSheet.java | 1 - .../java/org/spdx/tools/compare/CompareHelper.java | 1 - .../java/org/spdx/tools/compare/CreatorSheet.java | 1 - .../tools/compare/DocumentAnnotationSheet.java | 1 - .../tools/compare/DocumentRelationshipSheet.java | 1 - .../tools/compare/ExternalReferencesSheet.java | 1 - .../spdx/tools/compare/ExtractedLicenseSheet.java | 1 - .../spdx/tools/compare/FileAnnotationSheet.java | 1 - .../spdx/tools/compare/FileAttributionSheet.java | 1 - .../org/spdx/tools/compare/FileChecksumSheet.java | 1 - .../org/spdx/tools/compare/FileCommentSheet.java | 3 +-- .../org/spdx/tools/compare/FileConcludedSheet.java | 2 +- .../spdx/tools/compare/FileContributorsSheet.java | 1 - .../org/spdx/tools/compare/FileCopyrightSheet.java | 1 - .../tools/compare/FileLicenseCommentsSheet.java | 1 - .../spdx/tools/compare/FileLicenseInfoSheet.java | 1 - .../org/spdx/tools/compare/FileNoticeSheet.java | 1 - .../spdx/tools/compare/FileRelationshipSheet.java | 1 - .../org/spdx/tools/compare/FileSpdxIdSheet.java | 1 + .../java/org/spdx/tools/compare/FileTypeSheet.java | 1 - .../tools/compare/MultiDocumentSpreadsheet.java | 1 - .../compare/NormalizedFileNameComparator.java | 2 +- .../java/org/spdx/tools/compare/package-info.java | 3 ++- .../spdx/tools/schema/AbstractOwlRdfConverter.java | 1 - .../org/spdx/tools/schema/OwlToJsonContext.java | 1 - src/main/java/org/spdx/tools/schema/OwlToXsd.java | 1 - .../java/org/spdx/tools/schema/package-info.java | 1 - .../spdx/tools/GenerateVerificationCodeTest.java | 5 +++++ src/test/java/org/spdx/tools/VerifyTest.java | 5 +++++ .../java/org/spdx/tools/schema/OwlToXSDTest.java | 5 +++++ .../sourcefiles/AbstractFileCompareSheet.java | 1 - testResources/sourcefiles/AbstractSheet.java | 1 - testResources/sourcefiles/CompareHelper.java | 1 - testResources/sourcefiles/CreatorSheet.java | 1 - .../sourcefiles/DocumentAnnotationSheet.java | 1 - .../sourcefiles/DocumentRelationshipSheet.java | 1 - testResources/sourcefiles/DocumentSheet.java | 1 - .../sourcefiles/ExternalReferencesSheet.java | 1 - .../sourcefiles/ExtractedLicenseSheet.java | 1 - testResources/sourcefiles/FileAnnotationSheet.java | 1 - .../sourcefiles/FileAttributionSheet.java | 1 - testResources/sourcefiles/FileChecksumSheet.java | 1 - testResources/sourcefiles/FileCommentSheet.java | 1 - 50 files changed, 29 insertions(+), 56 deletions(-) diff --git a/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java b/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java index 226ad06..584fdce 100644 --- a/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java +++ b/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java @@ -34,7 +34,6 @@ * This example depends on the Spdx-Java-Library and the spdx-java-jackson store libraries * * @author Gary O'Neall - * */ public class ExistingSpdxDocumentV2Compat { @@ -53,7 +52,7 @@ public static void main(String[] args) { } /* - * First thing we need is a store deseralize the SPDX document into. + * First thing we need is a store deserialize the SPDX document into. * We'll chose the MultiFormatStore since it supports serializing to JSON files * It takes an underlying model store as the first parameter - the inMemSpdxStore is a simple * built in store included in the Spdx-Java-Library. The second parameter is the format @@ -75,7 +74,7 @@ public static void main(String[] args) { * license information over to the document model store */ ModelCopyManager copyManager = new ModelCopyManager(); - // Let's deseralize the document + // Let's deserialize the document try (InputStream stream = new FileInputStream(inputFile)) { modelStore.deSerialize(stream, false); diff --git a/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java b/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java index 117569d..f99a182 100644 --- a/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java +++ b/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java @@ -36,7 +36,6 @@ * This example depends on the Spdx-Java-Library and the spdx-java-jackson store libraries * * @author Gary O'Neall - * */ public class SimpleSpdxDocumentV2Compat { diff --git a/src/main/java/org/spdx/tools/CompareSpdxDocs.java b/src/main/java/org/spdx/tools/CompareSpdxDocs.java index c0a8ad3..4183bc8 100644 --- a/src/main/java/org/spdx/tools/CompareSpdxDocs.java +++ b/src/main/java/org/spdx/tools/CompareSpdxDocs.java @@ -33,7 +33,6 @@ * Document files can be either in RDF/XML or tag/value format * * @author Gary O'Neall - * */ public class CompareSpdxDocs { static final int MIN_ARGS = 2; diff --git a/src/main/java/org/spdx/tools/GenerateVerificationCode.java b/src/main/java/org/spdx/tools/GenerateVerificationCode.java index 308783e..0b711fd 100644 --- a/src/main/java/org/spdx/tools/GenerateVerificationCode.java +++ b/src/main/java/org/spdx/tools/GenerateVerificationCode.java @@ -25,7 +25,6 @@ /** * Generates a verification code for a specific directory * @author Gary O'Neall - * */ public class GenerateVerificationCode { diff --git a/src/main/java/org/spdx/tools/OnlineToolException.java b/src/main/java/org/spdx/tools/OnlineToolException.java index cc827aa..b1a831e 100644 --- a/src/main/java/org/spdx/tools/OnlineToolException.java +++ b/src/main/java/org/spdx/tools/OnlineToolException.java @@ -9,24 +9,22 @@ * Default Exception thrown to the Online Tool * * @author Rohit Lodha - * */ - public class OnlineToolException extends Exception { /** - * + * Serial version UID */ private static final long serialVersionUID = 1L; /** - * + * Default constructor for OnlineToolException. */ public OnlineToolException() { } /** - * + * Constructs an OnlineToolException with the specified message. * @param arg0 */ public OnlineToolException(String arg0) { @@ -34,7 +32,7 @@ public OnlineToolException(String arg0) { } /** - * + * Constructs an OnlineToolException with the specified throwable. * @param arg0 */ public OnlineToolException(Throwable arg0) { @@ -42,7 +40,7 @@ public OnlineToolException(Throwable arg0) { } /** - * + * Constructs an OnlineToolException with the specified message and throwable. * @param arg0 * @param arg1 */ @@ -51,7 +49,7 @@ public OnlineToolException(String arg0, Throwable arg1) { } /** - * + * Constructs an OnlineToolException with the specified message, throwable, and booleans. * @param arg0 * @param arg1 * @param arg2 diff --git a/src/main/java/org/spdx/tools/SpdxToolsHelper.java b/src/main/java/org/spdx/tools/SpdxToolsHelper.java index ee9bb6a..9505ffd 100644 --- a/src/main/java/org/spdx/tools/SpdxToolsHelper.java +++ b/src/main/java/org/spdx/tools/SpdxToolsHelper.java @@ -55,7 +55,6 @@ * Static helper methods for the various tools * * @author Gary O'Neall - * */ public class SpdxToolsHelper { diff --git a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java index ab1aaf9..57ccd54 100644 --- a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java +++ b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java @@ -24,7 +24,6 @@ * The first column is the file path, second column indicates if all documents are equal, * columns 3 through N are for the values of the individual documents * @author Gary O'Neall - * */ public abstract class AbstractFileCompareSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/AbstractSheet.java b/src/main/java/org/spdx/tools/compare/AbstractSheet.java index e37b2a9..4a13b90 100644 --- a/src/main/java/org/spdx/tools/compare/AbstractSheet.java +++ b/src/main/java/org/spdx/tools/compare/AbstractSheet.java @@ -27,7 +27,6 @@ /** * Abstract class representing a workbook sheet used in storing structured data * @author Gary O'Neall - * */ public abstract class AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/CompareHelper.java b/src/main/java/org/spdx/tools/compare/CompareHelper.java index cef6413..73b5a2d 100644 --- a/src/main/java/org/spdx/tools/compare/CompareHelper.java +++ b/src/main/java/org/spdx/tools/compare/CompareHelper.java @@ -29,7 +29,6 @@ /** * Helper class for comparisons * @author Gary O'Neall - * */ public class CompareHelper { diff --git a/src/main/java/org/spdx/tools/compare/CreatorSheet.java b/src/main/java/org/spdx/tools/compare/CreatorSheet.java index f66f058..bf75398 100644 --- a/src/main/java/org/spdx/tools/compare/CreatorSheet.java +++ b/src/main/java/org/spdx/tools/compare/CreatorSheet.java @@ -24,7 +24,6 @@ * Column 1 describes if the creator is the same or different * Columns 2 through N are for creators in each of the documents * @author Gary O'Neall - * */ public class CreatorSheet extends AbstractSheet { private static final int COL_WIDTH = 50; diff --git a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java index 3e287dc..c69f924 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java @@ -24,7 +24,6 @@ /** * Sheet for document level annotations * @author Gary O'Neall - * */ public class DocumentAnnotationSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java index 5503e18..ef03a05 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java @@ -26,7 +26,6 @@ /** * Sheet for document level relationships * @author Gary O'Neall - * */ public class DocumentRelationshipSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java index 51d0c2a..100cad2 100644 --- a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java +++ b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java @@ -26,7 +26,6 @@ /** * Sheet that compares the external document references * @author Gary O'Neall - * */ public class ExternalReferencesSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java index a051cab..add8986 100644 --- a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java +++ b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java @@ -29,7 +29,6 @@ * Column 1 contains the extracted text * Columns 2 through N contains the license information in the format licenseId [licenseName] {licenceUrls} (licenseComment) * @author Gary O'Neall - * */ public class ExtractedLicenseSheet extends AbstractSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java index 7837906..0a54402 100644 --- a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java @@ -14,7 +14,6 @@ /** * Sheet comparing file annotations * @author Gary O'Neall - * */ public class FileAnnotationSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java index 531057f..8fd68fd 100644 --- a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java @@ -17,7 +17,6 @@ /** * Sheet with results for file contributor comparison results * @author Gary O'Neall - * */ public class FileAttributionSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java index a99beca..dd23d9b 100644 --- a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java @@ -17,7 +17,6 @@ /** * Sheet of comparison results for file checksums * @author Gary O'Neall - * */ public class FileChecksumSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java index e19cb76..7676a2a 100644 --- a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java @@ -14,9 +14,8 @@ import org.spdx.utility.compare.SpdxComparer; /** - * Sheet continaing results for file comment comparison + * Sheet containing results for file comment comparison * @author Gary O'Neall - * */ public class FileCommentSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java index 171f677..ad36be3 100644 --- a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java @@ -14,8 +14,8 @@ /** + * Sheet with results for file concluded license comparison results * @author Source Auditor - * */ public class FileConcludedSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java index d0223b7..61ebb43 100644 --- a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java @@ -16,7 +16,6 @@ /** * Sheet with results for file AttributionText comparison results * @author Gary O'Neall - * */ public class FileContributorsSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java index 2ca4270..2ccae4d 100644 --- a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java @@ -14,7 +14,6 @@ /** * Sheet comparing file copyrights * @author Gary O'Neall - * */ public class FileCopyrightSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java index 3fa541b..8f020b6 100644 --- a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java @@ -17,7 +17,6 @@ /** * Sheet of comparison results for file license comments * @author Gary O'Neall - * */ public class FileLicenseCommentsSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java index a30ca83..8a5abd1 100644 --- a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java @@ -19,7 +19,6 @@ /** * Sheet of the comparison results for the file seen licenses * @author Gary O'Neall - * */ public class FileLicenseInfoSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java index 4645f23..784b67b 100644 --- a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java @@ -16,7 +16,6 @@ /** * Sheet for file notice comparison results * @author Gary O'Neall - * */ public class FileNoticeSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java index f93d1b8..edc2896 100644 --- a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java @@ -14,7 +14,6 @@ /** * Sheet comparing file relationships * @author Gary O'Neall - * */ public class FileRelationshipSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java index a263c96..ab8cf80 100644 --- a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java @@ -11,6 +11,7 @@ import org.spdx.utility.compare.SpdxComparer; /** + * Sheet comparing file SPDX IDs * @author Gary O'Neall */ public class FileSpdxIdSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java index 17fe24b..31f934a 100644 --- a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java @@ -18,7 +18,6 @@ /** * Sheet containing File Type * @author Gary O'Neall - * */ public class FileTypeSheet extends AbstractFileCompareSheet { diff --git a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java index 5a47c85..1d208f0 100644 --- a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java +++ b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java @@ -48,7 +48,6 @@ * - verification: List of any verification errors * * @author Gary O'Neall - * */ public class MultiDocumentSpreadsheet { diff --git a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java index 5d3c9d6..a03d082 100644 --- a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java +++ b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java @@ -14,7 +14,6 @@ * - File separator character is "/" * - Must begin with "./" * @author Gary O'Neall - * */ public class NormalizedFileNameComparator implements Comparator>, Serializable { @@ -25,6 +24,7 @@ public class NormalizedFileNameComparator implements Comparator static final char DOS_SEPARATOR = '\\'; static final char UNIX_SEPARATOR = '/'; static final String RELATIVE_DIR = "./"; + /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ diff --git a/src/main/java/org/spdx/tools/compare/package-info.java b/src/main/java/org/spdx/tools/compare/package-info.java index 9bf2e0f..3f7dc30 100644 --- a/src/main/java/org/spdx/tools/compare/package-info.java +++ b/src/main/java/org/spdx/tools/compare/package-info.java @@ -3,9 +3,10 @@ * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ + /** * Classes related to the Compare SPDX Docs utilities * * @author Gary O'Neall */ -package org.spdx.tools.compare; \ No newline at end of file +package org.spdx.tools.compare; diff --git a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java index d268786..284e6e3 100644 --- a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java +++ b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java @@ -39,7 +39,6 @@ * Abstract class for implementing classes which convert from RDF/XML OWL format to some other format * * @author Gary O'Neall - * */ public class AbstractOwlRdfConverter { diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java index 53905c5..d31b406 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java +++ b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java @@ -26,7 +26,6 @@ * Convert OWL RDF schema to a JSON Context file * * @author Gary O'Neall - * */ public class OwlToJsonContext extends AbstractOwlRdfConverter { diff --git a/src/main/java/org/spdx/tools/schema/OwlToXsd.java b/src/main/java/org/spdx/tools/schema/OwlToXsd.java index fff8d58..3947814 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToXsd.java +++ b/src/main/java/org/spdx/tools/schema/OwlToXsd.java @@ -48,7 +48,6 @@ * * * @author Gary O'Neall - * */ public class OwlToXsd extends AbstractOwlRdfConverter { diff --git a/src/main/java/org/spdx/tools/schema/package-info.java b/src/main/java/org/spdx/tools/schema/package-info.java index f682dc9..ddb494f 100644 --- a/src/main/java/org/spdx/tools/schema/package-info.java +++ b/src/main/java/org/spdx/tools/schema/package-info.java @@ -12,6 +12,5 @@ * - RDF/OWL in RDF/XML format * - JSON Schema Draft 7 * - JSON LD (Linked Data) - * */ package org.spdx.tools.schema; \ No newline at end of file diff --git a/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java b/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java index 5c437a7..5e3b753 100644 --- a/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java +++ b/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; import java.io.File; diff --git a/src/test/java/org/spdx/tools/VerifyTest.java b/src/test/java/org/spdx/tools/VerifyTest.java index aa11ba0..2f921e9 100644 --- a/src/test/java/org/spdx/tools/VerifyTest.java +++ b/src/test/java/org/spdx/tools/VerifyTest.java @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools; import java.io.File; diff --git a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java index 3d022e2..d32d63f 100644 --- a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java +++ b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. + * SPDX-FileType: SOURCE + * SPDX-License-Identifier: Apache-2.0 + */ package org.spdx.tools.schema; import java.io.File; diff --git a/testResources/sourcefiles/AbstractFileCompareSheet.java b/testResources/sourcefiles/AbstractFileCompareSheet.java index 1f194d0..6be9eca 100644 --- a/testResources/sourcefiles/AbstractFileCompareSheet.java +++ b/testResources/sourcefiles/AbstractFileCompareSheet.java @@ -24,7 +24,6 @@ * The first column is the file path, second column indicates if all documents are equal, * columns 3 through N are for the values of the individual documents * @author Gary O'Neall - * */ public abstract class AbstractFileCompareSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/AbstractSheet.java b/testResources/sourcefiles/AbstractSheet.java index de7c9f4..2a95922 100644 --- a/testResources/sourcefiles/AbstractSheet.java +++ b/testResources/sourcefiles/AbstractSheet.java @@ -27,7 +27,6 @@ /** * Abstract class representing a workbook sheet used in storing structured data * @author Gary O'Neall - * */ public abstract class AbstractSheet { diff --git a/testResources/sourcefiles/CompareHelper.java b/testResources/sourcefiles/CompareHelper.java index 2571377..1b116e3 100644 --- a/testResources/sourcefiles/CompareHelper.java +++ b/testResources/sourcefiles/CompareHelper.java @@ -29,7 +29,6 @@ /** * Helper class for comparisons * @author Gary O'Neall - * */ public class CompareHelper { diff --git a/testResources/sourcefiles/CreatorSheet.java b/testResources/sourcefiles/CreatorSheet.java index d4a995f..cda89c0 100644 --- a/testResources/sourcefiles/CreatorSheet.java +++ b/testResources/sourcefiles/CreatorSheet.java @@ -23,7 +23,6 @@ * Column 1 describes if the creator is the same or different * Columns 2 through N are for creators in each of the documents * @author Gary O'Neall - * */ public class CreatorSheet extends AbstractSheet { private static final int COL_WIDTH = 50; diff --git a/testResources/sourcefiles/DocumentAnnotationSheet.java b/testResources/sourcefiles/DocumentAnnotationSheet.java index 610969c..4bd98bf 100644 --- a/testResources/sourcefiles/DocumentAnnotationSheet.java +++ b/testResources/sourcefiles/DocumentAnnotationSheet.java @@ -23,7 +23,6 @@ /** * Sheet for document level annotations * @author Gary O'Neall - * */ public class DocumentAnnotationSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/DocumentRelationshipSheet.java b/testResources/sourcefiles/DocumentRelationshipSheet.java index fcb81b7..8dfd639 100644 --- a/testResources/sourcefiles/DocumentRelationshipSheet.java +++ b/testResources/sourcefiles/DocumentRelationshipSheet.java @@ -23,7 +23,6 @@ /** * Sheet for document level relationships * @author Gary O'Neall - * */ public class DocumentRelationshipSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/DocumentSheet.java b/testResources/sourcefiles/DocumentSheet.java index eafd67a..0f37155 100644 --- a/testResources/sourcefiles/DocumentSheet.java +++ b/testResources/sourcefiles/DocumentSheet.java @@ -23,7 +23,6 @@ * The first row summarizes which fields are different, the subsequent rows are the * specific date from each result * @author Gary O'Neall - * */ public class DocumentSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/ExternalReferencesSheet.java b/testResources/sourcefiles/ExternalReferencesSheet.java index 00296bb..3094b6f 100644 --- a/testResources/sourcefiles/ExternalReferencesSheet.java +++ b/testResources/sourcefiles/ExternalReferencesSheet.java @@ -24,7 +24,6 @@ /** * Sheet that compares the external document references * @author Gary O'Neall - * */ public class ExternalReferencesSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/ExtractedLicenseSheet.java b/testResources/sourcefiles/ExtractedLicenseSheet.java index 01a2460..2ca153f 100644 --- a/testResources/sourcefiles/ExtractedLicenseSheet.java +++ b/testResources/sourcefiles/ExtractedLicenseSheet.java @@ -29,7 +29,6 @@ * Column 1 contains the extracted text * Columns 2 through N contains the license information in the format licenseId [licenseName] {licenceUrls} (licenseComment) * @author Gary O'Neall - * */ public class ExtractedLicenseSheet extends AbstractSheet { diff --git a/testResources/sourcefiles/FileAnnotationSheet.java b/testResources/sourcefiles/FileAnnotationSheet.java index c517de7..3a11b12 100644 --- a/testResources/sourcefiles/FileAnnotationSheet.java +++ b/testResources/sourcefiles/FileAnnotationSheet.java @@ -14,7 +14,6 @@ /** * Sheet comparing file annotations * @author Gary O'Neall - * */ public class FileAnnotationSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileAttributionSheet.java b/testResources/sourcefiles/FileAttributionSheet.java index ad5775f..3bbf3e6 100644 --- a/testResources/sourcefiles/FileAttributionSheet.java +++ b/testResources/sourcefiles/FileAttributionSheet.java @@ -17,7 +17,6 @@ /** * Sheet with results for file contributor comparison results * @author Gary O'Neall - * */ public class FileAttributionSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileChecksumSheet.java b/testResources/sourcefiles/FileChecksumSheet.java index 4926a03..a2a39cb 100644 --- a/testResources/sourcefiles/FileChecksumSheet.java +++ b/testResources/sourcefiles/FileChecksumSheet.java @@ -17,7 +17,6 @@ /** * Sheet of comparison results for file checksums * @author Gary O'Neall - * */ public class FileChecksumSheet extends AbstractFileCompareSheet { diff --git a/testResources/sourcefiles/FileCommentSheet.java b/testResources/sourcefiles/FileCommentSheet.java index ef0ab08..805518e 100644 --- a/testResources/sourcefiles/FileCommentSheet.java +++ b/testResources/sourcefiles/FileCommentSheet.java @@ -14,7 +14,6 @@ /** * Sheet containing results for file comment comparison * @author Gary O'Neall - * */ public class FileCommentSheet extends AbstractFileCompareSheet { From 49d44519782c9440d1383a60f6bc5396c6193c7c Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 1 Feb 2025 07:52:32 +0100 Subject: [PATCH 3/9] Add newline character at the end of file Signed-off-by: Arthit Suriyawongkul --- testResources/sourcefiles/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testResources/sourcefiles/package-info.java b/testResources/sourcefiles/package-info.java index 9bf2e0f..6c75bd3 100644 --- a/testResources/sourcefiles/package-info.java +++ b/testResources/sourcefiles/package-info.java @@ -8,4 +8,4 @@ * * @author Gary O'Neall */ -package org.spdx.tools.compare; \ No newline at end of file +package org.spdx.tools.compare; From fb26927ca415ed3a65e1c07bfefebaf9aee50779 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Mon, 3 Feb 2025 00:49:43 +0100 Subject: [PATCH 4/9] Update package-info.java Signed-off-by: Arthit Suriyawongkul --- testResources/sourcefiles/package-info.java | 1 + 1 file changed, 1 insertion(+) diff --git a/testResources/sourcefiles/package-info.java b/testResources/sourcefiles/package-info.java index 6c75bd3..3f7dc30 100644 --- a/testResources/sourcefiles/package-info.java +++ b/testResources/sourcefiles/package-info.java @@ -3,6 +3,7 @@ * SPDX-FileType: SOURCE * SPDX-License-Identifier: Apache-2.0 */ + /** * Classes related to the Compare SPDX Docs utilities * From 5b0d48a4a8cf2b62c32a7fa86abf4a3421c277b6 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 26 Feb 2025 08:45:16 +0800 Subject: [PATCH 5/9] Add back copyright notice text Signed-off-by: Arthit Suriyawongkul --- src/main/java/org/spdx/tools/CompareSpdxDocs.java | 13 +++++++++++++ .../org/spdx/tools/GenerateVerificationCode.java | 13 +++++++++++++ .../org/spdx/tools/InvalidFileNameException.java | 13 +++++++++++++ src/main/java/org/spdx/tools/Main.java | 13 +++++++++++++ .../org/spdx/tools/MatchingStandardLicenses.java | 13 +++++++++++++ .../java/org/spdx/tools/OnlineToolException.java | 13 +++++++++++++ .../java/org/spdx/tools/RdfSchemaToJsonContext.java | 13 +++++++++++++ .../java/org/spdx/tools/RdfSchemaToJsonSchema.java | 13 +++++++++++++ src/main/java/org/spdx/tools/RdfSchemaToXsd.java | 13 +++++++++++++ src/main/java/org/spdx/tools/SpdxConverter.java | 13 +++++++++++++ .../java/org/spdx/tools/SpdxConverterException.java | 13 +++++++++++++ src/main/java/org/spdx/tools/SpdxToolsHelper.java | 6 +++--- .../org/spdx/tools/SpdxVerificationException.java | 13 +++++++++++++ src/main/java/org/spdx/tools/SpdxVersion.java | 13 +++++++++++++ src/main/java/org/spdx/tools/SpdxViewer.java | 13 +++++++++++++ src/main/java/org/spdx/tools/Verify.java | 13 +++++++++++++ .../tools/compare/AbstractFileCompareSheet.java | 13 +++++++++++++ .../java/org/spdx/tools/compare/AbstractSheet.java | 13 +++++++++++++ 18 files changed, 224 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spdx/tools/CompareSpdxDocs.java b/src/main/java/org/spdx/tools/CompareSpdxDocs.java index 4183bc8..5d02b77 100644 --- a/src/main/java/org/spdx/tools/CompareSpdxDocs.java +++ b/src/main/java/org/spdx/tools/CompareSpdxDocs.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/GenerateVerificationCode.java b/src/main/java/org/spdx/tools/GenerateVerificationCode.java index 0b711fd..c125df5 100644 --- a/src/main/java/org/spdx/tools/GenerateVerificationCode.java +++ b/src/main/java/org/spdx/tools/GenerateVerificationCode.java @@ -2,6 +2,19 @@ * 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. + * You may obtain a copy of the License at + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/InvalidFileNameException.java b/src/main/java/org/spdx/tools/InvalidFileNameException.java index f27ab1b..9f438fe 100644 --- a/src/main/java/org/spdx/tools/InvalidFileNameException.java +++ b/src/main/java/org/spdx/tools/InvalidFileNameException.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/Main.java b/src/main/java/org/spdx/tools/Main.java index 1c658e0..0f1123a 100644 --- a/src/main/java/org/spdx/tools/Main.java +++ b/src/main/java/org/spdx/tools/Main.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java index 62e1b80..272d95b 100644 --- a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java +++ b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java @@ -2,6 +2,19 @@ * SPDX-FileCopyrightText: Copyright (c) 2014 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/OnlineToolException.java b/src/main/java/org/spdx/tools/OnlineToolException.java index b1a831e..59be6fb 100644 --- a/src/main/java/org/spdx/tools/OnlineToolException.java +++ b/src/main/java/org/spdx/tools/OnlineToolException.java @@ -2,6 +2,19 @@ * SPDX-FileCopyrightText: Copyright (c) 2017 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java b/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java index ebc4f97..299099a 100644 --- a/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java +++ b/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java b/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java index 123fe98..595257b 100644 --- a/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java +++ b/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/RdfSchemaToXsd.java b/src/main/java/org/spdx/tools/RdfSchemaToXsd.java index 864bfa6..5482966 100644 --- a/src/main/java/org/spdx/tools/RdfSchemaToXsd.java +++ b/src/main/java/org/spdx/tools/RdfSchemaToXsd.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/SpdxConverter.java b/src/main/java/org/spdx/tools/SpdxConverter.java index 2ebf311..d8c010c 100644 --- a/src/main/java/org/spdx/tools/SpdxConverter.java +++ b/src/main/java/org/spdx/tools/SpdxConverter.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/SpdxConverterException.java b/src/main/java/org/spdx/tools/SpdxConverterException.java index 5bfdafb..ad20b34 100644 --- a/src/main/java/org/spdx/tools/SpdxConverterException.java +++ b/src/main/java/org/spdx/tools/SpdxConverterException.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/SpdxToolsHelper.java b/src/main/java/org/spdx/tools/SpdxToolsHelper.java index 9505ffd..4c37030 100644 --- a/src/main/java/org/spdx/tools/SpdxToolsHelper.java +++ b/src/main/java/org/spdx/tools/SpdxToolsHelper.java @@ -1,12 +1,13 @@ /** * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc. * SPDX-FileType: SOURCE - * SPDX-License-Identifier: Apache-2.0 * + * 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 + * https://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, @@ -14,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * SPDX-License-Identifier: Apache-2.0 */ package org.spdx.tools; diff --git a/src/main/java/org/spdx/tools/SpdxVerificationException.java b/src/main/java/org/spdx/tools/SpdxVerificationException.java index 7c1cf41..5a75b45 100644 --- a/src/main/java/org/spdx/tools/SpdxVerificationException.java +++ b/src/main/java/org/spdx/tools/SpdxVerificationException.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/SpdxVersion.java b/src/main/java/org/spdx/tools/SpdxVersion.java index e0643f4..eec1812 100644 --- a/src/main/java/org/spdx/tools/SpdxVersion.java +++ b/src/main/java/org/spdx/tools/SpdxVersion.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/SpdxViewer.java b/src/main/java/org/spdx/tools/SpdxViewer.java index b9d7440..cd2c37a 100644 --- a/src/main/java/org/spdx/tools/SpdxViewer.java +++ b/src/main/java/org/spdx/tools/SpdxViewer.java @@ -2,6 +2,19 @@ * SPDX-FileCopyrightText: Copyright (c) 2010 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/Verify.java b/src/main/java/org/spdx/tools/Verify.java index 33b3ad2..0942914 100644 --- a/src/main/java/org/spdx/tools/Verify.java +++ b/src/main/java/org/spdx/tools/Verify.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java index 57ccd54..6d1c1dc 100644 --- a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java +++ b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/AbstractSheet.java b/src/main/java/org/spdx/tools/compare/AbstractSheet.java index 4a13b90..207d7b6 100644 --- a/src/main/java/org/spdx/tools/compare/AbstractSheet.java +++ b/src/main/java/org/spdx/tools/compare/AbstractSheet.java @@ -2,6 +2,19 @@ * 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. + * You may obtain a copy of the License at + * + * https://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.tools.compare; From 4158f8f7415e043ed64af80384057397578ef13f Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 26 Feb 2025 10:43:05 +0800 Subject: [PATCH 6/9] Add back copyright notice text Signed-off-by: Arthit Suriyawongkul --- .../java/org/spdx/tools/compare/CompareHelper.java | 13 +++++++++++++ .../java/org/spdx/tools/compare/CreatorSheet.java | 13 +++++++++++++ .../spdx/tools/compare/DocumentAnnotationSheet.java | 13 +++++++++++++ .../tools/compare/DocumentRelationshipSheet.java | 13 +++++++++++++ .../java/org/spdx/tools/compare/DocumentSheet.java | 13 +++++++++++++ .../spdx/tools/compare/ExternalReferencesSheet.java | 13 +++++++++++++ .../spdx/tools/compare/ExtractedLicenseSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileAnnotationSheet.java | 13 +++++++++++++ .../spdx/tools/compare/FileAttributionSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileChecksumSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileCommentSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileConcludedSheet.java | 13 +++++++++++++ .../spdx/tools/compare/FileContributorsSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileCopyrightSheet.java | 13 +++++++++++++ .../tools/compare/FileLicenseCommentsSheet.java | 13 +++++++++++++ .../spdx/tools/compare/FileLicenseInfoSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileNoticeSheet.java | 13 +++++++++++++ .../spdx/tools/compare/FileRelationshipSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/FileSpdxIdSheet.java | 13 +++++++++++++ .../java/org/spdx/tools/compare/FileTypeSheet.java | 13 +++++++++++++ .../tools/compare/MultiDocumentSpreadsheet.java | 13 +++++++++++++ .../tools/compare/NormalizedFileNameComparator.java | 13 +++++++++++++ .../java/org/spdx/tools/compare/PackageSheet.java | 13 +++++++++++++ .../java/org/spdx/tools/compare/SnippetSheet.java | 13 +++++++++++++ .../org/spdx/tools/compare/VerificationSheet.java | 13 +++++++++++++ .../java/org/spdx/tools/CompareSpdxDocsTest.java | 13 +++++++++++++ .../java/org/spdx/tools/SpdxConverterTestV2.java | 13 +++++++++++++ 27 files changed, 351 insertions(+) diff --git a/src/main/java/org/spdx/tools/compare/CompareHelper.java b/src/main/java/org/spdx/tools/compare/CompareHelper.java index 73b5a2d..381af00 100644 --- a/src/main/java/org/spdx/tools/compare/CompareHelper.java +++ b/src/main/java/org/spdx/tools/compare/CompareHelper.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/CreatorSheet.java b/src/main/java/org/spdx/tools/compare/CreatorSheet.java index bf75398..1e0477b 100644 --- a/src/main/java/org/spdx/tools/compare/CreatorSheet.java +++ b/src/main/java/org/spdx/tools/compare/CreatorSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java index c69f924..a8ec948 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java index ef03a05..b7f1dae 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/DocumentSheet.java b/src/main/java/org/spdx/tools/compare/DocumentSheet.java index 7ce6709..efd8650 100644 --- a/src/main/java/org/spdx/tools/compare/DocumentSheet.java +++ b/src/main/java/org/spdx/tools/compare/DocumentSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java index 100cad2..4cac713 100644 --- a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java +++ b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java index add8986..5971296 100644 --- a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java +++ b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java index 0a54402..4a6e79a 100644 --- a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java index 8fd68fd..737f886 100644 --- a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java index dd23d9b..d2d11bd 100644 --- a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java index 7676a2a..021558f 100644 --- a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java index ad36be3..d616012 100644 --- a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java index 61ebb43..871ff33 100644 --- a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java index 2ccae4d..eb52526 100644 --- a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java index 8f020b6..7475a48 100644 --- a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java index 8a5abd1..78313be 100644 --- a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java index 784b67b..56b526d 100644 --- a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java index edc2896..9bd2db3 100644 --- a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java index ab8cf80..9a56d5f 100644 --- a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java index 31f934a..55bb071 100644 --- a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java +++ b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java index 9328cf0..2ad3478 100644 --- a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java +++ b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java index a03d082..170e50a 100644 --- a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java +++ b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/PackageSheet.java b/src/main/java/org/spdx/tools/compare/PackageSheet.java index 406ac91..67a6159 100644 --- a/src/main/java/org/spdx/tools/compare/PackageSheet.java +++ b/src/main/java/org/spdx/tools/compare/PackageSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/SnippetSheet.java b/src/main/java/org/spdx/tools/compare/SnippetSheet.java index f172bbd..6f50d6c 100644 --- a/src/main/java/org/spdx/tools/compare/SnippetSheet.java +++ b/src/main/java/org/spdx/tools/compare/SnippetSheet.java @@ -2,6 +2,19 @@ * SPDX-FileCopyrightText: Copyright (c) 2016 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 + * + * https://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.tools.compare; diff --git a/src/main/java/org/spdx/tools/compare/VerificationSheet.java b/src/main/java/org/spdx/tools/compare/VerificationSheet.java index 86e3da3..945d487 100644 --- a/src/main/java/org/spdx/tools/compare/VerificationSheet.java +++ b/src/main/java/org/spdx/tools/compare/VerificationSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java index 6792a9b..d72556c 100644 --- a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java +++ b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; diff --git a/src/test/java/org/spdx/tools/SpdxConverterTestV2.java b/src/test/java/org/spdx/tools/SpdxConverterTestV2.java index e91d479..ce8402c 100644 --- a/src/test/java/org/spdx/tools/SpdxConverterTestV2.java +++ b/src/test/java/org/spdx/tools/SpdxConverterTestV2.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools; From 4f8740e88706a5e0a37280c1778b1b97bff23193 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 26 Feb 2025 10:48:40 +0800 Subject: [PATCH 7/9] Add back copyright notice text Signed-off-by: Arthit Suriyawongkul --- .../sourcefiles/AbstractFileCompareSheet.java | 13 +++++++++++++ testResources/sourcefiles/AbstractSheet.java | 13 +++++++++++++ testResources/sourcefiles/CompareHelper.java | 13 +++++++++++++ testResources/sourcefiles/CreatorSheet.java | 13 +++++++++++++ .../sourcefiles/DocumentAnnotationSheet.java | 13 +++++++++++++ .../sourcefiles/DocumentRelationshipSheet.java | 13 +++++++++++++ testResources/sourcefiles/DocumentSheet.java | 13 +++++++++++++ .../sourcefiles/ExternalReferencesSheet.java | 13 +++++++++++++ .../sourcefiles/ExtractedLicenseSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileAnnotationSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileAttributionSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileChecksumSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileCommentSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileConcludedSheet.java | 13 +++++++++++++ .../sourcefiles/FileContributorsSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileCopyrightSheet.java | 13 +++++++++++++ .../sourcefiles/FileLicenseCommentsSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileLicenseInfoSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileNoticeSheet.java | 13 +++++++++++++ .../sourcefiles/FileRelationshipSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileSpdxIdSheet.java | 13 +++++++++++++ testResources/sourcefiles/FileTypeSheet.java | 13 +++++++++++++ .../sourcefiles/MultiDocumentSpreadsheet.java | 13 +++++++++++++ .../sourcefiles/NormalizedFileNameComparator.java | 13 +++++++++++++ testResources/sourcefiles/PackageSheet.java | 13 +++++++++++++ testResources/sourcefiles/SnippetSheet.java | 13 +++++++++++++ testResources/sourcefiles/VerificationSheet.java | 13 +++++++++++++ testResources/sourcefiles/package-info.java | 13 +++++++++++++ 28 files changed, 364 insertions(+) diff --git a/testResources/sourcefiles/AbstractFileCompareSheet.java b/testResources/sourcefiles/AbstractFileCompareSheet.java index 6be9eca..f908977 100644 --- a/testResources/sourcefiles/AbstractFileCompareSheet.java +++ b/testResources/sourcefiles/AbstractFileCompareSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/AbstractSheet.java b/testResources/sourcefiles/AbstractSheet.java index 2a95922..c302bbe 100644 --- a/testResources/sourcefiles/AbstractSheet.java +++ b/testResources/sourcefiles/AbstractSheet.java @@ -2,6 +2,19 @@ * 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. + * You may obtain a copy of the License at + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/CompareHelper.java b/testResources/sourcefiles/CompareHelper.java index 1b116e3..ed3631e 100644 --- a/testResources/sourcefiles/CompareHelper.java +++ b/testResources/sourcefiles/CompareHelper.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/CreatorSheet.java b/testResources/sourcefiles/CreatorSheet.java index cda89c0..a9edca4 100644 --- a/testResources/sourcefiles/CreatorSheet.java +++ b/testResources/sourcefiles/CreatorSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/DocumentAnnotationSheet.java b/testResources/sourcefiles/DocumentAnnotationSheet.java index 4bd98bf..4eb1087 100644 --- a/testResources/sourcefiles/DocumentAnnotationSheet.java +++ b/testResources/sourcefiles/DocumentAnnotationSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/DocumentRelationshipSheet.java b/testResources/sourcefiles/DocumentRelationshipSheet.java index 8dfd639..36116eb 100644 --- a/testResources/sourcefiles/DocumentRelationshipSheet.java +++ b/testResources/sourcefiles/DocumentRelationshipSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/DocumentSheet.java b/testResources/sourcefiles/DocumentSheet.java index 0f37155..ebe5b07 100644 --- a/testResources/sourcefiles/DocumentSheet.java +++ b/testResources/sourcefiles/DocumentSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/ExternalReferencesSheet.java b/testResources/sourcefiles/ExternalReferencesSheet.java index 3094b6f..d9d8753 100644 --- a/testResources/sourcefiles/ExternalReferencesSheet.java +++ b/testResources/sourcefiles/ExternalReferencesSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/ExtractedLicenseSheet.java b/testResources/sourcefiles/ExtractedLicenseSheet.java index 2ca153f..2437aac 100644 --- a/testResources/sourcefiles/ExtractedLicenseSheet.java +++ b/testResources/sourcefiles/ExtractedLicenseSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileAnnotationSheet.java b/testResources/sourcefiles/FileAnnotationSheet.java index 3a11b12..86d3dab 100644 --- a/testResources/sourcefiles/FileAnnotationSheet.java +++ b/testResources/sourcefiles/FileAnnotationSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileAttributionSheet.java b/testResources/sourcefiles/FileAttributionSheet.java index 3bbf3e6..31be291 100644 --- a/testResources/sourcefiles/FileAttributionSheet.java +++ b/testResources/sourcefiles/FileAttributionSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileChecksumSheet.java b/testResources/sourcefiles/FileChecksumSheet.java index a2a39cb..e046f72 100644 --- a/testResources/sourcefiles/FileChecksumSheet.java +++ b/testResources/sourcefiles/FileChecksumSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileCommentSheet.java b/testResources/sourcefiles/FileCommentSheet.java index 805518e..45b98c6 100644 --- a/testResources/sourcefiles/FileCommentSheet.java +++ b/testResources/sourcefiles/FileCommentSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileConcludedSheet.java b/testResources/sourcefiles/FileConcludedSheet.java index caef38f..e6d5884 100644 --- a/testResources/sourcefiles/FileConcludedSheet.java +++ b/testResources/sourcefiles/FileConcludedSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileContributorsSheet.java b/testResources/sourcefiles/FileContributorsSheet.java index 08b86b4..00e8dba 100644 --- a/testResources/sourcefiles/FileContributorsSheet.java +++ b/testResources/sourcefiles/FileContributorsSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileCopyrightSheet.java b/testResources/sourcefiles/FileCopyrightSheet.java index f45b236..0448492 100644 --- a/testResources/sourcefiles/FileCopyrightSheet.java +++ b/testResources/sourcefiles/FileCopyrightSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileLicenseCommentsSheet.java b/testResources/sourcefiles/FileLicenseCommentsSheet.java index b4f7889..e75d38f 100644 --- a/testResources/sourcefiles/FileLicenseCommentsSheet.java +++ b/testResources/sourcefiles/FileLicenseCommentsSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileLicenseInfoSheet.java b/testResources/sourcefiles/FileLicenseInfoSheet.java index d847efe..d98e8ea 100644 --- a/testResources/sourcefiles/FileLicenseInfoSheet.java +++ b/testResources/sourcefiles/FileLicenseInfoSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileNoticeSheet.java b/testResources/sourcefiles/FileNoticeSheet.java index 6e27aa3..20903b0 100644 --- a/testResources/sourcefiles/FileNoticeSheet.java +++ b/testResources/sourcefiles/FileNoticeSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileRelationshipSheet.java b/testResources/sourcefiles/FileRelationshipSheet.java index d3c3ac8..0ac675e 100644 --- a/testResources/sourcefiles/FileRelationshipSheet.java +++ b/testResources/sourcefiles/FileRelationshipSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileSpdxIdSheet.java b/testResources/sourcefiles/FileSpdxIdSheet.java index 2866ba6..2e1602d 100644 --- a/testResources/sourcefiles/FileSpdxIdSheet.java +++ b/testResources/sourcefiles/FileSpdxIdSheet.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/FileTypeSheet.java b/testResources/sourcefiles/FileTypeSheet.java index 56fa640..c12abb2 100644 --- a/testResources/sourcefiles/FileTypeSheet.java +++ b/testResources/sourcefiles/FileTypeSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/MultiDocumentSpreadsheet.java b/testResources/sourcefiles/MultiDocumentSpreadsheet.java index b786f06..ba33332 100644 --- a/testResources/sourcefiles/MultiDocumentSpreadsheet.java +++ b/testResources/sourcefiles/MultiDocumentSpreadsheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/NormalizedFileNameComparator.java b/testResources/sourcefiles/NormalizedFileNameComparator.java index 351f77a..9a65cb3 100644 --- a/testResources/sourcefiles/NormalizedFileNameComparator.java +++ b/testResources/sourcefiles/NormalizedFileNameComparator.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/PackageSheet.java b/testResources/sourcefiles/PackageSheet.java index 9ec328d..c99e9f8 100644 --- a/testResources/sourcefiles/PackageSheet.java +++ b/testResources/sourcefiles/PackageSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/SnippetSheet.java b/testResources/sourcefiles/SnippetSheet.java index 1bbfa2f..e9a0c45 100644 --- a/testResources/sourcefiles/SnippetSheet.java +++ b/testResources/sourcefiles/SnippetSheet.java @@ -2,6 +2,19 @@ * SPDX-FileCopyrightText: Copyright (c) 2016 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/VerificationSheet.java b/testResources/sourcefiles/VerificationSheet.java index d1e46f3..d00cdbe 100644 --- a/testResources/sourcefiles/VerificationSheet.java +++ b/testResources/sourcefiles/VerificationSheet.java @@ -3,6 +3,19 @@ * 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 + * + * https://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.tools.compare; diff --git a/testResources/sourcefiles/package-info.java b/testResources/sourcefiles/package-info.java index 3f7dc30..f5ad148 100644 --- a/testResources/sourcefiles/package-info.java +++ b/testResources/sourcefiles/package-info.java @@ -2,6 +2,19 @@ * 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 + * + * https://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. + * */ /** From c1058f3734160026f3da04b14b3ee56e5777086c Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 26 Feb 2025 11:00:55 +0800 Subject: [PATCH 8/9] Add back copyright notice text Signed-off-by: Arthit Suriyawongkul --- .../org/spdx/tools/compare/package-info.java | 13 +++++++ .../tools/schema/AbstractOwlRdfConverter.java | 13 +++++++ .../spdx/tools/schema/OwlToJsonContext.java | 13 +++++++ .../spdx/tools/schema/OwlToJsonSchema.java | 13 +++++++ .../java/org/spdx/tools/schema/OwlToXsd.java | 13 +++++++ .../spdx/tools/schema/SchemaException.java | 39 +++++++++++++++---- .../org/spdx/tools/schema/package-info.java | 13 +++++++ 7 files changed, 109 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/spdx/tools/compare/package-info.java b/src/main/java/org/spdx/tools/compare/package-info.java index 3f7dc30..f5ad148 100644 --- a/src/main/java/org/spdx/tools/compare/package-info.java +++ b/src/main/java/org/spdx/tools/compare/package-info.java @@ -2,6 +2,19 @@ * 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 + * + * https://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. + * */ /** diff --git a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java index 284e6e3..f945e8e 100644 --- a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java +++ b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java index d31b406..b205af2 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java +++ b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java b/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java index d1a5c4d..beb7b84 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java +++ b/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/OwlToXsd.java b/src/main/java/org/spdx/tools/schema/OwlToXsd.java index 3947814..60c0a15 100644 --- a/src/main/java/org/spdx/tools/schema/OwlToXsd.java +++ b/src/main/java/org/spdx/tools/schema/OwlToXsd.java @@ -2,6 +2,19 @@ * 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 + * + * https://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.tools.schema; diff --git a/src/main/java/org/spdx/tools/schema/SchemaException.java b/src/main/java/org/spdx/tools/schema/SchemaException.java index d57e263..77d88e6 100644 --- a/src/main/java/org/spdx/tools/schema/SchemaException.java +++ b/src/main/java/org/spdx/tools/schema/SchemaException.java @@ -2,39 +2,62 @@ * 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 + * + * https://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.tools.schema; /** + * Exception thrown for schema-related errors + * * @author Gary O'Neall */ public class SchemaException extends Exception { /** - * + * Serial version UID for serialization */ private static final long serialVersionUID = 1L; /** - * @param message + * Constructs a new SchemaException with the specified detail message + * + * @param message the detail message */ public SchemaException(String message) { super(message); } /** - * @param message - * @param cause + * Constructs a new SchemaException with the specified detail message and + * cause + * + * @param message the detail message + * @param cause the cause */ public SchemaException(String message, Throwable cause) { super(message, cause); } /** - * @param message - * @param cause - * @param enableSuppression - * @param writableStackTrace + * Constructs a new SchemaException with the specified detail message, + * cause, and configurations + * + * @param message the detail message + * @param cause the cause + * @param enableSuppression whether or not suppression is enabled + * @param writableStackTrace whether or not the stack trace is writable */ public SchemaException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { super(message, cause, enableSuppression, writableStackTrace); diff --git a/src/main/java/org/spdx/tools/schema/package-info.java b/src/main/java/org/spdx/tools/schema/package-info.java index ddb494f..8610df2 100644 --- a/src/main/java/org/spdx/tools/schema/package-info.java +++ b/src/main/java/org/spdx/tools/schema/package-info.java @@ -2,6 +2,19 @@ * 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 + * + * https://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. + * */ /** From c397e9356f0f1c998270ad1bcbfd0d655da23ef4 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 26 Feb 2025 13:56:07 +0800 Subject: [PATCH 9/9] Add Javadoc comments Signed-off-by: Arthit Suriyawongkul --- src/main/java/org/spdx/tools/CONTRIBUTING.md | 6 +++++- src/main/java/org/spdx/tools/CompareSpdxDocs.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spdx/tools/CONTRIBUTING.md b/src/main/java/org/spdx/tools/CONTRIBUTING.md index 755f112..a41d4ff 100644 --- a/src/main/java/org/spdx/tools/CONTRIBUTING.md +++ b/src/main/java/org/spdx/tools/CONTRIBUTING.md @@ -1,15 +1,18 @@ Contributing ============ + Thank you for your interest in `Spdx-Java-Library`. The project is open-source software, and bug reports, suggestions, and most especially patches are welcome. Issues ------ + `Spdx-Java-Library` has a [project page on GitHub](https://github.com/spdx/Spdx-Java-Library) where you can [create an issue](https://github.com/spdx/Spdx-Java-Library/issues/new/choose) to report a bug, make a suggestion, or propose a substantial change or improvement that you might like to make. You may also wish to contact the SPDX working group technical team through its mailing list, [spdx-tech@lists.spdx.org](mailto:spdx-tech@lists.spdx.org). If you would like to work on a fix for any issue, please assign the issue to yourself prior to creating a Pull Request. Pull Requests ------- + The source code for `Spdx-Java-Library` is hosted on [github.com/spdx/Spdx-Java-Library](https://github.com/spdx/Spdx-Java-Library). Please review [open pull requests](https://github.com/spdx/Spdx-Java-Library/pulls) and [active branches](https://github.com/spdx/Spdx-Java-Library/branches) before committing time to a substantial revision. Work along similar lines may already be in progress. To submit a pull request via GitHub, fork the repository, create a topic branch from `master` for your work, and send a pull request when ready. If you would prefer to send a patch or grant access to pull from your own Git repository, please contact the project's contributors by e-mail. @@ -20,4 +23,5 @@ Once implemented, submit a pull request with `spec/X.X` branch as the parent bra Licensing --------- -However you choose to contribute, please sign-off in each of your commits that you license your contributions under the terms of [the Developer Certificate of Origin](https://developercertificate.org/). Git has utilities for signing off on commits: `git commit -s` signs a current commit, and `git rebase --signoff ` retroactively signs a range of past commits. \ No newline at end of file + +However you choose to contribute, please sign-off in each of your commits that you license your contributions under the terms of [the Developer Certificate of Origin](https://developercertificate.org/). Git has utilities for signing off on commits: `git commit -s` signs a current commit, and `git rebase --signoff ` retroactively signs a range of past commits. diff --git a/src/main/java/org/spdx/tools/CompareSpdxDocs.java b/src/main/java/org/spdx/tools/CompareSpdxDocs.java index 5d02b77..fdc9629 100644 --- a/src/main/java/org/spdx/tools/CompareSpdxDocs.java +++ b/src/main/java/org/spdx/tools/CompareSpdxDocs.java @@ -78,6 +78,7 @@ public static void main(String[] args) { } /** + * Invoke SPDX document processing functions from the online tool * * @param args args[0] is the output Excel file name, all other args are SPDX document file names * @throws OnlineToolException Exception caught by JPype and displayed to the user