Skip to content

Commit decfd27

Browse files
force latest netty
Signed-off-by: Adrian Cole <adrian.cole@elastic.co>
1 parent 3b690c9 commit decfd27

File tree

4 files changed

+42
-1
lines changed

4 files changed

+42
-1
lines changed

benchmarks/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,19 @@
2727
<maven.compiler.release>17</maven.compiler.release>
2828
</properties>
2929

30+
<!-- Avoid CVEs in armeria deps -->
31+
<dependencyManagement>
32+
<dependencies>
33+
<dependency>
34+
<groupId>io.netty</groupId>
35+
<artifactId>netty-bom</artifactId>
36+
<version>${netty.version}</version>
37+
<type>pom</type>
38+
<scope>import</scope>
39+
</dependency>
40+
</dependencies>
41+
</dependencyManagement>
42+
3043
<dependencies>
3144
<dependency>
3245
<groupId>${project.groupId}</groupId>

module/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@
2525
<maven.compiler.release>17</maven.compiler.release>
2626
</properties>
2727

28+
<!-- Avoid CVEs in armeria deps -->
29+
<dependencyManagement>
30+
<dependencies>
31+
<dependency>
32+
<groupId>io.netty</groupId>
33+
<artifactId>netty-bom</artifactId>
34+
<version>${netty.version}</version>
35+
<type>pom</type>
36+
<scope>import</scope>
37+
</dependency>
38+
</dependencies>
39+
</dependencyManagement>
40+
2841
<dependencies>
2942
<dependency>
3043
<groupId>${project.groupId}</groupId>

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@
6464
<!-- groupId overrides allow testing feature branches with jitpack -->
6565
<!-- matching armeria/grpc/zipkin -->
6666
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
67-
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
67+
<!-- when updating, update docker/Dockerfile -->
6868
<zipkin.version>3.5.0</zipkin.version>
6969
<zipkin-reporter.version>3.5.0</zipkin-reporter.version>
7070
<spring-boot.version>3.4.2</spring-boot.version>
7171
<!-- armeria.groupId allows you to test feature branches with jitpack -->
7272
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
7373
<armeria.version>1.31.3</armeria.version>
74+
<!-- Use same version as Zipkin to remain compatible with armeria to avoid CVEs -->
75+
<netty.version>4.1.118.Final</netty.version>
7476
<log4j.version>2.24.3</log4j.version>
7577

7678
<!-- This allows you to test feature branches with jitpack -->

storage-stackdriver/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@
2525
<maven.compiler.release>17</maven.compiler.release>
2626
</properties>
2727

28+
<!-- Avoid CVEs in armeria deps -->
29+
<dependencyManagement>
30+
<dependencies>
31+
<dependency>
32+
<groupId>io.netty</groupId>
33+
<artifactId>netty-bom</artifactId>
34+
<version>${netty.version}</version>
35+
<type>pom</type>
36+
<scope>import</scope>
37+
</dependency>
38+
</dependencies>
39+
</dependencyManagement>
40+
2841
<dependencies>
2942
<dependency>
3043
<groupId>${project.groupId}</groupId>

0 commit comments

Comments
 (0)