Browse Source

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)
master
Jason Joo GitHub 5 years ago
parent
commit
b715ceacf0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 2 deletions
  1. +2
    -1
      pom.xml
  2. +1
    -1
      sentinel-adapter/sentinel-grpc-adapter/pom.xml
  3. +5
    -0
      sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml
  4. +5
    -0
      sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml

+ 2
- 1
pom.xml View File

@@ -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>


+ 1
- 1
sentinel-adapter/sentinel-grpc-adapter/pom.xml View File

@@ -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>




+ 5
- 0
sentinel-cluster/sentinel-cluster-server-envoy-rls/pom.xml View File

@@ -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>


+ 5
- 0
sentinel-demo/sentinel-demo-zuul2-gateway/pom.xml View File

@@ -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>


Loading…
Cancel
Save