Skip to content

Commit fa65001

Browse files
Merge pull request #351 from IABTechLab/cbc-UID2-4461-upgrade-vertx-version
Upgrading vertx version
2 parents 7c6c148 + ab261e7 commit fa65001

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.trivyignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@
55

66
# https://thetradedesk.atlassian.net/browse/UID2-4460
77
CVE-2024-47535
8-
9-
# https://thetradedesk.atlassian.net/browse/UID2-4461
10-
CVE-2024-7254

conf/local-e2e-docker-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"keysets_metadata_path": "keysets/metadata.json",
1919
"admin_keysets_metadata_path": "admin_keysets/metadata.json",
2020
"keyset_keys_metadata_path": "keyset_keys/metadata.json",
21-
"cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",
21+
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
2222
"aws_access_key_id": "no access key needed for test",
2323
"aws_secret_access_key": "no secret key needed for test",
2424
"client_side_keypair_public_prefix": "UID2-X-L-",

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13-
<vertx.version>4.5.3</vertx.version>
13+
<vertx.version>4.5.11</vertx.version>
1414
<vertx-maven-plugin.version>1.0.22</vertx-maven-plugin.version>
1515
<vertx.verticle>com.uid2.admin.vertx.AdminVerticle</vertx.verticle>
1616
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
1717
<micrometer.version>1.12.2</micrometer.version>
1818
<junit-jupiter.version>5.11.2</junit-jupiter.version>
19-
<uid2-shared.version>8.0.0</uid2-shared.version>
19+
<uid2-shared.version>8.0.6</uid2-shared.version>
2020
<okta-jwt.version>0.5.10</okta-jwt.version>
2121
<image.version>${project.version}</image.version>
2222
</properties>

src/main/java/com/uid2/admin/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ private static Vertx createVertx() {
411411
}
412412

413413
private static void setupMetrics(MicrometerMetricsOptions metricOptions) {
414-
BackendRegistries.setupBackend(metricOptions);
414+
BackendRegistries.setupBackend(metricOptions, null);
415415

416416
MeterRegistry backendRegistry = BackendRegistries.getDefaultNow();
417417
if (backendRegistry instanceof PrometheusMeterRegistry) {

0 commit comments

Comments
 (0)