diff --git a/NEWS.md b/NEWS.md index f67c2b23c9..a705f03692 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ * Handling of patron notices for closed loans ([CIRC-1891](https://folio-org.atlassian.net/browse/CIRC-1891)) * Render item's loan type in requests responses ([CIRC-2441](https://folio-org.atlassian.net/browse/CIRC-2441)) * Switch DCB user check from lastName to the user type ([CIRC-2482](https://folio-org.atlassian.net/browse/CIRC-2482)) +* Upgrade wiremock from 2.35.0 to 3.13.2 fixing CVE-2023-41329 ([CIRC-2543](https://folio-org.atlassian.net/browse/CIRC-2543)) ## 24.4.0 2025-03-12 * Patron notices for the trigger “Item recalled” not sent if the item is not 1st in the title request queue (CIRC-2168) diff --git a/pom.xml b/pom.xml index 68ed826f8a..3099ec59e6 100644 --- a/pom.xml +++ b/pom.xml @@ -212,9 +212,9 @@ - com.github.tomakehurst - wiremock-jre8 - 2.35.0 + org.wiremock + wiremock + 3.13.2 test @@ -500,6 +500,11 @@ maven-surefire-plugin 3.0.0-M5 + + org.apache.maven.plugins + maven-failsafe-plugin + 3.5.4 + org.apache.maven.plugins maven-release-plugin diff --git a/src/test/java/api/DroolsIT.java b/src/test/java/api/DroolsIT.java index 65bf6959cf..10d42d6e3b 100644 --- a/src/test/java/api/DroolsIT.java +++ b/src/test/java/api/DroolsIT.java @@ -26,7 +26,6 @@ import com.github.tomakehurst.wiremock.client.MappingBuilder; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; -import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer; import com.github.tomakehurst.wiremock.junit5.WireMockExtension; import com.github.tomakehurst.wiremock.stubbing.StubMapping; @@ -57,7 +56,7 @@ class DroolsIT { @RegisterExtension private static WireMockExtension OKAPI = WireMockExtension.newInstance() .options(WireMockConfiguration.wireMockConfig().dynamicPort() - .extensions(new ResponseTemplateTransformer(true))).build(); + .globalTemplating(true)).build(); @Container private static final GenericContainer MOD_CIRCULATION = @@ -101,7 +100,7 @@ void checkOutByBarcode() { stub("/holdings-storage/holdings/.*", "{'instanceId':'a02b6833-1fd6-441a-bfda-5249d2d56f66'}"); stub("/instance-storage/instances/.*", "{}"); stub("/loan-storage/loans\\?.*", "{'loans':[]}"); - stub("/configurations/entries\\?.*", "{'configs':[]}"); + stub("/circulation-settings-storage/.*", "{'circulationSettings':[]}"); stub("/request-storage/requests\\?.*", "{'requests':[]}"); stub("/locations/.*", "{'id':'24be82a3-f7f0-490d-9598-473faa0f47ac', " + "'primaryServicePoint':'54ca624a-d37f-4e16-b274-7284ce2ecbd8'}");