diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 8ececb7..cafd4a8 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -3,8 +3,8 @@ 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 vulnerability_scan_only: true - java_version: "21" secrets: inherit diff --git a/.trivyignore b/.trivyignore index 3b24dc4..0a8aa9a 100644 --- a/.trivyignore +++ b/.trivyignore @@ -1,13 +1,3 @@ # 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-4461 -CVE-2024-7254 - -# https://thetradedesk.atlassian.net/browse/UID2-4874 -CVE-2025-24970 diff --git a/pom.xml b/pom.xml index 7766d21..6d96b69 100644 --- a/pom.xml +++ b/pom.xml @@ -2,40 +2,29 @@ - 4.0.0 com.uid2 uid2-e2e 3.2.0 + 21 21 - 8.0.6 + 4.5.13 + 8.1.25 - jar - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UID2 team - unifiedid-admin@thetradedesk.com - UID - https://github.com/IABTechLab - - snapshots-repo https://s01.oss.sonatype.org/content/repositories/snapshots - false - true + + false + + + true + maven_central @@ -43,6 +32,7 @@ https://repo.maven.apache.org/maven2/ + @@ -61,6 +51,36 @@ uid2-shared ${uid2-shared.version} + + io.vertx + vertx-core + ${vertx.version} + + + io.vertx + vertx-web + ${vertx.version} + + + io.vertx + vertx-web-client + ${vertx.version} + + + io.vertx + vertx-micrometer-metrics + ${vertx.version} + + + io.vertx + vertx-auth-oauth2 + ${vertx.version} + + + io.vertx + vertx-web-templ-pebble + ${vertx.version} + com.fasterxml.jackson.core jackson-databind @@ -130,10 +150,10 @@ maven-compiler-plugin 3.8.0 - 17 - 17 + 21 + 21 - \ No newline at end of file +