diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index 08c8058d..03399a28 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -44,7 +44,7 @@ jobs: # Mega-Linter - name: Mega-Linter id: ml - uses: oxsecurity/megalinter/flavors/javascript@v7 + uses: oxsecurity/megalinter/flavors/javascript@beta env: # All available variables are described in documentation # https://oxsecurity.github.io/megalinter/#configuration diff --git a/CHANGELOG.md b/CHANGELOG.md index dc020a28..a6677a96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## UNRELEASED +## [12.2.0] 2023-11-26 + +- Upgrade java-caller dependency to 3.2.0 (Now handles Mac M1) +- Output issue when error collecting CodeNarc version + ## [12.1.2] 2023-11-23 - Revert update that output json when not requested diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 803dd790..a6677a96 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,15 @@ ## UNRELEASED +## [12.2.0] 2023-11-26 + +- Upgrade java-caller dependency to 3.2.0 (Now handles Mac M1) +- Output issue when error collecting CodeNarc version + +## [12.1.2] 2023-11-23 + +- Revert update that output json when not requested + ## [12.1.1] 2023-11-19 - Upgrade node-java-caller to v3.1.1 diff --git a/lib/groovy-lint.js b/lib/groovy-lint.js index 4d6de13b..89b646e2 100644 --- a/lib/groovy-lint.js +++ b/lib/groovy-lint.js @@ -198,7 +198,7 @@ class NpmGroovyLint { const v = getNpmGroovyLintVersion(); const codeNarcVersionLinter = await new NpmGroovyLint([process.execPath, "", "--codenarcargs", "-version"], {}).run(); - const codeNarcVersionLines = [(await getSourceLines(codeNarcVersionLinter.codeNarcStdOut))[0]]; + const codeNarcVersionLines = [(await getSourceLines(codeNarcVersionLinter.codeNarcStdOut || "Error collecting CodeNarc version"))[0]]; const versions = []; versions.push(`npm-groovy-lint version ${v}`); diff --git a/package-lock.json b/package-lock.json index 3123e4f5..ffddf294 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "glob": "^7.1.6", "import-fresh": "^3.2.1", "ip": "^1.1.5", - "java-caller": "^3.1.1", + "java-caller": "^3.2.0", "js-yaml": "^4.1.0", "node-sarif-builder": "^2.0.3", "optionator": "^0.8.3", @@ -1295,9 +1295,12 @@ } }, "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } }, "node_modules/clean-stack": { "version": "2.2.0", @@ -2126,13 +2129,32 @@ } }, "node_modules/fs-minipass": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", - "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dependencies": { - "minipass": "^2.6.0" + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, + "node_modules/fs-minipass/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2974,13 +2996,13 @@ } }, "node_modules/java-caller": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/java-caller/-/java-caller-3.1.1.tgz", - "integrity": "sha512-ZAkoSYcOnrZFQ7i1AmS8PPhJsng/8SD7+5/B5yMe2rEHFBLsp7dfXS1YxruF0Q8pnDkFtlluaFhToYfwQTGU8A==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/java-caller/-/java-caller-3.2.0.tgz", + "integrity": "sha512-3BdkK4fNpUyNRPxsVIHJevXT5PiOHLmbKg1u8FqReMVAQesRAS6Z05x8siF/cXATV3XFqrIE11L7YWZqT4SNZQ==", "dependencies": { "debug": "^4.3.4", "fs-extra": "^11.1.1", - "njre": "^1.0.0", + "njre": "^1.1.0", "semver": "^7.5.4" }, "engines": { @@ -3257,36 +3279,56 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, "funding": { "url": "/~https://github.com/sponsors/ljharb" } }, "node_modules/minipass": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", - "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", - "dependencies": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" } }, "node_modules/minizlib": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", - "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dependencies": { - "minipass": "^2.9.0" + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dependencies": { - "minimist": "^1.2.6" + "yallist": "^4.0.0" }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "bin": { "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/mocha": { @@ -3457,13 +3499,13 @@ "dev": true }, "node_modules/njre": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/njre/-/njre-1.0.0.tgz", - "integrity": "sha512-jUJanjkrgiXb2iORubwlKGQH4rFzTgYS+Tbq3TCNbwRVO6DpBH5ImkeFwaeF5oPJnvMsfCK1CtS7/yRbrF1pEw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/njre/-/njre-1.1.0.tgz", + "integrity": "sha512-tOI/Nw0r6jEWpgrw3OyvaWi8AQsea0i2Lf20tPlRRwAe8YQHTvth5pP3JYWf7RYGWbTyZW5+SntnpxX4vs9aHA==", "dependencies": { "command-exists-promise": "^2.0.2", "node-fetch": "^2.5.0", - "tar": "^4.4.8", + "tar": "^6.0.0", "yauzl": "^2.10.0" }, "engines": { @@ -4492,6 +4534,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, "funding": [ { "type": "github", @@ -4839,22 +4882,26 @@ } }, "node_modules/tar": { - "version": "4.4.19", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz", - "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==", - "dependencies": { - "chownr": "^1.1.4", - "fs-minipass": "^1.2.7", - "minipass": "^2.9.0", - "minizlib": "^1.3.3", - "mkdirp": "^0.5.5", - "safe-buffer": "^5.2.1", - "yallist": "^3.1.1" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" }, "engines": { - "node": ">=4.5" + "node": ">=10" } }, + "node_modules/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -5230,7 +5277,8 @@ "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true }, "node_modules/yargs": { "version": "16.2.0", diff --git a/package.json b/package.json index 2fd62e33..6e1b0aed 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "glob": "^7.1.6", "import-fresh": "^3.2.1", "ip": "^1.1.5", - "java-caller": "^3.1.1", + "java-caller": "^3.2.0", "js-yaml": "^4.1.0", "node-sarif-builder": "^2.0.3", "optionator": "^0.8.3",