diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 0109e945..6c1d7e80 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,7 +3,7 @@ object Versions { const val project = "0.4.2-SNAPSHOT" const val java = 17 - const val kotlin = "1.9.10" + const val kotlin = "1.9.22" const val wrapper = "8.4" const val radarCommons = "1.1.2" @@ -14,20 +14,18 @@ object Versions { const val managementPortal = "2.0.0" // From image - const val jackson = "2.16.1" + const val jackson = "2.17.0" - const val log4j2 = "2.20.0" - const val slf4j = "2.0.9" + const val log4j2 = "2.23.1" + const val slf4j = "2.0.13" const val okhttp = "4.12.0" - const val firebaseAdmin = "9.1.0" + const val firebaseAdmin = "9.2.0" const val radarSchemas = "0.8.7-hotfix" - const val ktor = "2.3.5" + const val ktor = "2.3.10" - const val junit = "5.9.3" - const val wiremock = "2.27.2" - const val mockito = "5.3.1" - - const val kotlinVersion = "1.9.10" + const val junit = "5.10.2" + const val wiremock = "3.0.1" + const val mockito = "5.11.0" } diff --git a/kafka-connect-rest-source/src/test/java/org/radarbase/connect/rest/RestTaskTest.java b/kafka-connect-rest-source/src/test/java/org/radarbase/connect/rest/RestTaskTest.java index d4868e6a..885fedec 100644 --- a/kafka-connect-rest-source/src/test/java/org/radarbase/connect/rest/RestTaskTest.java +++ b/kafka-connect-rest-source/src/test/java/org/radarbase/connect/rest/RestTaskTest.java @@ -17,27 +17,11 @@ package org.radarbase.connect.rest; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; -import static com.github.tomakehurst.wiremock.client.WireMock.matching; -import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.resetAllRequests; -import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; -import static com.github.tomakehurst.wiremock.client.WireMock.verify; -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; -import static org.junit.jupiter.api.Assertions.assertEquals; - import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.VerificationException; import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import com.github.tomakehurst.wiremock.verification.NearMiss; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.source.SourceTaskContext; import org.apache.kafka.connect.storage.OffsetStorageReader; @@ -56,6 +40,23 @@ import org.radarbase.connect.rest.single.SingleRestSourceConnector; import org.radarbase.connect.rest.single.SingleRestSourceConnectorConfig; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; +import static com.github.tomakehurst.wiremock.client.WireMock.matching; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.resetAllRequests; +import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; +import static com.github.tomakehurst.wiremock.client.WireMock.verify; +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; +import static org.junit.jupiter.api.Assertions.assertEquals; + @ExtendWith(WireMockRule.class) public class RestTaskTest { @@ -167,7 +168,7 @@ public void afterEach(ExtensionContext context) { } } - private void checkForUnmatchedRequests() { + public void checkForUnmatchedRequests() { List unmatchedRequests = findAllUnmatchedRequests(); if (!unmatchedRequests.isEmpty()) { List nearMisses = findNearMissesForAllUnmatchedRequests();