Watcher: Updated dependencies (elastic/elasticsearch#2064)

Updated okhttp and moved the jsr305 dependency into testing.
This required a minor change in tests using SSL, as otherwise
the security manager barfs, when the okhttp webserver tries
to load sun internal SSL based classes.

Original commit: elastic/x-pack-elasticsearch@77131589e0

elasticsearch/x-pack/build.gradle

@@ -11,7 +11,7 @@ esplugin {
 }
 
 ext.versions = [
-  okhttp: '2.3.0'
+  okhttp: '2.7.5'
 ]
 
 // TODO: fix this! https://github.com/elastic/x-plugins/issues/1066
@@ -32,9 +32,10 @@ dependencies {
   // watcher deps
   compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
   compile 'com.google.guava:guava:16.0.1' // needed by watcher for the html sanitizer and shield tests for jimfs
-  compile 'com.google.code.findbugs:jsr305:3.0.1' // TODO: remove this
   compile 'com.sun.mail:javax.mail:1.5.3'
   testCompile 'org.subethamail:subethasmtp:3.1.7'
+  // needed for subethasmtp, has @GuardedBy annotation
+  testCompile 'com.google.code.findbugs:jsr305:3.0.1'
 
   // common test deps
   testCompile 'org.elasticsearch:securemock:1.2'
@@ -45,7 +46,7 @@ dependencies {
   testCompile "com.squareup.okhttp:mockwebserver:${versions.okhttp}"
   testCompile "com.squareup.okhttp:okhttp:${versions.okhttp}"
   testCompile "com.squareup.okhttp:okhttp-ws:${versions.okhttp}"
-  testCompile 'com.squareup.okio:okio:1.3.0'
+  testCompile 'com.squareup.okio:okio:1.6.0'
   testCompile 'org.bouncycastle:bcprov-jdk15on:1.50'
 }
 
@@ -201,4 +202,4 @@ modifyPom { MavenPom pom ->
       }
     }
   }
-}
+}

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java

@@ -60,6 +60,7 @@ public class WebhookHttpsIntegrationTests extends AbstractWatcherIntegrationTest
         for (webPort = 9200; webPort < 9300; webPort++) {
             try {
                 webServer = new MockWebServer();
+                webServer.setProtocolNegotiationEnabled(false);
                 QueueDispatcher dispatcher = new QueueDispatcher();
                 dispatcher.setFailFast(true);
                 webServer.setDispatcher(dispatcher);

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpClientTests.java

@@ -398,6 +398,7 @@ public class HttpClientTests extends ESTestCase {
     private MockWebServer startWebServer() throws IOException {
         try {
             MockWebServer mockWebServer = new MockWebServer();
+            mockWebServer.setProtocolNegotiationEnabled(false);
             mockWebServer.start();
             return mockWebServer;
         } catch (BindException be) {