From ab261e73c97d0534af42c3d2f2ab7553d3420a88 Mon Sep 17 00:00:00 2001
From: Cody Constine <cody.constine@thetradedesk.com>
Date: Fri, 22 Nov 2024 11:07:34 -0700
Subject: [PATCH] Upgrading vertx version

---
 .trivyignore                           | 3 ---
 conf/local-e2e-docker-config.json      | 2 +-
 pom.xml                                | 4 ++--
 src/main/java/com/uid2/admin/Main.java | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

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/conf/local-e2e-docker-config.json b/conf/local-e2e-docker-config.json
index 50fea242..f1edfcdc 100644
--- a/conf/local-e2e-docker-config.json
+++ b/conf/local-e2e-docker-config.json
@@ -18,7 +18,7 @@
   "keysets_metadata_path": "keysets/metadata.json",
   "admin_keysets_metadata_path": "admin_keysets/metadata.json",
   "keyset_keys_metadata_path": "keyset_keys/metadata.json",
-  "cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",
+  "cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
   "aws_access_key_id": "no access key needed for test",
   "aws_secret_access_key": "no secret key needed for test",
   "client_side_keypair_public_prefix": "UID2-X-L-",
diff --git a/pom.xml b/pom.xml
index 8749f957..479eb475 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <vertx.version>4.5.3</vertx.version>
+        <vertx.version>4.5.11</vertx.version>
         <vertx-maven-plugin.version>1.0.22</vertx-maven-plugin.version>
         <vertx.verticle>com.uid2.admin.vertx.AdminVerticle</vertx.verticle>
         <!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
         <micrometer.version>1.12.2</micrometer.version>
         <junit-jupiter.version>5.11.2</junit-jupiter.version>
-        <uid2-shared.version>8.0.0</uid2-shared.version>
+        <uid2-shared.version>8.0.6</uid2-shared.version>
         <okta-jwt.version>0.5.10</okta-jwt.version>
         <image.version>${project.version}</image.version>
     </properties>
diff --git a/src/main/java/com/uid2/admin/Main.java b/src/main/java/com/uid2/admin/Main.java
index 38fd2639..ed05b34d 100644
--- a/src/main/java/com/uid2/admin/Main.java
+++ b/src/main/java/com/uid2/admin/Main.java
@@ -411,7 +411,7 @@ private static Vertx createVertx() {
     }
 
     private static void setupMetrics(MicrometerMetricsOptions metricOptions) {
-        BackendRegistries.setupBackend(metricOptions);
+        BackendRegistries.setupBackend(metricOptions, null);
 
         MeterRegistry backendRegistry = BackendRegistries.getDefaultNow();
         if (backendRegistry instanceof PrometheusMeterRegistry) {