[MODINVOICE-531] Upgrade RAML Module Builder (#475)

* [MODINVOICE-531] Upgrade RAML Module Builder * Update configuration client * Remove leftover code changes * [MODINVOICE-531] Upgrade RAML Module Builder
folio-org · Mar 15, 2024 · 003ee98 · 003ee98
1 parent 7eee8a0
commit 003ee98
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,28 +22,33 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!--Dependencies-->
-    <aspectj.version>1.9.20.1</aspectj.version>
+    <raml-module-builder.version>35.2.0</raml-module-builder.version>
     <jaxb-api.version>2.3.3</jaxb-api.version>
-    <raml-module-builder.version>35.1.0</raml-module-builder.version>
-    <vertx.version>4.4.5</vertx.version>
-    <rest-assured.version>5.3.2</rest-assured.version>
-    <mod-configuration-client.version>5.9.1</mod-configuration-client.version>
+    <vertx.version>4.5.4</vertx.version>
+    <rest-assured.version>5.4.0</rest-assured.version>
+    <mod-configuration-client.version>5.10.0</mod-configuration-client.version>
     <spring.version>6.0.2</spring.version>
-    <log4j.version>2.20.0</log4j.version>
     <folio-di-support.version>2.0.1</folio-di-support.version>
+    <jackson-bom.version>2.13.4</jackson-bom.version>
+    <assertj-core.version>3.25.3</assertj-core.version>
+    <aspectj.version>1.9.21.1</aspectj.version>
+    <log4j.version>2.23.0</log4j.version>
 
     <!--Maven plugin dependencies-->
-    <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+    <build-helper-maven-plugin.version>3.5.0</build-helper-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>
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-    <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+    <copy-rename-maven-plugin.version>1.0.1</copy-rename-maven-plugin.version>
 
     <!--Test dependencies-->
-    <testcontainers.version>1.19.1</testcontainers.version>
-    <kafka-junit.version>3.3.0</kafka-junit.version>
+    <testcontainers.version>1.19.6</testcontainers.version>
+    <kafka-junit.version>3.6.0</kafka-junit.version>
 
     <!--Sonar exclusions-->
     <sonar.exclusions>**/models/*.java</sonar.exclusions>
@@ -179,6 +184,12 @@
       <groupId>org.folio</groupId>
       <artifactId>data-import-processing-core</artifactId>
       <version>4.2.0-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.folio</groupId>
+          <artifactId>domain-models-api-aspects</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.folio</groupId>
@@ -216,7 +227,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.19.0</version>
+      <version>${assertj-core.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -458,7 +469,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>${build-helper-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>add_generated_sources_folder</id>
@@ -503,7 +514,7 @@
       <plugin>
         <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.13.1</version>
+        <version>${aspectj-maven-plugin.version}</version>
         <configuration>
           <verbose>true</verbose>
           <release>17</release>
@@ -586,7 +597,7 @@
       <plugin>
         <groupId>com.coderplus.maven.plugins</groupId>
         <artifactId>copy-rename-maven-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>${copy-rename-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>rename-descriptor-outputs</id>
@@ -756,7 +767,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.13.4</version>
+        <version>${jackson-bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/ramls/acq-models b/ramls/acq-models
diff --git 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<String, String> okapiHeaders;
   private List<String> 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
@@ -535,4 +535,4 @@ public void testAllFieldsExists(JsonObject extracted, JsonObject sampleObject) {
       }
     }
   }
-}
+}
diff --git 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
@@ -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,15 +34,14 @@
 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;
 
 @ExtendWith(VertxExtension.class)
 public class BaseTransactionServiceTest extends ApiTestBase {
   @Mock
-  private EventLoopContext ctxMock;
+  private Context ctxMock;
   @Mock
   private RestClient restClient;
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         }
       }
-    }
+    }