From 29f1c52de7139e1d65422830f015ad52557d822b Mon Sep 17 00:00:00 2001 From: Chen Dai <46505291+dai-chen@users.noreply.github.com> Date: Tue, 9 Aug 2022 11:04:00 -0700 Subject: [PATCH] Bump JDBC driver's dependency version (#735) * Bump wiremock version Signed-off-by: Chen Dai * Bump guava and json-smart version Signed-off-by: Chen Dai * Bump httpclient version Signed-off-by: Chen Dai --- sql-jdbc/build.gradle | 8 ++++++-- .../auth/aws/AWSRequestSigningApacheInterceptorTests.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 6af5e28c28..3dea2b49a7 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -45,18 +45,22 @@ repositories { } dependencies { - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6' + implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2' implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.452' testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.1') testImplementation('org.junit.jupiter:junit-jupiter-params:5.3.1') - testImplementation('com.github.tomakehurst:wiremock:2.20.0') + testImplementation('com.github.tomakehurst:wiremock:2.27.2') testImplementation('org.mockito:mockito-core:2.23.0') testImplementation('org.junit.jupiter:junit-jupiter-engine:5.3.1') testImplementation('org.junit-pioneer:junit-pioneer:0.3.0') testImplementation('org.eclipse.jetty:jetty-server:9.2.24.v20180105') + // Enforce wiremock to use latest guava and json-smart + testImplementation('com.google.guava:guava:31.1-jre') + testImplementation('net.minidev:json-smart:2.4.8') + testRuntimeOnly('org.slf4j:slf4j-simple:1.7.25') // capture WireMock logging } diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java index 2ce90ca06b..ec39e6f580 100644 --- a/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java +++ b/sql-jdbc/src/test/java/org/opensearch/jdbc/transport/http/auth/aws/AWSRequestSigningApacheInterceptorTests.java @@ -24,8 +24,8 @@ import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; public class AWSRequestSigningApacheInterceptorTests {