diff --git a/dependencies/package-lock.json b/dependencies/package-lock.json index 597b2afa..b121e07e 100644 --- a/dependencies/package-lock.json +++ b/dependencies/package-lock.json @@ -4054,9 +4054,9 @@ "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=" }, "npm-groovy-lint": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/npm-groovy-lint/-/npm-groovy-lint-7.5.1.tgz", - "integrity": "sha512-BX2ZL0/d/phWoNhupvY2lZk6ky3+nqGIzVuNDf33KENOpny1qzkMjMtVSwaRsF2lXMe8x7iZBPjvrLTUjw6VxQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/npm-groovy-lint/-/npm-groovy-lint-7.5.4.tgz", + "integrity": "sha512-ShDRyW0s4z3OXrz2jSfLqiI7n8Iqvh8XtpBUS2vlX4CgL65IBk5rIt2swQOUL/UWUt3BTUg509ACzhD2g3arJA==", "requires": { "amplitude": "^5.1.2", "ansi-colors": "^4.1.1", diff --git a/dependencies/package.json b/dependencies/package.json index 38ea0e86..e00ab0a3 100644 --- a/dependencies/package.json +++ b/dependencies/package.json @@ -16,7 +16,7 @@ "htmlhint": "^0.14.1", "jsonlint": "^1.6.3", "markdownlint-cli": "^0.23.2", - "npm-groovy-lint": "^7.5.1", + "npm-groovy-lint": "^7.5.4", "prettier": "^2.1.1", "prettyjson": "^1.2.1", "sql-lint": "0.0.15", diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index 822a1c4a..13371ef6 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -211,7 +211,7 @@ function BuildFileList() { # Get the GROOVY files # ######################## elif [ "$FILE_TYPE" == "groovy" ] || [ "$FILE_TYPE" == "jenkinsfile" ] || - [ "$FILE_TYPE" == "gradle" ]; then + [ "$FILE_TYPE" == "gradle" ] || [ "$FILE_TYPE" == "nf" ]; then ################################ # Append the file to the array # ################################ diff --git a/lib/linter.sh b/lib/linter.sh index 8282bee8..a9197d7c 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1549,7 +1549,7 @@ if [ "$VALIDATE_GROOVY" == "true" ]; then # Lint the groovy files # ######################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "${FILE_ARRAY_GROOVY[@]}" + LintCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\|nf\)\$" "${FILE_ARRAY_GROOVY[@]}" fi ################ diff --git a/lib/worker.sh b/lib/worker.sh index dc0ad6cf..7fb995a5 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -677,7 +677,7 @@ function RunTestCases() { TestCodebase "EDITORCONFIG" "editorconfig-checker" "editorconfig-checker" ".*\.ext$" "editorconfig-checker" TestCodebase "ENV" "dotenv-linter" "dotenv-linter" ".*\.\(env\)\$" "env" TestCodebase "GO" "golangci-lint" "golangci-lint run -c ${GO_LINTER_RULES}" ".*\.\(go\)\$" "golang" - TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "groovy" + TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\|nf\)\$" "groovy" TestCodebase "HTML" "htmlhint" "htmlhint --config ${HTML_LINTER_RULES}" ".*\.\(html\)\$" "html" TestCodebase "JAVA" "checkstyle" "java -jar /usr/bin/checkstyle -c ${JAVA_LINTER_RULES}" ".*\.\(java\)\$" "java" TestCodebase "JAVASCRIPT_ES" "eslint" "eslint --no-eslintrc -c ${JAVASCRIPT_LINTER_RULES}" ".*\.\(js\)\$" "javascript"