Merge pull request #56 from bitwiseman/okhttp-api-plugin

Use okhttp-api-plugin for dependency management
jenkinsci · Jun 16, 2020 · a2ac7e3 · a2ac7e3
2 parents 9540725 + 93e15da
commit a2ac7e3
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,9 +28,6 @@
     <jenkins.version>2.164.3</jenkins.version>
     <java.level>8</java.level>
     <no-test-jar>false</no-test-jar>
-    <okhttp.version>2.7.5</okhttp.version>
-    <okhttp3.version>3.12.12</okhttp3.version>
-    <okio.version>1.17.5</okio.version>
   </properties>
 
   <dependencies>
@@ -39,27 +36,11 @@
       <artifactId>jackson2-api</artifactId>
       <version>2.10.2</version>
     </dependency>
-    <!-- Okhttp direct dependency.  Will be replaced by okhttp-api-plugin in next release. -->
     <dependency>
-      <groupId>com.squareup.okio</groupId>
-      <artifactId>okio</artifactId>
-      <version>${okio.version}</version>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>okhttp-api</artifactId>
+      <version>3.12.12.2</version>
     </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp3.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp-urlconnection</artifactId>
-      <version>${okhttp.version}</version>
-    </dependency>    
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>github-api</artifactId>
@@ -75,6 +56,26 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <!-- jackson is provided by jackson2-api plugin -->
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <!-- okhttp, okhttp3, and okio are provided by okhttp-api plugin -->
+        <!-- These are optional dependencies of github-api, but we do this just to be sure -->
+        <!-- that we never take these deps from github-api even accidentally. -->
+        <exclusion>
+          <groupId>com.squareup.okhttp</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.squareup.okhttp3</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.squareup.okio</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>