Skip to content

Commit c0a6452

Browse files
injectivesinjectives
authored
Update dependencies (#1255) (#1261)
* Update dependencies * Migrate to netty-bom and include netty-tcnative-classes * Set maven-resources-plugin version
1 parent 213daba commit c0a6452

File tree

11 files changed

+36
-8
lines changed

11 files changed

+36
-8
lines changed

‎bundle/LICENSES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Apache Software License, Version 2.0
99
Netty/Common
1010
Netty/Handler
1111
Netty/Resolver
12+
Netty/TomcatNative [OpenSSL - Classes]
1213
Netty/Transport
14+
Netty/Transport/Native/Unix/Common
1315
Non-Blocking Reactive Foundation for the JVM
1416
------------------------------------------------------------------------------
1517

‎bundle/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Apache Software License, Version 2.0
2424
Netty/Common
2525
Netty/Handler
2626
Netty/Resolver
27+
Netty/TomcatNative [OpenSSL - Classes]
2728
Netty/Transport
29+
Netty/Transport/Native/Unix/Common
2830
Non-Blocking Reactive Foundation for the JVM
2931

3032
Creative Commons 0

‎bundle/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<plugins>
5959
<!-- Extract the original sources again -->
6060
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
6162
<artifactId>maven-resources-plugin</artifactId>
6263
<version>3.2.0</version>
6364
<executions>

‎driver/LICENSES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Apache Software License, Version 2.0
99
Netty/Common
1010
Netty/Handler
1111
Netty/Resolver
12+
Netty/TomcatNative [OpenSSL - Classes]
1213
Netty/Transport
14+
Netty/Transport/Native/Unix/Common
1315
Non-Blocking Reactive Foundation for the JVM
1416
------------------------------------------------------------------------------
1517

‎driver/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Apache Software License, Version 2.0
2424
Netty/Common
2525
Netty/Handler
2626
Netty/Resolver
27+
Netty/TomcatNative [OpenSSL - Classes]
2728
Netty/Transport
29+
Netty/Transport/Native/Unix/Common
2830
Non-Blocking Reactive Foundation for the JVM
2931

3032
Creative Commons 0

‎driver/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
<groupId>io.netty</groupId>
3232
<artifactId>netty-handler</artifactId>
3333
</dependency>
34+
<dependency>
35+
<groupId>io.netty</groupId>
36+
<artifactId>netty-tcnative-classes</artifactId>
37+
</dependency>
3438
<dependency>
3539
<groupId>io.projectreactor</groupId>
3640
<artifactId>reactor-core</artifactId>

‎examples/LICENSES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ Apache Software License, Version 2.0
99
Netty/Common
1010
Netty/Handler
1111
Netty/Resolver
12+
Netty/TomcatNative [OpenSSL - Classes]
1213
Netty/Transport
14+
Netty/Transport/Native/Unix/Common
1315
Non-Blocking Reactive Foundation for the JVM
1416
RxJava
1517
------------------------------------------------------------------------------

‎examples/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ Apache Software License, Version 2.0
2424
Netty/Common
2525
Netty/Handler
2626
Netty/Resolver
27+
Netty/TomcatNative [OpenSSL - Classes]
2728
Netty/Transport
29+
Netty/Transport/Native/Unix/Common
2830
Non-Blocking Reactive Foundation for the JVM
2931
RxJava
3032

‎pom.xml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@
3434
<!-- Please note that when updating this dependency -->
3535
<!-- (i.e. due to a security vulnerability or bug) that the -->
3636
<!-- corresponding server dependency also needs updating.-->
37-
<netty-handler.version>4.1.77.Final</netty-handler.version>
37+
<netty-bom.version>4.1.78.Final</netty-bom.version>
3838
<!-- Please note that when updating this dependency -->
3939
<!-- (i.e. due to a security vulnerability or bug) that the -->
4040
<!-- corresponding server dependency also needs updating.-->
41-
<reactor-bom.version>2020.0.19</reactor-bom.version>
41+
<reactor-bom.version>2020.0.20</reactor-bom.version>
4242
<rxjava.version>2.2.21</rxjava.version>
4343
<slf4j-api.version>1.7.36</slf4j-api.version>
4444
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
4545
<mockito-core.version>4.6.1</mockito-core.version>
4646
<junit.version>5.8.2</junit.version>
47-
<testng-engine.version>1.0.2</testng-engine.version>
47+
<testng-engine.version>1.0.4</testng-engine.version>
4848
<jarchivelib.version>1.2.0</jarchivelib.version>
4949
<bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
5050
<logback-classic.version>1.2.11</logback-classic.version>
5151
<jackson.version>2.13.3</jackson.version>
5252
<lombok.version>1.18.24</lombok.version>
5353
<svm.version>21.3.2.1</svm.version>
54-
<micrometer.version>1.9.0</micrometer.version>
55-
<testcontainers.version>1.17.2</testcontainers.version>
56-
<build-resources.version>4.4.7</build-resources.version>
54+
<micrometer.version>1.9.1</micrometer.version>
55+
<testcontainers.version>1.17.3</testcontainers.version>
56+
<build-resources.version>4.4.8</build-resources.version>
5757
<!-- To be overwritten by child projects -->
5858
<moduleName/>
5959
</properties>
@@ -99,8 +99,10 @@
9999
</dependency>
100100
<dependency>
101101
<groupId>io.netty</groupId>
102-
<artifactId>netty-handler</artifactId>
103-
<version>${netty-handler.version}</version>
102+
<artifactId>netty-bom</artifactId>
103+
<version>${netty-bom.version}</version>
104+
<type>pom</type>
105+
<scope>import</scope>
104106
</dependency>
105107
<dependency>
106108
<groupId>io.projectreactor</groupId>
@@ -487,6 +489,11 @@
487489
</dependency>
488490
</dependencies>
489491
</plugin>
492+
<plugin>
493+
<groupId>org.apache.maven.plugins</groupId>
494+
<artifactId>maven-resources-plugin</artifactId>
495+
<version>2.7</version>
496+
</plugin>
490497
</plugins>
491498
</pluginManagement>
492499

‎testkit-backend/LICENSES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ Apache Software License, Version 2.0
1212
Netty/Common
1313
Netty/Handler
1414
Netty/Resolver
15+
Netty/TomcatNative [OpenSSL - Classes]
1516
Netty/Transport
17+
Netty/Transport/Native/Unix/Common
1618
Non-Blocking Reactive Foundation for the JVM
1719
------------------------------------------------------------------------------
1820

‎testkit-backend/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ Apache Software License, Version 2.0
2727
Netty/Common
2828
Netty/Handler
2929
Netty/Resolver
30+
Netty/TomcatNative [OpenSSL - Classes]
3031
Netty/Transport
32+
Netty/Transport/Native/Unix/Common
3133
Non-Blocking Reactive Foundation for the JVM
3234

3335
Creative Commons 0

0 commit comments

Comments
 (0)