Merge pull request #230 from rlogasundaram/okhttp_security_correction

removed outdated okhttp lib, and updated java native library changes

Author: olamy

pom.xml

@@ -96,13 +96,6 @@
       </exclusions>
     </dependency>
 
-    <!-- Included for backward compatibility, should be removed once downstream plugins are updated to use okhttp3 -->
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp-urlconnection</artifactId>
-      <version>2.7.5</version>
-    </dependency>
-
   </dependencies>
 
   <dependencyManagement>

src/test/java/jenkins/plugins/github/api/SmokeTest.java

@@ -5,11 +5,10 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.OkUrlFactory;
 import jenkins.plugins.github.api.mock.MockGitHub;
 import jenkins.plugins.github.api.mock.MockOrganization;
 import jenkins.plugins.github.api.mock.MockUser;
+import okhttp3.OkHttpClient;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -18,8 +17,7 @@
 import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
 import org.kohsuke.github.GitHubBuilder;
-import org.kohsuke.github.HttpConnector;
-import org.kohsuke.github.extras.OkHttpConnector;
+import org.kohsuke.github.connector.GitHubConnector;
 import org.kohsuke.github.extras.okhttp3.OkHttpGitHubConnector;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -52,13 +50,10 @@ public SmokeTest(IOFunction connectFunction) {
 
     @Parameterized.Parameters(name = "connectFunction={index}")
     public static IOFunction[] connectFunctions() {
-        HttpConnector okHttpConnector = new OkHttpConnector(new OkUrlFactory(new OkHttpClient()));
-        HttpConnector okHttp3Connector = new org.kohsuke.github.extras.okhttp3.OkHttpConnector(new okhttp3.OkHttpClient());
-        OkHttpGitHubConnector okHttpGitHubConnector = new OkHttpGitHubConnector(new okhttp3.OkHttpClient());
+        OkHttpClient okHttpClient = new OkHttpClient();
+        GitHubConnector okHttpGitHubConnector = new OkHttpGitHubConnector(okHttpClient);
         ArrayList<IOFunction> list = new ArrayList<>();
         list.add ((mock) -> GitHub.connectToEnterpriseAnonymously(mock.open()));
-        list.add ((mock) -> new GitHubBuilder().withConnector(okHttpConnector).withEndpoint(mock.open()).build());
-        list.add ((mock) -> new GitHubBuilder().withConnector(okHttp3Connector).withEndpoint(mock.open()).build());
         list.add ((mock) -> new GitHubBuilder().withConnector(okHttpGitHubConnector).withEndpoint(mock.open()).build());
 
         return list.toArray(new IOFunction[] {});