Skip to content

Commit fe9af7a

Browse files
retareta
committed
Make sure ActiveMQ Artemis uses Netty 4.2.x (not 4.1.x ones)
1 parent bb10fd8 commit fe9af7a

7 files changed

Lines changed: 74 additions & 0 deletions

File tree

‎rt/transports/jms/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,19 @@
3232
<cxf.module.name>org.apache.cxf.transport.jms</cxf.module.name>
3333
<cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra>
3434
</properties>
35+
36+
<dependencyManagement>
37+
<dependencies>
38+
<dependency>
39+
<groupId>io.netty</groupId>
40+
<artifactId>netty-bom</artifactId>
41+
<version>${cxf.netty.version}</version>
42+
<type>pom</type>
43+
<scope>import</scope>
44+
</dependency>
45+
</dependencies>
46+
</dependencyManagement>
47+
3548
<dependencies>
3649
<dependency>
3750
<groupId>jakarta.xml.ws</groupId>

‎services/wsn/wsn-core/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@
3636
<cxf.server.launcher.vmargs />
3737
<cxf.surefire.enable.assertions>false</cxf.surefire.enable.assertions>
3838
</properties>
39+
<dependencyManagement>
40+
<dependencies>
41+
<dependency>
42+
<groupId>io.netty</groupId>
43+
<artifactId>netty-bom</artifactId>
44+
<version>${cxf.netty.version}</version>
45+
<type>pom</type>
46+
<scope>import</scope>
47+
</dependency>
48+
</dependencies>
49+
</dependencyManagement>
3950
<dependencies>
4051
<dependency>
4152
<groupId>jakarta.jms</groupId>

‎services/wsn/wsn-osgi/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,17 @@
3434
<properties>
3535
<cxf.module.name>org.apache.cxf.wsn.osgi</cxf.module.name>
3636
</properties>
37+
<dependencyManagement>
38+
<dependencies>
39+
<dependency>
40+
<groupId>io.netty</groupId>
41+
<artifactId>netty-bom</artifactId>
42+
<version>${cxf.netty.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
46+
</dependencies>
47+
</dependencyManagement>
3748
<dependencies>
3849
<dependency>
3950
<groupId>org.apache.cxf.services.wsn</groupId>

‎systests/transport-jms/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,17 @@
102102
</plugin>
103103
</plugins>
104104
</build>
105+
<dependencyManagement>
106+
<dependencies>
107+
<dependency>
108+
<groupId>io.netty</groupId>
109+
<artifactId>netty-bom</artifactId>
110+
<version>${cxf.netty.version}</version>
111+
<type>pom</type>
112+
<scope>import</scope>
113+
</dependency>
114+
</dependencies>
115+
</dependencyManagement>
105116
<dependencies>
106117
<dependency>
107118
<groupId>org.apache.cxf</groupId>

‎systests/uncategorized/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,17 @@
139139
</plugin>
140140
</plugins>
141141
</build>
142+
<dependencyManagement>
143+
<dependencies>
144+
<dependency>
145+
<groupId>io.netty</groupId>
146+
<artifactId>netty-bom</artifactId>
147+
<version>${cxf.netty.version}</version>
148+
<type>pom</type>
149+
<scope>import</scope>
150+
</dependency>
151+
</dependencies>
152+
</dependencyManagement>
142153
<dependencies>
143154
<dependency>
144155
<groupId>com.sun.xml.messaging.saaj</groupId>

‎systests/ws-specs/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,17 @@
8686
</plugin>
8787
</plugins>
8888
</build>
89+
<dependencyManagement>
90+
<dependencies>
91+
<dependency>
92+
<groupId>io.netty</groupId>
93+
<artifactId>netty-bom</artifactId>
94+
<version>${cxf.netty.version}</version>
95+
<type>pom</type>
96+
<scope>import</scope>
97+
</dependency>
98+
</dependencies>
99+
</dependencyManagement>
89100
<dependencies>
90101
<dependency>
91102
<groupId>org.apache.cxf</groupId>

‎testutils/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
<artifactId>artemis-jakarta-server</artifactId>
7575
<scope>provided</scope>
7676
<optional>true</optional>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>io.netty</groupId>
80+
<artifactId>*</artifactId>
81+
</exclusion>
82+
</exclusions>
7783
</dependency>
7884
<dependency>
7985
<groupId>jakarta.mail</groupId>

0 commit comments

Comments
 (0)