Merging up to main

IABTechLab · Nov 18, 2024 · 4e0b629 · 4e0b629
2 parents b68c613 + 6d7605f
commit 4e0b629
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/validate-image.yaml b/.github/workflows/validate-image.yaml
@@ -19,8 +19,8 @@ on:
 
 jobs:
   build-publish-docker:
-    uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v23
-    with: 
+    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 }}
       java_version: 21

diff --git a/.trivyignore b/.trivyignore
@@ -2,4 +2,9 @@
 # See https://aquasecurity.github.io/trivy/v0.35/docs/vulnerability/examples/filter/ 
 # for more details
 # e.g. 
-# CVE-2022-3996
+
+# 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
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-admin</artifactId>
-    <version>5.15.18</version>
+    <version>5.15.24</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,6 +17,7 @@
         <micrometer.version>1.12.2</micrometer.version>
         <junit-jupiter.version>5.11.2</junit-jupiter.version>
         <uid2-shared.version>7.21.1-alpha-157-SNAPSHOT</uid2-shared.version>
+        <uid2-shared.version>7.21.7</uid2-shared.version>
         <okta-jwt.version>0.5.10</okta-jwt.version>
         <image.version>${project.version}</image.version>
     </properties>