diff --git a/pom.xml b/pom.xml index d3aa10021..2405335a2 100644 --- a/pom.xml +++ b/pom.xml @@ -22,28 +22,33 @@ UTF-8 - 1.9.20.1 + 35.2.0 2.3.3 - 35.1.0 - 4.4.5 - 5.3.2 - 5.9.1 + 4.5.4 + 5.4.0 + 5.10.0 6.0.2 - 2.20.0 2.0.1 + 2.13.4 + 3.25.3 + 1.9.21.1 + 2.23.0 - 3.1.0 + 3.5.0 + 1.14 + 3.2.0 3.3.1 - 3.11.0 + 3.12.1 3.1.0 - 3.5.1 + 3.5.2 3.0.1 - 3.1.2 + 3.2.5 + 1.0.1 - 1.19.1 - 3.3.0 + 1.19.6 + 3.6.0 **/models/*.java @@ -179,6 +184,12 @@ org.folio data-import-processing-core 4.2.0-SNAPSHOT + + + org.folio + domain-models-api-aspects + + org.folio @@ -216,7 +227,7 @@ org.assertj assertj-core - 3.19.0 + ${assertj-core.version} test @@ -458,7 +469,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + ${build-helper-maven-plugin.version} add_generated_sources_folder @@ -503,7 +514,7 @@ dev.aspectj aspectj-maven-plugin - 1.13.1 + ${aspectj-maven-plugin.version} true 17 @@ -586,7 +597,7 @@ com.coderplus.maven.plugins copy-rename-maven-plugin - 1.0.1 + ${copy-rename-maven-plugin.version} rename-descriptor-outputs @@ -756,7 +767,7 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + ${jackson-bom.version} pom import diff --git a/ramls/acq-models b/ramls/acq-models index 0502772fd..032bb4715 160000 --- a/ramls/acq-models +++ b/ramls/acq-models @@ -1 +1 @@ -Subproject commit 0502772fdadd941734a132501c0cfe9baab243d8 +Subproject commit 032bb4715b2911dd002c8e29d3f5a67c886d3e46 diff --git a/src/test/java/org/folio/builders/InvoiceWorkFlowDataHolderBuilderTest.java b/src/test/java/org/folio/builders/InvoiceWorkFlowDataHolderBuilderTest.java index 656a11dcc..850e58019 100644 --- a/src/test/java/org/folio/builders/InvoiceWorkFlowDataHolderBuilderTest.java +++ b/src/test/java/org/folio/builders/InvoiceWorkFlowDataHolderBuilderTest.java @@ -1,6 +1,6 @@ package org.folio.builders; -import io.vertx.core.impl.EventLoopContext; +import io.vertx.core.Context; import io.vertx.core.json.JsonObject; import org.folio.InvoiceWorkflowDataHolderBuilder; import org.folio.models.InvoiceWorkflowDataHolder; @@ -53,7 +53,7 @@ public class InvoiceWorkFlowDataHolderBuilderTest { @Mock private RestClient restClient; @Mock - private EventLoopContext ctxMock; + private Context ctxMock; private Map okapiHeaders; private List transactionIds; private final String transactionId_1 = "c5732efb-9536-4a49-a22e-1ec6ca8a7922"; diff --git a/src/test/java/org/folio/rest/impl/ApiTestBase.java b/src/test/java/org/folio/rest/impl/ApiTestBase.java index 9a55de5b8..82fca1871 100644 --- a/src/test/java/org/folio/rest/impl/ApiTestBase.java +++ b/src/test/java/org/folio/rest/impl/ApiTestBase.java @@ -535,4 +535,4 @@ public void testAllFieldsExists(JsonObject extracted, JsonObject sampleObject) { } } } -} \ No newline at end of file +} diff --git a/src/test/java/org/folio/schemas/xsd/BatchVoucherSchemaXSDTest.java b/src/test/java/org/folio/schemas/xsd/BatchVoucherSchemaXSDTest.java index c0bc1a3a7..88a1505dd 100644 --- a/src/test/java/org/folio/schemas/xsd/BatchVoucherSchemaXSDTest.java +++ b/src/test/java/org/folio/schemas/xsd/BatchVoucherSchemaXSDTest.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import javax.xml.XMLConstants; import javax.xml.bind.annotation.XmlElement; import javax.xml.transform.stream.StreamSource; diff --git a/src/test/java/org/folio/services/finance/transaction/BaseTransactionServiceTest.java b/src/test/java/org/folio/services/finance/transaction/BaseTransactionServiceTest.java index 76521e79a..6e90b41c7 100644 --- a/src/test/java/org/folio/services/finance/transaction/BaseTransactionServiceTest.java +++ b/src/test/java/org/folio/services/finance/transaction/BaseTransactionServiceTest.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; +import io.vertx.core.Context; import org.folio.rest.acq.model.finance.Transaction; import org.folio.rest.acq.model.finance.TransactionCollection; import org.folio.rest.core.RestClient; @@ -33,7 +34,6 @@ import org.mockito.internal.verification.Times; import io.restassured.http.Header; -import io.vertx.core.impl.EventLoopContext; import io.vertx.core.json.JsonObject; import io.vertx.junit5.VertxExtension; import io.vertx.junit5.VertxTestContext; @@ -41,7 +41,7 @@ @ExtendWith(VertxExtension.class) public class BaseTransactionServiceTest extends ApiTestBase { @Mock - private EventLoopContext ctxMock; + private Context ctxMock; @Mock private RestClient restClient;