Skip to content

Commit

Permalink
mergeing up to main
Browse files Browse the repository at this point in the history
  • Loading branch information
cody-constine-ttd committed Nov 18, 2024
2 parents ae2998a + d0b8fd4 commit daaa19d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
7 changes: 6 additions & 1 deletion .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
# See https://aquasecurity.github.io/trivy/v0.35/docs/vulnerability/examples/filter/
# for more details
# e.g.
# CVE-2022-3996

# https://thetradedesk.atlassian.net/browse/UID2-4460
CVE-2024-47535

# https://thetradedesk.atlassian.net/browse/UID2-4461
CVE-2024-7254
18 changes: 4 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-shared</artifactId>
<version>7.21.1-alpha-157-SNAPSHOT</version>
<version>7.21.7</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Library for all the shared uid2 operations</description>
<url>https://github.com/IABTechLab/uid2docs</url>
Expand Down Expand Up @@ -58,9 +58,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.3.8</vertx.version>
<vertx.version>4.5.3</vertx.version>
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
<micrometer.version>1.1.0</micrometer.version>
<micrometer.version>1.12.2</micrometer.version>
<image.version>${project.version}</image.version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -191,23 +191,13 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.15.12</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.25.5</version>
<version>3.20.6</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-attestation</artifactId>
<version>1.1.29</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.100.Final</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
Expand Down

0 comments on commit daaa19d

Please sign in to comment.