Skip to content

Commit f680b93

Browse files
committed
Merge branch 'main' into features/roslynator
2 parents 3daaf37 + 0484acb commit f680b93

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+700
-438
lines changed

.automation/generated/linter-helps.json

+147-144
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.automation/generated/linter-versions.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"black": "23.11.0",
99
"cfn-lint": "0.83.3",
1010
"checkmake": "0.2.0",
11-
"checkov": "3.1.9",
11+
"checkov": "3.1.15",
1212
"checkstyle": "10.12.5",
1313
"chktex": "1.7.8",
1414
"clang-format": "16.0.6",
@@ -17,7 +17,7 @@
1717
"cljstyle": "0.15.0",
1818
"coffeelint": "5.2.11",
1919
"cpplint": "1.6.1",
20-
"csharpier": "0.26.2",
20+
"csharpier": "0.26.3",
2121
"cspell": "8.0.0",
2222
"dartanalyzer": "0.0.0",
2323
"devskim": "1.0.23",
@@ -48,16 +48,16 @@
4848
"kubeconform": "0.6.4",
4949
"kubescape": "2.9.0",
5050
"kubeval": "0.16.1",
51-
"lightning-flow-scanner": "2.15.0",
51+
"lightning-flow-scanner": "2.16.0",
5252
"lintr": "0.0.0",
5353
"luacheck": "1.1.1",
5454
"lychee": "0.13.0",
5555
"markdown-link-check": "3.11.2",
56-
"markdown-table-formatter": "1.4.0",
56+
"markdown-table-formatter": "1.5.0",
5757
"markdownlint": "0.37.0",
5858
"misspell": "0.3.4",
59-
"mypy": "1.7.0",
60-
"npm-groovy-lint": "12.1.1",
59+
"mypy": "1.7.1",
60+
"npm-groovy-lint": "13.0.0",
6161
"npm-package-json-lint": "7.1.0",
6262
"perlcritic": "1.152",
6363
"php": "7.4.26",
@@ -104,7 +104,7 @@
104104
"syft": "0.97.1",
105105
"tekton-lint": "0.6.0",
106106
"terraform-fmt": "1.6.4",
107-
"terragrunt": "0.53.5",
107+
"terragrunt": "0.53.6",
108108
"terrascan": "1.18.3",
109109
"tflint": "0.49.0",
110110
"trivy": "0.47.0",

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
1717

1818
- Fixes
1919
- Call jscpd with `--gitignore` to ignore copy-pastes in files matching `.gitignore`
20+
- cpplint: Dynamically add the list of extensions from list of files in --extensions parameter
2021

2122
- Doc
2223

@@ -39,6 +40,18 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
3940
- [psalm](https://psalm.dev) from Psalm.5.15.0@ to **Psalm.5.16.0@** on 2023-11-22
4041
- [puppet-lint](http://puppet-lint.com/) from 4.2.2 to **4.2.3** on 2023-11-22
4142
- [pyright](https://github.com/Microsoft/pyright) from 1.1.336 to **1.1.337** on 2023-11-22
43+
- [csharpier](https://csharpier.com/) from 0.26.2 to **0.26.3** on 2023-11-23
44+
- [npm-groovy-lint](https://nvuillam.github.io/npm-groovy-lint/) from 12.1.1 to **12.1.2** on 2023-11-23
45+
- [mypy](https://mypy.readthedocs.io/en/stable/) from 1.7.0 to **1.7.1** on 2023-11-23
46+
- [checkov](https://www.checkov.io/) from 3.1.9 to **3.1.10** on 2023-11-23
47+
- [terragrunt](https://terragrunt.gruntwork.io) from 0.53.5 to **0.53.6** on 2023-11-23
48+
- [checkov](https://www.checkov.io/) from 3.1.10 to **3.1.11** on 2023-11-24
49+
- [lightning-flow-scanner](https://github.com/Lightning-Flow-Scanner) from 2.15.0 to **2.16.0** on 2023-11-24
50+
- [markdown-table-formatter](https://www.npmjs.com/package/markdown-table-formatter) from 1.4.0 to **1.5.0** on 2023-11-25
51+
- [npm-groovy-lint](https://nvuillam.github.io/npm-groovy-lint/) from 12.1.2 to **12.2.0** on 2023-11-26
52+
- [checkov](https://www.checkov.io/) from 3.1.11 to **3.1.14** on 2023-11-26
53+
- [npm-groovy-lint](https://nvuillam.github.io/npm-groovy-lint/) from 12.2.0 to **13.0.0** on 2023-11-26
54+
- [checkov](https://www.checkov.io/) from 3.1.14 to **3.1.15** on 2023-11-26
4255
<!-- linter-versions-end -->
4356

4457
## [v7.6.0] - 2023-11-19

Dockerfile

+19-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RUN apk add --no-cache \
9999
lttng-ust-dev \
100100
zlib \
101101
zlib-dev \
102-
openjdk11 \
102+
openjdk17 \
103103
perl \
104104
perl-dev \
105105
gnupg \
@@ -442,9 +442,15 @@ ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet"
442442
# "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
443443

444444
# JAVA installation
445-
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
445+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
446446
ENV PATH="$JAVA_HOME/bin:${PATH}"
447447

448+
# KOTLIN installation
449+
# Next line commented because already managed by another linter
450+
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
451+
# Next line commented because already managed by another linter
452+
# ENV PATH="$JAVA_HOME/bin:${PATH}"
453+
448454
# PHP installation
449455
RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \
450456
&& export GITHUB_AUTH_TOKEN \
@@ -472,7 +478,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GI
472478

473479
# SALESFORCE installation
474480
# Next line commented because already managed by another linter
475-
# ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
481+
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
476482
# Next line commented because already managed by another linter
477483
# ENV PATH="$JAVA_HOME/bin:${PATH}"
478484
RUN sf plugins install @salesforce/plugin-packaging \
@@ -481,6 +487,10 @@ RUN sf plugins install @salesforce/plugin-packaging \
481487
&& rm -rf /root/.npm/_cacache \
482488

483489
# SCALA installation
490+
# Next line commented because already managed by another linter
491+
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
492+
# Next line commented because already managed by another linter
493+
# ENV PATH="$JAVA_HOME/bin:${PATH}"
484494
&& curl --retry-all-errors --retry 10 -fLo coursier https://git.io/coursier-cli && \
485495
chmod +x coursier
486496

@@ -567,6 +577,12 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
567577
# revive installation
568578
# Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive
569579

580+
# npm-groovy-lint installation
581+
# Next line commented because already managed by another linter
582+
# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
583+
# Next line commented because already managed by another linter
584+
# ENV PATH="$JAVA_HOME/bin:${PATH}"
585+
570586
# checkstyle installation
571587
RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \
572588
-H "Accept: application/vnd.github+json" \

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
[![MegaLinter](https://github.com/oxsecurity/megalinter/workflows/MegaLinter/badge.svg?branch=main)](https://github.com/oxsecurity/megalinter/actions?query=workflow%3AMegaLinter+branch%3Amain)
2424
[![codecov](https://codecov.io/gh/oxsecurity/megalinter/branch/main/graph/badge.svg)](https://codecov.io/gh/oxsecurity/megalinter)
2525
<!-- gh-dependents-info-used-by-start -->
26-
[![](https://img.shields.io/static/v1?label=Used%20by&message=3191&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)<!-- gh-dependents-info-used-by-end -->
26+
[![](https://img.shields.io/static/v1?label=Used%20by&message=3204&color=informational&logo=slickpic)](https://github.com/oxsecurity/megalinter/network/dependents)<!-- gh-dependents-info-used-by-end -->
2727
[![Secured with Trivy](https://img.shields.io/badge/Trivy-secured-green?logo=docker)](https://github.com/aquasecurity/trivy)
2828
[![GitHub contributors](https://img.shields.io/github/contributors/oxsecurity/megalinter.svg)](https://github.com/oxsecurity/megalinter/graphs/contributors/)
2929
[![GitHub Sponsors](https://img.shields.io/github/sponsors/nvuillam)](https://github.com/sponsors/nvuillam)

0 commit comments

Comments
 (0)