diff --git a/.github/linters/.lintr b/.github/linters/.lintr index aac8e22e..4a776d90 100644 --- a/.github/linters/.lintr +++ b/.github/linters/.lintr @@ -1 +1 @@ -linters: with_defaults(object_usage_linter = NULL) +linters: linters_with_defaults(object_usage_linter = NULL) diff --git a/Dockerfile b/Dockerfile index 08d800ee..dadf0cf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ ARG CLJ_KONDO_VERSION='2023.05.18' # Dart Linter ## stable dart sdk: https://dart.dev/get-dart#release-channels ARG DART_VERSION='2.8.4' -ARG GOOGLE_JAVA_FORMAT_VERSION='1.15.0' +ARG GOOGLE_JAVA_FORMAT_VERSION='1.18.1' ## install alpine-pkg-glibc (glibc compatibility layer package for Alpine Linux) ARG GLIBC_VERSION='2.34-r0' ARG KTLINT_VERSION='0.47.1' @@ -78,7 +78,7 @@ RUN apk add --no-cache \ musl-dev \ net-snmp-dev \ npm nodejs-current \ - openjdk11-jre \ + openjdk17-jre \ openssh-client \ openssl-dev \ parallel \ diff --git a/test/inspec/super-linter/controls/super_linter.rb b/test/inspec/super-linter/controls/super_linter.rb index d792906b..9d42fafc 100644 --- a/test/inspec/super-linter/controls/super_linter.rb +++ b/test/inspec/super-linter/controls/super_linter.rb @@ -40,7 +40,7 @@ control "super-linter-installed-packages" do "musl-dev", "npm", "nodejs-current", - "openjdk11-jre", + "openjdk17-jre", "openssl-dev", "perl-dev", "perl",