[MODFIN-362] Upgrade RAML Module Builder

folio-org · Mar 11, 2024 · 5cecaae · 5cecaae
1 parent 84becec
commit 5cecaae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,7 @@
     <java.version>17</java.version>
     <spring.version>6.0.2</spring.version>
     <ramlfiles_path>${basedir}/ramls</ramlfiles_path>
+    <raml-module-builder.version>35.2.0</raml-module-builder.version>
     <sonar.exclusions>**/models/*.java</sonar.exclusions>
     <sonar.test.exclusions>**/*Test.java</sonar.test.exclusions>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -41,30 +42,29 @@
     <jsonschema_paths>acq-models/mod-finance/schemas,raml-util/schemas,acq-models/common/schemas</jsonschema_paths>
 
     <!--Dependency Management Properties-->
-    <vertx.version>4.4.6</vertx.version>
+    <vertx.version>4.5.4</vertx.version>
     <junit.jupiter.version>5.10.0</junit.jupiter.version>
-    <log4j.version>2.20.0</log4j.version>
+    <log4j.version>2.23.0</log4j.version>
 
     <!--Dependency properties-->
     <mockito.version>5.1.1</mockito.version>
-    <aspectj.version>1.9.20.1</aspectj.version>
-    <rest-assured.version>5.3.2</rest-assured.version>
+    <aspectj.version>1.9.21.1</aspectj.version>
+    <rest-assured.version>5.4.0</rest-assured.version>
     <folio-di-support.version>2.0.1</folio-di-support.version>
-    <raml-module-builder.version>35.1.1</raml-module-builder.version>
     <mod-configuration-client.version>5.9.2</mod-configuration-client.version>
 
     <!--Maven plugin properties-->
-    <aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
-    <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+    <aspectj-maven-plugin.version>1.14</aspectj-maven-plugin.version>
+    <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
     <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-    <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
+    <maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
     <properties-maven-plugin.version>1.2.0</properties-maven-plugin.version>
     <jsonschema2pojo-maven-plugin.version>1.0.2</jsonschema2pojo-maven-plugin.version>
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-    <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-    <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+    <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+    <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
     <copy-rename-maven-plugin.version>1.0.1</copy-rename-maven-plugin.version>
 
     <argLine />

diff --git a/ramls/acq-models b/ramls/acq-models
diff --git a/src/test/java/org/folio/services/budget/BudgetExpenseClassServiceTest.java b/src/test/java/org/folio/services/budget/BudgetExpenseClassServiceTest.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.UUID;
 
+import io.vertx.core.Context;
 import org.folio.rest.core.RestClient;
 import org.folio.rest.core.models.RequestContext;
 import org.folio.rest.exception.HttpException;
@@ -54,7 +55,6 @@
 
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
-import io.vertx.core.impl.EventLoopContext;
 import io.vertx.junit5.VertxExtension;
 import io.vertx.junit5.VertxTestContext;
 
@@ -118,7 +118,7 @@ void testCreateBudgetWithExpenseClasses(VertxTestContext vertxTestContext) {
 
     sharedBudget.withStatusExpenseClasses(Arrays.asList(expenseClass1, expenseClass2));
 
-    when(requestContextMock.context()).thenReturn(mock(EventLoopContext.class));
+    when(requestContextMock.context()).thenReturn(mock(Context.class));
     when(restClient.post(anyString(), any(), eq(BudgetExpenseClass.class), eq(requestContextMock))).thenReturn(succeededFuture(new BudgetExpenseClass()));
 
     var future = budgetExpenseClassService.createBudgetExpenseClasses(sharedBudget, requestContextMock);

diff --git a/src/test/java/org/folio/services/fund/FundCodeExpenseClassesServiceTest.java b/src/test/java/org/folio/services/fund/FundCodeExpenseClassesServiceTest.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import io.vertx.core.Context;
 import org.apache.commons.lang.StringUtils;
 import org.folio.rest.core.models.RequestContext;
 import org.folio.rest.jaxrs.model.Budget;
@@ -43,7 +44,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import io.vertx.core.impl.EventLoopContext;
 import io.vertx.junit5.VertxExtension;
 import io.vertx.junit5.VertxTestContext;
 
@@ -76,7 +76,7 @@ public class FundCodeExpenseClassesServiceTest {
 
   private RequestContext requestContext;
   @Mock
-  private EventLoopContext context;
+  private Context context;
 
   @BeforeEach
   public void initMocks() {