diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 00695f1d..aa13387c 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -3,7 +3,7 @@ on: [pull_request, push, workflow_dispatch] jobs: build: - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v3 with: java_version: 21 secrets: inherit \ No newline at end of file diff --git a/.github/workflows/check-stable-dependency.yaml b/.github/workflows/check-stable-dependency.yaml index 8af1681a..df07da29 100644 --- a/.github/workflows/check-stable-dependency.yaml +++ b/.github/workflows/check-stable-dependency.yaml @@ -3,5 +3,5 @@ on: [pull_request, workflow_dispatch] jobs: check_dependency: - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v2 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v3 secrets: inherit diff --git a/.github/workflows/validate-image.yaml b/.github/workflows/validate-image.yaml index 8ae78d56..b03887f9 100644 --- a/.github/workflows/validate-image.yaml +++ b/.github/workflows/validate-image.yaml @@ -19,7 +19,7 @@ on: jobs: build-publish-docker-default: - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v3 with: failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH'}} fail_on_error: ${{ inputs.fail_on_error || true }} diff --git a/.trivyignore b/.trivyignore index f3b81e9c..be4a48a9 100644 --- a/.trivyignore +++ b/.trivyignore @@ -5,6 +5,3 @@ # https://thetradedesk.atlassian.net/browse/UID2-4460 CVE-2024-47535 - -# https://thetradedesk.atlassian.net/browse/UID2-4461 -CVE-2024-7254 diff --git a/pom.xml b/pom.xml index c77d35c2..6c4f13b5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,10 +13,10 @@ UTF-8 - 4.5.3 + 4.5.11 1.1.0 - 7.19.0 + 8.0.6 ${project.version} 5.10.1 5.10.1 diff --git a/src/main/java/com/uid2/optout/Main.java b/src/main/java/com/uid2/optout/Main.java index a7c7586b..8fe39a64 100644 --- a/src/main/java/com/uid2/optout/Main.java +++ b/src/main/java/com/uid2/optout/Main.java @@ -211,7 +211,7 @@ else if (!Utils.isProductionEnvironment()) { } private static void setupMetrics(MicrometerMetricsOptions metricOptions) { - BackendRegistries.setupBackend(metricOptions); + BackendRegistries.setupBackend(metricOptions, null); // As of now default backend registry should have been created if (BackendRegistries.getDefaultNow() instanceof PrometheusMeterRegistry) {