* 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
@@ -42,10 +42,11 @@ | |||||
<properties> | <properties> | ||||
<!-- Compile libs --> | <!-- Compile libs --> | ||||
<fastjson.version>1.2.62</fastjson.version> | <fastjson.version>1.2.62</fastjson.version> | ||||
<javax.annotation-api.version>1.3.2</javax.annotation-api.version> | |||||
<!-- Test libs --> | <!-- Test libs --> | ||||
<junit.version>4.12</junit.version> | <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> | <assertj.version>3.12.1</assertj.version> | ||||
<awaitility.version>3.1.5</awaitility.version> | <awaitility.version>3.1.5</awaitility.version> | ||||
<powermock.version>2.0.0</powermock.version> | <powermock.version>2.0.0</powermock.version> | ||||
@@ -43,7 +43,7 @@ | |||||
<dependency> | <dependency> | ||||
<groupId>javax.annotation</groupId> | <groupId>javax.annotation</groupId> | ||||
<artifactId>javax.annotation-api</artifactId> | <artifactId>javax.annotation-api</artifactId> | ||||
<version>1.2</version> | |||||
<version>${javax.annotation-api.version}</version> | |||||
</dependency> | </dependency> | ||||
@@ -35,6 +35,11 @@ | |||||
<groupId>com.alibaba.csp</groupId> | <groupId>com.alibaba.csp</groupId> | ||||
<artifactId>sentinel-transport-simple-http</artifactId> | <artifactId>sentinel-transport-simple-http</artifactId> | ||||
</dependency> | </dependency> | ||||
<dependency> | |||||
<groupId>javax.annotation</groupId> | |||||
<artifactId>javax.annotation-api</artifactId> | |||||
<version>${javax.annotation-api.version}</version> | |||||
</dependency> | |||||
<dependency> | <dependency> | ||||
<groupId>io.grpc</groupId> | <groupId>io.grpc</groupId> | ||||
@@ -26,6 +26,11 @@ | |||||
<artifactId>zuul-core</artifactId> | <artifactId>zuul-core</artifactId> | ||||
<version>2.1.5</version> | <version>2.1.5</version> | ||||
</dependency> | </dependency> | ||||
<dependency> | |||||
<groupId>javax.annotation</groupId> | |||||
<artifactId>javax.annotation-api</artifactId> | |||||
<version>${javax.annotation-api.version}</version> | |||||
</dependency> | |||||
<dependency> | <dependency> | ||||
<groupId>org.slf4j</groupId> | <groupId>org.slf4j</groupId> | ||||