[phoenix] branch master updated: PHOENIX-5811 Synchronise Phoenix dependencies to match Hbase dependency versions

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 39a34b8  PHOENIX-5811 Synchronise Phoenix dependencies to match Hbase dependency versions
39a34b8 is described below

commit 39a34b8fae743c63f634ef0366c2de130a621bbe
Author: Richard Antal <an...@gmail.com>
AuthorDate: Tue Mar 31 13:31:28 2020 +0200

    PHOENIX-5811 Synchronise Phoenix dependencies to match Hbase dependency versions
---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d0c1ee..0181548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
     <antlr.version>3.5.2</antlr.version>
     <log4j.version>1.2.17</log4j.version>
     <disruptor.version>3.3.6</disruptor.version>
-    <slf4j.version>1.6.4</slf4j.version>
+    <slf4j.version>1.7.25</slf4j.version>
     <protobuf-java.version>2.5.0</protobuf-java.version>
     <commons-io.version>2.5</commons-io.version>
     <commons-lang.version>3.8</commons-lang.version>
@@ -109,8 +109,7 @@
     <commons-codec.version>1.7</commons-codec.version>
     <htrace.version>3.1.0-incubating</htrace.version>
     <collections.version>3.2.2</collections.version>
-    <!-- Do not change jodatime.version until HBASE-15199 is fixed -->
-    <jodatime.version>1.6</jodatime.version>
+    <jodatime.version>2.10.5</jodatime.version>
     <joni.version>2.1.2</joni.version>
     <tephra.version>0.15.0-incubating</tephra.version>
     <omid.version>1.0.1</omid.version>
@@ -125,7 +124,7 @@
     <jcodings.version>1.0.18</jcodings.version>
     <thrift.version>0.9.0</thrift.version>
     <!-- Test Dependencies -->
-    <mockito.version>1.8.5</mockito.version>
+    <mockito.version>1.10.19</mockito.version>
     <junit.version>4.13</junit.version>
     <hamcrest.version>1.3</hamcrest.version>