update mockito to 21 java (#228)

oaplatform · Jan 3, 2024 · 6387854 · 6387854
1 parent daac66b
commit 6387854
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/oap-hadoop/pom.xml b/oap-hadoop/pom.xml
@@ -23,7 +23,6 @@
             <version>${oap.deps.docker-java.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.github.docker-java/docker-java-transport-zerodep -->
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java-transport-zerodep</artifactId>

diff --git a/oap-stdlib/pom.xml b/oap-stdlib/pom.xml
@@ -188,15 +188,9 @@
             <version>${oap.deps.luben-zstd-jni.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.github.rholder</groupId>
-            <artifactId>guava-retrying</artifactId>
+            <groupId>io.github.itning</groupId>
+            <artifactId>guava-retrying3</artifactId>
             <version>${oap.deps.guava-retrying.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.jasonclawson</groupId>

diff --git a/oap-stdlib/src/main/java/oap/alert/GuaranteedDeliveryTransport.java b/oap-stdlib/src/main/java/oap/alert/GuaranteedDeliveryTransport.java
@@ -24,13 +24,13 @@
 
 package oap.alert;
 
-import com.github.rholder.retry.Attempt;
-import com.github.rholder.retry.RetryException;
-import com.github.rholder.retry.RetryListener;
-import com.github.rholder.retry.Retryer;
-import com.github.rholder.retry.RetryerBuilder;
-import com.github.rholder.retry.StopStrategies;
-import com.github.rholder.retry.WaitStrategies;
+import io.github.itning.retry.Attempt;
+import io.github.itning.retry.RetryException;
+import io.github.itning.retry.Retryer;
+import io.github.itning.retry.RetryerBuilder;
+import io.github.itning.retry.listener.RetryListener;
+import io.github.itning.retry.strategy.stop.StopStrategies;
+import io.github.itning.retry.strategy.wait.WaitStrategies;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.concurrent.ExecutionException;

diff --git a/oap-stdlib/src/main/java/oap/io/Files.java b/oap-stdlib/src/main/java/oap/io/Files.java
@@ -23,11 +23,11 @@
  */
 package oap.io;
 
-import com.github.rholder.retry.RetryException;
-import com.github.rholder.retry.RetryerBuilder;
-import com.github.rholder.retry.StopStrategies;
 import com.google.common.base.Preconditions;
 import com.google.common.hash.Hashing;
+import io.github.itning.retry.RetryException;
+import io.github.itning.retry.RetryerBuilder;
+import io.github.itning.retry.strategy.stop.StopStrategies;
 import lombok.extern.slf4j.Slf4j;
 import oap.io.IoStreams.Encoding;
 import oap.io.content.ContentReader;

diff --git a/pom.xml b/pom.xml
@@ -44,20 +44,20 @@
     </repositories>
 
     <properties>
-        <oap.project.version>21.1.7</oap.project.version>
+        <oap.project.version>21.1.8</oap.project.version>
 
         <oap.deps.config.version>21.0.0</oap.deps.config.version>
 
         <oap.deps.testng.version>7.8.0</oap.deps.testng.version>
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>
         <oap.deps.mockserver-netty.version>5.14.0</oap.deps.mockserver-netty.version>
 
-        <oap.deps.guava.version>32.1.3-jre</oap.deps.guava.version>
+        <oap.deps.guava.version>33.0.0-jre</oap.deps.guava.version>
 
         <oap.deps.logback.version>1.4.14</oap.deps.logback.version>
         <oap.deps.slf4j.version>2.0.9</oap.deps.slf4j.version>
 
-        <oap.deps.mockito.version>5.3.1</oap.deps.mockito.version>
+        <oap.deps.mockito.version>5.8.0</oap.deps.mockito.version>
 
         <oap.deps.okhttp.version>4.11.0</oap.deps.okhttp.version>
         <oap.deps.apache.httpcomponents.version>4.4.16</oap.deps.apache.httpcomponents.version>
@@ -78,7 +78,7 @@
 
         <oap.deps.joda.version>2.12.5</oap.deps.joda.version>
 
-        <oap.deps.jackson.version>2.15.2</oap.deps.jackson.version>
+        <oap.deps.jackson.version>2.16.1</oap.deps.jackson.version>
         <oap.deps.jackson-dataformat-hocon.version>1.1.0</oap.deps.jackson-dataformat-hocon.version>
 
         <oap.deps.lombok.version>1.18.30</oap.deps.lombok.version>
@@ -108,7 +108,7 @@
         <oap.deps.aircompressor.version>0.25</oap.deps.aircompressor.version>
         <oap.deps.luben-zstd-jni.version>1.5.5-11</oap.deps.luben-zstd-jni.version>
         <oap.deps.fst.version>3.0.4-jdk17</oap.deps.fst.version>
-        <oap.deps.guava-retrying.version>2.0.0</oap.deps.guava-retrying.version>
+        <oap.deps.guava-retrying.version>3.0.3</oap.deps.guava-retrying.version>
         <oap.deps.javax.activation.version>1.1.1</oap.deps.javax.activation.version>
         <oap.deps.disruptor.version>1.2.21</oap.deps.disruptor.version>