make lint-reuse: fix SPDX copyright notice.
makefiles/lint/groovy/.groovylintrc.json
----------------------------------------
o Inline notice strings as json record data.
.gitignore
----------
o Special case for source patches.
o reuse tool does not support exceptions.
o Cannot inline copyright strings in patch data due to patched files being altered.
o Workaround: gitignore patch sources post checkin.
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Change-Id: Ifd96df363dbdd234992383d3f971cb1c06e3b599
diff --git a/.gitignore b/.gitignore
index e6aa685..ab10eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,18 @@
## Python patch creation
staging/
+## -----------------------------------------------------------------------
+## License checking:
+## o Absolutely no exceptions, exclusions are not supported.
+## o We cannot simply hack around the problem by inlininig a notice
+## to disable checking because comments will be branded into the
+## patched file.
+## o Maybe this is OK given the patched file is a derived work but
+## legal input required before that answer can be used.
+## -----------------------------------------------------------------------
+makefiles/virtualenv/patches/lib/python3.10/site-packages/robot/utils/normalizing.py/patch
+makefiles/virtualenv/patches/lib/python3.10/site-packages/robot/utils/robottypes3.py/patch
+makefiles/virtualenv/patches/lib/python3.10/site-packages/sphinx/util/typing.py/patch
+makefiles/virtualenv/patches/lib/python3.10/site-packages/sphinxcontrib/openapi/utils.py/patch
+
# [EOF]
diff --git a/makefiles/lint/groovy/.groovylintrc.json b/makefiles/lint/groovy/.groovylintrc.json
index 3392108..ddabd04 100644
--- a/makefiles/lint/groovy/.groovylintrc.json
+++ b/makefiles/lint/groovy/.groovylintrc.json
@@ -1,46 +1,51 @@
{
- "extends": "all",
- "rules": {
- "basic.DeadCode": "error",
- "convention.CompileStatic": {
- "severity": "info"
+ "extends": "all",
+ "rules": {
+ "basic.DeadCode": "error",
+ "convention.CompileStatic": {
+ "severity": "info"
+ },
+ "convention.FieldTypeRequired": "info",
+ "convention.IfStatementCouldBeTernary": "info",
+ "convention.NoDef": "info",
+ "convention.TrailingComma": "off",
+ "convention.VariableTypeRequired": "info",
+ "dry.DuplicateListLiteral": "info",
+ "dry.DuplicateMapLiteral": "warning",
+ "dry.DuplicateNumberLiteral": {
+ "ignoreNumbers": [0, 1, 2, 3, -1],
+ "severity": "info"
+ },
+ "dry.DuplicateStringLiteral": "info",
+ "exceptions.ThrowException": "info",
+ "exceptions.ThrowNullPointerException": "info",
+ "exceptions.ThrowRuntimeException": "info",
+ "exceptions.ThrowThrowable": "info",
+ "formatting.BracesForClass": "info",
+ "formatting.BracesForForLoop": "info",
+ "formatting.BracesForIfElse": "off",
+ "formatting.BracesForMethod": "off",
+ "formatting.BracesForTryCatchFinally": "off",
+ "formatting.Indentation": {
+ "spacesPerIndentLevel": 4,
+ "severity": "info"
+ },
+ "formatting.SpaceAroundMapEntryColon": "off",
+ "groovyism.ExplicitCallToEqualsMethod": "info",
+ "logging.Println": "off",
+ "unused.UnusedArray": "error",
+ "unused.UnusedObject": "error",
+ "unused.UnusedPrivateField": "error",
+ "unused.UnusedPrivateMethod": "error",
+ "unused.UnusedPrivateMethodParameter": "error",
+ "unused.UnusedVariable": "error",
+ "unnecessary.UnnecessaryReturnKeyword": "off"
},
- "convention.FieldTypeRequired": "info",
- "convention.IfStatementCouldBeTernary": "info",
- "convention.NoDef": "info",
- "convention.TrailingComma": "off",
- "convention.VariableTypeRequired": "info",
- "dry.DuplicateListLiteral": "info",
- "dry.DuplicateMapLiteral": "warning",
- "dry.DuplicateNumberLiteral": {
- "ignoreNumbers": [0, 1, 2, 3, -1],
- "severity": "info"
+ "copyright-notice" : {
+ "SPDX-FileCopyrightText" : "2024 Open Networking Foundation Contributors",
+ "SPDX-License-Identifier" : "Apache-2.0"
},
- "dry.DuplicateStringLiteral": "info",
- "exceptions.ThrowException": "info",
- "exceptions.ThrowNullPointerException": "info",
- "exceptions.ThrowRuntimeException": "info",
- "exceptions.ThrowThrowable": "info",
- "formatting.BracesForClass": "info",
- "formatting.BracesForForLoop": "info",
- "formatting.BracesForIfElse": "off",
- "formatting.BracesForMethod": "off",
- "formatting.BracesForTryCatchFinally": "off",
- "formatting.Indentation": {
- "spacesPerIndentLevel": 4,
- "severity": "info"
- },
- "formatting.SpaceAroundMapEntryColon": "off",
- "groovyism.ExplicitCallToEqualsMethod": "info",
- "logging.Println": "off",
- "unused.UnusedArray": "error",
- "unused.UnusedObject": "error",
- "unused.UnusedPrivateField": "error",
- "unused.UnusedPrivateMethod": "error",
- "unused.UnusedPrivateMethodParameter": "error",
- "unused.UnusedVariable": "error",
- "unnecessary.UnnecessaryReturnKeyword": "off"
- },
- "see-also" : {
- ".groovylintrc-recommended.json" : "https://github.com/nvuillam/npm-groovy-lint/blob/main/lib/.groovylintrc-recommended.json" }
+ "see-also" : {
+ ".groovylintrc-recommended.json" : "https://github.com/nvuillam/npm-groovy-lint/blob/main/lib/.groovylintrc-recommended.json"
+ }
}