Skip to content

Commit

Permalink
Update dependencies (#1255)
Browse files Browse the repository at this point in the history 
* Update dependencies

* Migrate to netty-bom and include netty-tcnative-classes

* Set maven-resources-plugin version
  • Loading branch information
@injectives
injectives authored Jul 5, 2022
1 parent 22972c2 commit 3c0b9ab
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 7 deletions.
2 changes: 2 additions & 0 deletions bundle/LICENSES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Apache Software License, Version 2.0
Netty/Common
Netty/Handler
Netty/Resolver
Netty/TomcatNative [OpenSSL - Classes]
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM
------------------------------------------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions bundle/NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ Apache Software License, Version 2.0
Netty/Common
Netty/Handler
Netty/Resolver
Netty/TomcatNative [OpenSSL - Classes]
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM

Creative Commons 0
Expand Down
1 change: 1 addition & 0 deletions bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<plugins>
<!-- Extract the original sources again -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
Expand Down
2 changes: 2 additions & 0 deletions driver/LICENSES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Apache Software License, Version 2.0
Netty/Common
Netty/Handler
Netty/Resolver
Netty/TomcatNative [OpenSSL - Classes]
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM
------------------------------------------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions driver/NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ Apache Software License, Version 2.0
Netty/Common
Netty/Handler
Netty/Resolver
Netty/TomcatNative [OpenSSL - Classes]
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM

Creative Commons 0
Expand Down
4 changes: 4 additions & 0 deletions driver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-classes</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
Expand Down
21 changes: 14 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@
<!-- Please note that when updating this dependency -->
<!-- (i.e. due to a security vulnerability or bug) that the -->
<!-- corresponding server dependency also needs updating.-->
<netty-handler.version>4.1.77.Final</netty-handler.version>
<netty-bom.version>4.1.78.Final</netty-bom.version>
<!-- Please note that when updating this dependency -->
<!-- (i.e. due to a security vulnerability or bug) that the -->
<!-- corresponding server dependency also needs updating.-->
<reactor-bom.version>2020.0.19</reactor-bom.version>
<reactor-bom.version>2020.0.20</reactor-bom.version>
<rxjava.version>2.2.21</rxjava.version>
<slf4j-api.version>1.7.36</slf4j-api.version>
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
<mockito-core.version>4.6.0</mockito-core.version>
<mockito-core.version>4.6.1</mockito-core.version>
<junit.version>5.8.2</junit.version>
<jarchivelib.version>1.2.0</jarchivelib.version>
<bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
<logback-classic.version>1.2.11</logback-classic.version>
<jackson.version>2.13.3</jackson.version>
<lombok.version>1.18.24</lombok.version>
<svm.version>21.3.2.1</svm.version>
<micrometer.version>1.9.0</micrometer.version>
<build-resources.version>4.4.7</build-resources.version>
<micrometer.version>1.9.1</micrometer.version>
<build-resources.version>4.4.8</build-resources.version>
<!-- To be overwritten by child projects -->
<moduleName/>
</properties>
Expand Down Expand Up @@ -97,8 +97,10 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty-handler.version}</version>
<artifactId>netty-bom</artifactId>
<version>${netty-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
Expand Down Expand Up @@ -466,6 +468,11 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down
2 changes: 2 additions & 0 deletions testkit-backend/LICENSES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ Apache Software License, Version 2.0
Netty/Common
Netty/Handler
Netty/Resolver
Netty/TomcatNative [OpenSSL - Classes]
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM
------------------------------------------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions testkit-backend/NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ Apache Software License, Version 2.0
Netty/Common
Netty/Handler
Netty/Resolver
Netty/TomcatNative [OpenSSL - Classes]
Netty/Transport
Netty/Transport/Native/Unix/Common
Non-Blocking Reactive Foundation for the JVM

Creative Commons 0
Expand Down

0 comments on commit 3c0b9ab

Please sign in to comment.