Merge pull request #304 from olivergondza/okhttp-ssl

Fix #303: okhttp: Make insecure SSL work in recent JDKs

Author: olivergondza

plugin/pom.xml

@@ -24,7 +24,8 @@
 
         <guava.version>20.0</guava.version> <!-- version compatible with openstack4j -->
         <jsr305.version>1.3.9</jsr305.version>
-        <openstack4j.version>3.6</openstack4j.version>
+        <openstack4j.version>3.8</openstack4j.version>
+        <okhttp.version>3.9.1</okhttp.version>
     </properties>
 
     <developers>
@@ -49,7 +50,12 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.9.1</version>
+            <version>${okhttp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp.version}</version>
         </dependency>
 
         <dependency>

plugin/src/test/java/jenkins/plugins/openstack/compute/JCloudsCloudTest.java

@@ -536,8 +536,8 @@ public void security808() throws Exception {
         }
 
         try (ACLContext ignored = ACL.as(User.getOrCreateByIdOrFullName("admin"))) {
-            desc.doTestConnection(true, c.getId(), destination, "");
-            assertEquals(1, credentialsCollectingPortal.reqs.size());
+            FormValidation formValidation = desc.doTestConnection(true, c.getId(), destination, "");
+            assertEquals(formValidation.getMessage(), 1, credentialsCollectingPortal.reqs.size());
         }
     }