From 4359b3dfeb672f2c9e66dc4e597180e6decef820 Mon Sep 17 00:00:00 2001 From: Cody Constine Date: Fri, 22 Nov 2024 10:44:23 -0700 Subject: [PATCH 1/3] Upgrading vertx version --- .trivyignore | 3 --- pom.xml | 4 ++-- src/main/java/com/uid2/operator/Main.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.trivyignore b/.trivyignore index f3b81e9c6..be4a48a9d 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 a1311d45d..99584430b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 - 4.5.3 + 4.5.11 1.0.22 5.11.2 5.11.2 @@ -22,7 +22,7 @@ 2.1.0 2.1.0 2.1.0 - 7.20.4 + 8.0.1-alpha-167-SNAPSHOT ${project.version} 21 21 diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index 6aa069604..6b88d715b 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -414,7 +414,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) { From b23dcdc835a0fbdda462c6c8f1d6535bcb71bf31 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Fri, 22 Nov 2024 17:47:44 +0000 Subject: [PATCH 2/3] [CI Pipeline] Released Snapshot version: 5.42.7-alpha-139-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99584430b..d64fb772a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.42.6 + 5.42.7-alpha-139-SNAPSHOT UTF-8 From 3768f821402215f6497da1e28984538af8157a7e Mon Sep 17 00:00:00 2001 From: Cody Constine Date: Fri, 22 Nov 2024 11:06:42 -0700 Subject: [PATCH 3/3] Adding new shared version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99584430b..f81efef11 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.1.0 2.1.0 2.1.0 - 8.0.1-alpha-167-SNAPSHOT + 8.0.6 ${project.version} 21 21