diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 672f3a5b..c64044a0 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -4,6 +4,6 @@ on: [pull_request, push, workflow_dispatch] jobs: build: uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v3 - secrets: inherit with: java_version: 21 + secrets: inherit diff --git a/.trivyignore b/.trivyignore index 8e657a1b..0e138483 100644 --- a/.trivyignore +++ b/.trivyignore @@ -1,10 +1,6 @@ # List any vulnerability that are to be accepted # See https://aquasecurity.github.io/trivy/v0.35/docs/vulnerability/examples/filter/ # for more details -# e.g. - -# https://thetradedesk.atlassian.net/browse/UID2-4460 -CVE-2024-47535 # https://thetradedesk.atlassian.net/browse/UID2-5186 CVE-2024-8176 exp:2025-03-27 diff --git a/Dockerfile b/Dockerfile index 6a269ff2..44fd84e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/21.0.4_7-jre-alpine/images/sha256-f184bb601f9e6068dd0a92738764d1ff447ab68c15ddbf8c303c5c29de9a1df8 +# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/21.0.6_7-jre-alpine/images/sha256-f184bb601f9e6068dd0a92738764d1ff447ab68c15ddbf8c303c5c29de9a1df8 FROM eclipse-temurin@sha256:f184bb601f9e6068dd0a92738764d1ff447ab68c15ddbf8c303c5c29de9a1df8 WORKDIR /app diff --git a/pom.xml b/pom.xml index 57054217..b1582f6b 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ 0.5.10 ${project.version} + maven-snapshots @@ -33,6 +34,7 @@ + com.google.guava @@ -135,7 +137,6 @@ okta-jwt-verifier ${okta-jwt.version} - com.okta.jwt okta-jwt-verifier-impl