Merge branch '4.2.x'

Author: ryanjbaxter

spring-cloud-commons-dependencies/pom.xml

@@ -60,13 +60,10 @@
 			<!-- This can be removed in the next major -->
 			<dependency>
 				<groupId>com.squareup.okhttp3</groupId>
-				<artifactId>okhttp</artifactId>
-				<version>${okhttp.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.squareup.okhttp3</groupId>
-				<artifactId>logging-interceptor</artifactId>
+				<artifactId>okhttp-bom</artifactId>
 				<version>${okhttp.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>