Upgraded to Jetty 9.4.30 and Conscrypt 2.2.1 (not the most recent, bu…

…t the newest that supports < OSX Catalina)

build.gradle

@@ -48,7 +48,7 @@ allprojects {
         ],
         java8: [
             handlebars     : '4.2.0',
-            jetty          : '9.4.28.v20200408',
+            jetty          : '9.4.30.v20200611',
             guava          : '29.0-jre',
             jackson        : jacksonVersion,
             jacksonDatabind: jacksonVersion,

java8/build.gradle

@@ -4,13 +4,18 @@ shadowJar.baseName = 'wiremock-jre8-standalone'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-final jettyVersion = '9.4.20.v20190813'
+final jettyVersion = '9.4.30.v20200611'
 
 dependencies {
     compile "org.eclipse.jetty.http2:http2-server:$jettyVersion"
     compile "org.eclipse.jetty:jetty-alpn-server:$jettyVersion"
-    compile "org.eclipse.jetty:jetty-alpn-conscrypt-server:$jettyVersion"
-    compile "org.eclipse.jetty:jetty-alpn-conscrypt-client:$jettyVersion"
+    compile "org.eclipse.jetty:jetty-alpn-conscrypt-server:$jettyVersion", {
+        exclude group: 'org.conscrypt'
+    }
+    compile "org.eclipse.jetty:jetty-alpn-conscrypt-client:$jettyVersion", {
+        exclude group: 'org.conscrypt'
+    }
+    compile 'org.conscrypt:conscrypt-openjdk-uber:2.2.1'
     compile 'net.javacrumbs.json-unit:json-unit-core:2.12.0'
 
     testCompile "org.eclipse.jetty:jetty-client:$jettyVersion"

java8/src/test/resources/log4j.properties

@@ -1,9 +1,9 @@
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=INFO, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{10}:%L - %m%n
 
 log4j.logger.org.apache.http=DEBUG
-log4j.logger.org.eclipse=DEBUG
+log4j.logger.org.eclipse=INFO