Merge branch '2.0.x' into 2.1.x
This commit is contained in:
@@ -58,11 +58,6 @@
|
|||||||
<artifactId>spring-cloud-starter-bootstrap</artifactId>
|
<artifactId>spring-cloud-starter-bootstrap</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.security</groupId>
|
|
||||||
<artifactId>spring-security-rsa</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
<istio-client.version>1.7.7.1</istio-client.version>
|
<istio-client.version>1.7.7.1</istio-client.version>
|
||||||
<wiremock.version>2.26.3</wiremock.version>
|
<wiremock.version>2.26.3</wiremock.version>
|
||||||
<spring-retry.version>1.3.1</spring-retry.version>
|
<spring-retry.version>1.3.1</spring-retry.version>
|
||||||
|
<commons.collections4.version>4.4</commons.collections4.version>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -51,6 +52,12 @@
|
|||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-collections4</artifactId>
|
||||||
|
<version>${commons.collections4.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.kubernetes</groupId>
|
<groupId>io.kubernetes</groupId>
|
||||||
<artifactId>client-java</artifactId>
|
<artifactId>client-java</artifactId>
|
||||||
|
|||||||
Reference in New Issue
Block a user