Skip to content

Commit daaa19d

Browse files
mergeing up to main
2 parents ae2998a + d0b8fd4 commit daaa19d

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

.trivyignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
# See https://aquasecurity.github.io/trivy/v0.35/docs/vulnerability/examples/filter/
33
# for more details
44
# e.g.
5-
# CVE-2022-3996
5+
6+
# https://thetradedesk.atlassian.net/browse/UID2-4460
7+
CVE-2024-47535
8+
9+
# https://thetradedesk.atlassian.net/browse/UID2-4461
10+
CVE-2024-7254

pom.xml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.uid2</groupId>
77
<artifactId>uid2-shared</artifactId>
8-
<version>7.21.1-alpha-157-SNAPSHOT</version>
8+
<version>7.21.7</version>
99
<name>${project.groupId}:${project.artifactId}</name>
1010
<description>Library for all the shared uid2 operations</description>
1111
<url>https://github.com/IABTechLab/uid2docs</url>
@@ -58,9 +58,9 @@
5858

5959
<properties>
6060
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
61-
<vertx.version>4.3.8</vertx.version>
61+
<vertx.version>4.5.3</vertx.version>
6262
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
63-
<micrometer.version>1.1.0</micrometer.version>
63+
<micrometer.version>1.12.2</micrometer.version>
6464
<image.version>${project.version}</image.version>
6565
</properties>
6666
<dependencyManagement>
@@ -191,23 +191,13 @@
191191
<dependency>
192192
<groupId>com.google.cloud</groupId>
193193
<artifactId>google-cloud-logging</artifactId>
194-
<version>3.15.12</version>
195-
</dependency>
196-
<dependency>
197-
<groupId>com.google.protobuf</groupId>
198-
<artifactId>protobuf-java</artifactId>
199-
<version>3.25.5</version>
194+
<version>3.20.6</version>
200195
</dependency>
201196
<dependency>
202197
<groupId>com.azure</groupId>
203198
<artifactId>azure-security-attestation</artifactId>
204199
<version>1.1.29</version>
205200
</dependency>
206-
<dependency>
207-
<groupId>io.netty</groupId>
208-
<artifactId>netty-codec-http2</artifactId>
209-
<version>4.1.100.Final</version>
210-
</dependency>
211201
<dependency>
212202
<groupId>com.azure</groupId>
213203
<artifactId>azure-core-http-netty</artifactId>

0 commit comments

Comments
 (0)