From 354dc94d3ed4f4114b8b59a9c3e3b78e186a7ea5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Thu, 2 Apr 2020 10:56:25 +0200
Subject: [PATCH] Upgrade dependencies #1259

---
 pom.xml | 71 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a0a47f47e..df43a31fe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,21 +51,34 @@
     </developers>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
         <assertj-core.version>3.15.0</assertj-core.version>
-        <brave-version>5.9.4</brave-version>
-        <junit-version>5.6.0</junit-version>
-        <log4j2-version>2.13.0</log4j2-version>
-        <mockito.version>3.2.4</mockito.version>
-        <netty-version>4.1.47.Final</netty-version>
-        <reactor-version>3.3.2.RELEASE</reactor-version>
+        <cdi-api.version>2.0</cdi-api.version>
+        <brave.version>5.10.2</brave.version>
+        <commons-lang3.version>3.10</commons-lang3.version>
+        <commons-pool.version>2.8.0</commons-pool.version>
+        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <junit4.version>4.13</junit4.version>
+        <junit5.version>5.6.1</junit5.version>
+        <hamcrest-library.version>2.2</hamcrest-library.version>
+        <hdr-histogram-version>2.1.12</hdr-histogram-version>
+        <latencyutils.version>2.0.3</latencyutils.version>
+        <log4j2-version>2.13.1</log4j2-version>
+        <mockito.version>3.3.3</mockito.version>
+        <netty.version>4.1.48.Final</netty.version>
+        <openwebbeans.version>2.0.16</openwebbeans.version>
+        <reactor.version>3.3.4.RELEASE</reactor.version>
+        <rxjava.version>1.3.8</rxjava.version>
+        <rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
+        <rxjava2.version>2.2.19</rxjava2.version>
         <reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <spring-version>4.3.26.RELEASE</spring-version>
+        <spring.version>4.3.26.RELEASE</spring.version>
 
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
         <skipITs>true</skipITs>
+
     </properties>
 
     <scm>
@@ -94,7 +107,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
-                <version>${netty-version}</version>
+                <version>${netty.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -102,7 +115,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
-                <version>${spring-version}</version>
+                <version>${spring.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -110,7 +123,7 @@
             <dependency>
                 <groupId>io.zipkin.brave</groupId>
                 <artifactId>brave-bom</artifactId>
-                <version>${brave-version}</version>
+                <version>${brave.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -118,7 +131,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>${junit-version}</version>
+                <version>${junit5.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -156,7 +169,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>${reactor-version}</version>
+            <version>${reactor.version}</version>
         </dependency>
 
         <!-- End of core dependencies -->
@@ -166,7 +179,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.7.0</version>
+            <version>${commons-pool.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -205,14 +218,14 @@
         <dependency>
             <groupId>org.latencyutils</groupId>
             <artifactId>LatencyUtils</artifactId>
-            <version>2.0.3</version>
+            <version>${latencyutils.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.hdrhistogram</groupId>
             <artifactId>HdrHistogram</artifactId>
-            <version>2.1.11</version>
+            <version>${hdr-histogram-version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -221,21 +234,21 @@
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava</artifactId>
-            <version>1.3.8</version>
+            <version>${rxjava.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava-reactive-streams</artifactId>
-            <version>1.2.1</version>
+            <version>${rxjava-reactive-streams.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.2.13</version>
+            <version>${rxjava2.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -264,7 +277,7 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>2.0</version>
+            <version>${cdi-api.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -296,14 +309,14 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
+            <version>${hamcrest-library.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8</version>
+            <version>${commons-lang3.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -319,21 +332,21 @@
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-se</artifactId>
-            <version>2.0.11</version>
+            <version>${openwebbeans.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <version>${javax.annotation-api.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -342,7 +355,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit4.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -423,7 +436,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>${reactor-version}</version>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -448,7 +461,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-            <version>${spring-version}</version>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>