Skip to content

Commit e0dabb7

Browse files
christianpapechristianpape
committed
NMS-16551: Remove old netty versions
1 parent c99c16c commit e0dabb7

File tree

9 files changed

+246
-2
lines changed

9 files changed

+246
-2
lines changed

‎container/features/src/main/resources/features.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-handler/${netty4Version}</bundle>
2222
<bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-classes-epoll/${netty4Version}</bundle>
2323
<bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-native-epoll/${netty4Version}</bundle>
24+
<bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-native-kqueue/${netty4Version}</bundle>
2425
<bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-transport-native-unix-common/${netty4Version}</bundle>
2526
<bundle start-level="${earlyStartLevel}">mvn:io.netty/netty-codec/${netty4Version}</bundle>
2627
<bundle start-level="${earlyStartLevel}">mvn:commons-pool/commons-pool/${commonsPoolVersion}</bundle>

‎container/karaf/src/main/filtered-resources/etc/overrides.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ mvn:io.netty/netty-transport/${netty4Version}
8383
mvn:io.netty/netty-handler/${netty4Version}
8484
mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
8585
mvn:io.netty/netty-transport-native-epoll/${netty4Version}
86+
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
8687
mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
8788
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
8889
mvn:io.netty/netty-codec/${netty4Version}

‎container/shared/src/main/filtered-resources/etc/overrides.properties‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,15 @@ mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2Version}
8080
mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2Version}
8181
mvn:com.fasterxml.jackson.core/jackson-core/${jackson2Version}
8282

83+
mvn:io.netty/netty-resolver/${netty4Version}
8384
mvn:io.netty/netty-common/${netty4Version}
84-
mvn:io.netty/netty-transport/${netty4Version}
85+
mvn:io.netty/netty-buffer/${netty4Version}
86+
mvn:io.netty/netty-transport/${netty4Version}
87+
mvn:io.netty/netty-handler/${netty4Version}
88+
mvn:io.netty/netty-transport-classes-epoll/${netty4Version}
89+
mvn:io.netty/netty-transport-native-epoll/${netty4Version}
90+
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
91+
mvn:io.netty/netty-transport-native-unix-common/${netty4Version}
92+
mvn:io.netty/netty-transport-native-kqueue/${netty4Version}
93+
mvn:io.netty/netty-codec/${netty4Version}
94+
mvn:io.netty/netty-codec-http/${netty4Version}

‎features/amqp/alarm-northbounder/pom.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,83 @@
173173
<groupId>com.sun.xml.bind</groupId>
174174
<artifactId>jaxb-impl</artifactId>
175175
</exclusion>
176+
<exclusion>
177+
<groupId>org.apache.qpid</groupId>
178+
<artifactId>qpid-jms-client</artifactId>
179+
</exclusion>
176180
</exclusions>
177181
</dependency>
182+
<dependency>
183+
<groupId>org.apache.qpid</groupId>
184+
<artifactId>qpid-jms-client</artifactId>
185+
<version>0.30.0</version>
186+
<exclusions>
187+
<exclusion>
188+
<groupId>io.netty</groupId>
189+
<artifactId>netty-buffer</artifactId>
190+
</exclusion>
191+
<exclusion>
192+
<groupId>io.netty</groupId>
193+
<artifactId>netty-common</artifactId>
194+
</exclusion>
195+
<exclusion>
196+
<groupId>io.netty</groupId>
197+
<artifactId>netty-handler</artifactId>
198+
</exclusion>
199+
<exclusion>
200+
<groupId>io.netty</groupId>
201+
<artifactId>netty-transport</artifactId>
202+
</exclusion>
203+
<exclusion>
204+
<groupId>io.netty</groupId>
205+
<artifactId>netty-codec-http</artifactId>
206+
</exclusion>
207+
<exclusion>
208+
<groupId>io.netty</groupId>
209+
<artifactId>netty-transport-native-epoll</artifactId>
210+
</exclusion>
211+
<exclusion>
212+
<groupId>io.netty</groupId>
213+
<artifactId>netty-transport-native-kqueue</artifactId>
214+
</exclusion>
215+
</exclusions>
216+
</dependency>
217+
<dependency>
218+
<groupId>io.netty</groupId>
219+
<artifactId>netty-buffer</artifactId>
220+
<version>${netty4Version}</version>
221+
</dependency>
222+
<dependency>
223+
<groupId>io.netty</groupId>
224+
<artifactId>netty-common</artifactId>
225+
<version>${netty4Version}</version>
226+
</dependency>
227+
<dependency>
228+
<groupId>io.netty</groupId>
229+
<artifactId>netty-handler</artifactId>
230+
<version>${netty4Version}</version>
231+
</dependency>
232+
<dependency>
233+
<groupId>io.netty</groupId>
234+
<artifactId>netty-transport</artifactId>
235+
<version>${netty4Version}</version>
236+
</dependency>
237+
<dependency>
238+
<groupId>io.netty</groupId>
239+
<artifactId>netty-codec-http</artifactId>
240+
<version>${netty4Version}</version>
241+
</dependency>
242+
<dependency>
243+
<groupId>io.netty</groupId>
244+
<artifactId>netty-transport-native-epoll</artifactId>
245+
<version>${netty4Version}</version>
246+
</dependency>
247+
<dependency>
248+
<groupId>io.netty</groupId>
249+
<artifactId>netty-transport-native-kqueue</artifactId>
250+
<version>${netty4Version}</version>
251+
</dependency>
252+
178253
<dependency>
179254
<groupId>junit</groupId>
180255
<artifactId>junit</artifactId>

‎features/amqp/event-forwarder/pom.xml‎

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,84 @@
181181
<groupId>com.sun.xml.bind</groupId>
182182
<artifactId>jaxb-impl</artifactId>
183183
</exclusion>
184+
<exclusion>
185+
<groupId>org.apache.qpid</groupId>
186+
<artifactId>qpid-jms-client</artifactId>
187+
</exclusion>
184188
</exclusions>
185189
</dependency>
186-
<dependency>
190+
<dependency>
191+
<groupId>org.apache.qpid</groupId>
192+
<artifactId>qpid-jms-client</artifactId>
193+
<version>0.30.0</version>
194+
<exclusions>
195+
<exclusion>
196+
<groupId>io.netty</groupId>
197+
<artifactId>netty-buffer</artifactId>
198+
</exclusion>
199+
<exclusion>
200+
<groupId>io.netty</groupId>
201+
<artifactId>netty-common</artifactId>
202+
</exclusion>
203+
<exclusion>
204+
<groupId>io.netty</groupId>
205+
<artifactId>netty-handler</artifactId>
206+
</exclusion>
207+
<exclusion>
208+
<groupId>io.netty</groupId>
209+
<artifactId>netty-transport</artifactId>
210+
</exclusion>
211+
<exclusion>
212+
<groupId>io.netty</groupId>
213+
<artifactId>netty-codec-http</artifactId>
214+
</exclusion>
215+
<exclusion>
216+
<groupId>io.netty</groupId>
217+
<artifactId>netty-transport-native-epoll</artifactId>
218+
</exclusion>
219+
<exclusion>
220+
<groupId>io.netty</groupId>
221+
<artifactId>netty-transport-native-kqueue</artifactId>
222+
</exclusion>
223+
</exclusions>
224+
</dependency>
225+
<dependency>
226+
<groupId>io.netty</groupId>
227+
<artifactId>netty-buffer</artifactId>
228+
<version>${netty4Version}</version>
229+
</dependency>
230+
<dependency>
231+
<groupId>io.netty</groupId>
232+
<artifactId>netty-common</artifactId>
233+
<version>${netty4Version}</version>
234+
</dependency>
235+
<dependency>
236+
<groupId>io.netty</groupId>
237+
<artifactId>netty-handler</artifactId>
238+
<version>${netty4Version}</version>
239+
</dependency>
240+
<dependency>
241+
<groupId>io.netty</groupId>
242+
<artifactId>netty-transport</artifactId>
243+
<version>${netty4Version}</version>
244+
</dependency>
245+
<dependency>
246+
<groupId>io.netty</groupId>
247+
<artifactId>netty-codec-http</artifactId>
248+
<version>${netty4Version}</version>
249+
</dependency>
250+
<dependency>
251+
<groupId>io.netty</groupId>
252+
<artifactId>netty-transport-native-epoll</artifactId>
253+
<version>${netty4Version}</version>
254+
</dependency>
255+
<dependency>
256+
<groupId>io.netty</groupId>
257+
<artifactId>netty-transport-native-kqueue</artifactId>
258+
<version>${netty4Version}</version>
259+
</dependency>
260+
261+
<dependency>
187262
<groupId>junit</groupId>
188263
<artifactId>junit</artifactId>
189264
<scope>test</scope>

‎features/amqp/event-receiver/pom.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,82 @@
180180
<groupId>com.sun.xml.bind</groupId>
181181
<artifactId>jaxb-impl</artifactId>
182182
</exclusion>
183+
<exclusion>
184+
<groupId>org.apache.qpid</groupId>
185+
<artifactId>qpid-jms-client</artifactId>
186+
</exclusion>
187+
</exclusions>
188+
</dependency>
189+
<dependency>
190+
<groupId>org.apache.qpid</groupId>
191+
<artifactId>qpid-jms-client</artifactId>
192+
<version>0.30.0</version>
193+
<exclusions>
194+
<exclusion>
195+
<groupId>io.netty</groupId>
196+
<artifactId>netty-buffer</artifactId>
197+
</exclusion>
198+
<exclusion>
199+
<groupId>io.netty</groupId>
200+
<artifactId>netty-common</artifactId>
201+
</exclusion>
202+
<exclusion>
203+
<groupId>io.netty</groupId>
204+
<artifactId>netty-handler</artifactId>
205+
</exclusion>
206+
<exclusion>
207+
<groupId>io.netty</groupId>
208+
<artifactId>netty-transport</artifactId>
209+
</exclusion>
210+
<exclusion>
211+
<groupId>io.netty</groupId>
212+
<artifactId>netty-codec-http</artifactId>
213+
</exclusion>
214+
<exclusion>
215+
<groupId>io.netty</groupId>
216+
<artifactId>netty-transport-native-epoll</artifactId>
217+
</exclusion>
218+
<exclusion>
219+
<groupId>io.netty</groupId>
220+
<artifactId>netty-transport-native-kqueue</artifactId>
221+
</exclusion>
183222
</exclusions>
184223
</dependency>
224+
<dependency>
225+
<groupId>io.netty</groupId>
226+
<artifactId>netty-buffer</artifactId>
227+
<version>${netty4Version}</version>
228+
</dependency>
229+
<dependency>
230+
<groupId>io.netty</groupId>
231+
<artifactId>netty-common</artifactId>
232+
<version>${netty4Version}</version>
233+
</dependency>
234+
<dependency>
235+
<groupId>io.netty</groupId>
236+
<artifactId>netty-handler</artifactId>
237+
<version>${netty4Version}</version>
238+
</dependency>
239+
<dependency>
240+
<groupId>io.netty</groupId>
241+
<artifactId>netty-transport</artifactId>
242+
<version>${netty4Version}</version>
243+
</dependency>
244+
<dependency>
245+
<groupId>io.netty</groupId>
246+
<artifactId>netty-codec-http</artifactId>
247+
<version>${netty4Version}</version>
248+
</dependency>
249+
<dependency>
250+
<groupId>io.netty</groupId>
251+
<artifactId>netty-transport-native-epoll</artifactId>
252+
<version>${netty4Version}</version>
253+
</dependency>
254+
<dependency>
255+
<groupId>io.netty</groupId>
256+
<artifactId>netty-transport-native-kqueue</artifactId>
257+
<version>${netty4Version}</version>
258+
</dependency>
185259
<dependency>
186260
<groupId>junit</groupId>
187261
<artifactId>junit</artifactId>

‎features/minion/core/repository/src/assembly/repo.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<excludes>
1414
<exclude>**/zookeeper/3.4.14</exclude>
1515
<exclude>**/zookeeper/3.4.14/*</exclude>
16+
<exclude>io/netty/netty-*/4.1.77.Final</exclude>
17+
<exclude>io/netty/netty-*/4.1.77.Final/*</exclude>
1618
</excludes>
1719
</fileSet>
1820
</fileSets>

‎features/minion/repository/src/assembly/repo.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<exclude>**/zookeeper/3.4.14/*</exclude>
1818
<exclude>**/com/fasterxml/jackson/core/jackson-*/2.14.1</exclude>
1919
<exclude>**/com/fasterxml/jackson/core/jackson-*/2.14.1/*</exclude>
20+
<exclude>io/netty/netty-*/4.1.77.Final</exclude>
21+
<exclude>io/netty/netty-*/4.1.77.Final/*</exclude>
2022
</excludes>
2123
</fileSet>
2224
</fileSets>

‎features/sentinel/repository/src/assembly/repo.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<excludes>
1414
<exclude>**/zookeeper/3.4.14</exclude>
1515
<exclude>**/zookeeper/3.4.14/*</exclude>
16+
<exclude>io/netty/netty-*/4.1.22.Final</exclude>
17+
<exclude>io/netty/netty-*/4.1.22.Final/*</exclude>
18+
<exclude>io/netty/netty-*/4.1.77.Final</exclude>
19+
<exclude>io/netty/netty-*/4.1.77.Final/*</exclude>
1620
</excludes>
1721
</fileSet>
1822
</fileSets>

0 commit comments

Comments
 (0)