Merge branch '2.0.x' into main

This commit is contained in:
Ryan Baxter
2021-08-17 14:10:07 -04:00

View File

@@ -39,7 +39,6 @@
<kubernetes-java-client.version>13.0.0</kubernetes-java-client.version>
<istio-client.version>1.7.7.1</istio-client.version>
<mockwebserver.version>0.1.2</mockwebserver.version>
<okhttp.version>3.14.4</okhttp.version>
<wiremock.version>2.26.3</wiremock.version>
</properties>
<dependencyManagement>
@@ -274,17 +273,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-test-support</artifactId>