From b715ceacf073fc7b8368517de0a96770e5a364cb Mon Sep 17 00:00:00 2001
From: Jason Joo <hblzxsj@163.com>
Date: Mon, 23 Mar 2020 22:26:56 +0800
Subject: [PATCH] Fix CI failure in JDK 11 environment (#1360)

* Supplement missing javax.annotation-api to sentinel-cluster-server-envoy-rls and sentinel-demo-zuul2-gateway
* Upgrade mockito-core to 2.28.2 (up to date)
---
 pom.xml                                                    | 3 ++-
 sentinel-adapter/sentinel-grpc-adapter/pom.xml             | 2 +-
 sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml | 5 +++++
 sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml          | 5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 646b4fa3..c9936615 100755
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +42,11 @@
     <properties>
         <!-- Compile libs -->
         <fastjson.version>1.2.62</fastjson.version>
+        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
 
         <!-- Test libs -->
         <junit.version>4.12</junit.version>
-        <mockito.version>2.21.0</mockito.version>
+        <mockito.version>2.28.2</mockito.version>
         <assertj.version>3.12.1</assertj.version>
         <awaitility.version>3.1.5</awaitility.version>
         <powermock.version>2.0.0</powermock.version>
diff --git a/sentinel-adapter/sentinel-grpc-adapter/pom.xml b/sentinel-adapter/sentinel-grpc-adapter/pom.xml
index 7f4f9f13..05add497 100755
--- a/sentinel-adapter/sentinel-grpc-adapter/pom.xml
+++ b/sentinel-adapter/sentinel-grpc-adapter/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.2</version>
+            <version>${javax.annotation-api.version}</version>
         </dependency>
 
 
diff --git a/sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml b/sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml
index 3c84641c..e967f7ab 100644
--- a/sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml
+++ b/sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml
@@ -35,6 +35,11 @@
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-transport-simple-http</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation-api.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>io.grpc</groupId>
diff --git a/sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml b/sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml
index 01e562a7..525a65dd 100644
--- a/sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml
+++ b/sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml
@@ -26,6 +26,11 @@
             <artifactId>zuul-core</artifactId>
             <version>2.1.5</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation-api.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>