From d8a3c165d42a131192468de939595152fff6223c Mon Sep 17 00:00:00 2001 From: Jae Kim Date: Fri, 11 Feb 2022 11:51:01 -0800 Subject: [PATCH 1/2] upgrade jacoco to support Java 11 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e0e14fa9d..4c167014f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ allprojects { } jacoco { - toolVersion = '0.8.0' + toolVersion = '0.8.7' } } From 7e7262ad9919ce319d3d9c25a2ab110f318c2c5d Mon Sep 17 00:00:00 2001 From: Jae Kim Date: Mon, 14 Feb 2022 14:40:59 -0800 Subject: [PATCH 2/2] fix travis missing httpclient-impl tests --- core-httpclient-impl/build.gradle | 4 ++++ .../test/java/com/optimizely/ab/OptimizelyHttpClientTest.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/core-httpclient-impl/build.gradle b/core-httpclient-impl/build.gradle index 7e452d36e..b43c70269 100644 --- a/core-httpclient-impl/build.gradle +++ b/core-httpclient-impl/build.gradle @@ -5,3 +5,7 @@ dependencies { compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion } + +task exhaustiveTest { + dependsOn('test') +} diff --git a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java index 7dc61f0f9..4667bec34 100644 --- a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java +++ b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java @@ -40,6 +40,8 @@ public class OptimizelyHttpClientTest { @Before public void setUp() { System.setProperty("https.proxyHost", "localhost"); + // default port (80) returns 404 instead of HttpHostConnectException + System.setProperty("https.proxyPort", "12345"); } @After