Fixed merge conflicts

Author: gmsdelmundo

.trivyignore

@@ -5,9 +5,3 @@
 
 # https://thetradedesk.atlassian.net/browse/UID2-4460
 CVE-2024-47535
-
-# https://thetradedesk.atlassian.net/browse/UID2-4874
-CVE-2025-24970
-
-# https://thetradedesk.atlassian.net/browse/UID2-4891
-CVE-2024-12797

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-core</artifactId>
-    <version>2.25.23-alpha-96-SNAPSHOT</version>
+    <version>2.25.8</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,7 +24,7 @@
         <vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
-        <uid2-shared.version>8.1.0</uid2-shared.version>
+        <uid2-shared.version>8.1.10</uid2-shared.version>
         <image.version>${project.version}</image.version>
     </properties>