MODEUR-164 Upgrade to Vert.x 5, vertx lib 4, okapi 7 (#203)

* MODEUR-164 Upgrade to Vert.x 5, vertx lib 4, okapi 7

* Update pom.xml

Co-authored-by: Adam Dickmeiss <adam@indexdata.dk>

---------

Co-authored-by: Adam Dickmeiss <adam@indexdata.dk>

Author: nielserik

pom.xml

@@ -32,12 +32,12 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <okapi.version>6.2.1</okapi.version>
-    <vertx-lib.version>3.4.0</vertx-lib.version>
-    <vertx.version>4.5.13</vertx.version>
-    <log4j.version>2.24.3</log4j.version>
+    <okapi.version>7.0.1</okapi.version>
+    <vertx-lib.version>4.1.1</vertx-lib.version>
+    <vertx.version>5.0.8</vertx.version>
+    <log4j.version>2.25.3</log4j.version>
+    <exec.mainClass>org.folio.eusage.reports.MainVerticle</exec.mainClass>
   </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -101,19 +101,19 @@
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-web</artifactId>
+      <artifactId>vertx-launcher-application</artifactId>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-web-openapi</artifactId>
+      <artifactId>vertx-web</artifactId>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-rx-java2</artifactId>
+      <artifactId>vertx-web-openapi-router</artifactId>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-web-api-contract</artifactId>
+      <artifactId>vertx-rx-java2</artifactId>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
@@ -190,7 +190,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.16.0</version>
+      <version>5.23.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -216,8 +216,8 @@
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <manifestEntries>
-                    <Main-Class>io.vertx.core.Launcher</Main-Class>
-                    <Main-Verticle>org.folio.eusage.reports.MainVerticle</Main-Verticle>
+                    <Main-Class>io.vertx.launcher.application.VertxApplication</Main-Class>
+                    <Main-Verticle>${exec.mainClass}</Main-Verticle>
                     <Multi-Release>true</Multi-Release>
                   </manifestEntries>
                 </transformer>

src/main/java/org/folio/eusage/reports/api/CostPerUse.java

@@ -134,7 +134,7 @@ static JsonObject titlesToJsonObject(RowSet<Row> rowSet, Periods usePeriods) {
         item = new JsonObject();
         totalItems.put(itemKey, item);
         items.add(item);
-        item.put("kbId", kbId)
+        item.put("kbId", kbId.toString())
             .put("title", row.getString("title"))
             .put("derivedTitle", kbPackageId != null);
         String printIssn = row.getString("printissn");

src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java

@@ -46,7 +46,7 @@ private static JsonObject createItem(Row row, String accessType, String metricTy
       accessCountsByPeriods.add(0L);
     }
     JsonObject o = new JsonObject()
-        .put("kbId", row.getUUID("kbid"))
+        .put("kbId", row.getUUID("kbid").toString())
         .put("title", row.getString("title"));
     String v = row.getString("printissn");
     if (v != null) {

src/main/java/org/folio/eusage/reports/api/UseOverTime.java

@@ -1,18 +1,14 @@
-status = error
-name = PropertiesConfig
-
-filters = threshold
-
-filter.threshold.type = ThresholdFilter
-filter.threshold.level = info
-
-appenders = console
-
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-20.20C{1} %m%n
-
-rootLogger.level = info
-rootLogger.appenderRefs = info
-rootLogger.appenderRef.stdout.ref = STDOUT
+status=error
+name=PropertiesConfig
+packages=org.folio.okapi.common.logging
+filters=threshold
+filter.threshold.type=ThresholdFilter
+filter.threshold.level=info
+appenders=console
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{HH:mm:ss} [$${FolioLoggingContext:requestId}] [$${FolioLoggingContext:tenantId}] [$${FolioLoggingContext:userId}] [$${FolioLoggingContext:moduleId}] %-5p %-20.20C{1} %m%n
+rootLogger.level=info
+rootLogger.appenderRefs=info
+rootLogger.appenderRef.stdout.ref=STDOUT