MODUSERBL-187 - Update rmb and vertex version. (#176)

* MODUSERBL-187 - Update rmb and vertex version. * MODUSERBL-187 - Update rmb and vertex version. * MODUSERBL-187 - Update rmb and vertex version. * MODUSERBL-187 - Update rmb and vertex version.
folio-org · Mar 14, 2024 · 61283ad · 61283ad
1 parent 0754e1a
commit 61283ad
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,23 +45,37 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <raml-module-builder.version>35.0.2</raml-module-builder.version>
-    <mod-configuration-client.version>5.7.6</mod-configuration-client.version>
+    <raml-module-builder.version>35.2.0</raml-module-builder.version>
+    <mod-configuration-client.version>5.10.0</mod-configuration-client.version>
     <ramlfiles_path>${basedir}/ramls</ramlfiles_path>
-    <vertx-version>4.3.4</vertx-version>
+    <vertx-version>4.5.4</vertx-version>
     <java.version>17</java.version>
-    <aspectj.version>1.9.19</aspectj.version>
+    <aspectj.version>1.9.21.1</aspectj.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-bom</artifactId>
+        <version>2.23.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.vertx</groupId>
         <artifactId>vertx-stack-depchain</artifactId>
         <version>${vertx-version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.10.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -86,25 +100,32 @@
       <version>3.5</version>
     </dependency>
     <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.10</version>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.16.1</version>
     </dependency>
     <dependency>
-        <groupId>javax.xml.ws</groupId>
-        <artifactId>jaxws-api</artifactId>
-        <version>2.3.1</version>
+      <groupId>javax.xml.ws</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <version>2.3.1</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5 -->
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.4.6</version>
+      <groupId>org.apache.httpcomponents.core5</groupId>
+      <artifactId>httpcore5</artifactId>
+      <version>5.2.4</version>
       <type>jar</type>
     </dependency>
+
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
-      <version>3.0.7</version>
+      <version>5.4.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -113,15 +134,30 @@
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-unit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.folio.okapi</groupId>
       <artifactId>okapi-testing</artifactId>
-      <version>4.14.1</version>
+      <version>5.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -131,9 +167,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
+      <groupId>org.wiremock</groupId>
       <artifactId>wiremock</artifactId>
-      <version>2.27.2</version>
+      <version>3.4.1</version>
       <exclusions>
         <exclusion>
           <groupId>net.sf.jopt-simple</groupId>

diff --git a/src/main/java/org/folio/rest/client/impl/AuthTokenClientImpl.java b/src/main/java/org/folio/rest/client/impl/AuthTokenClientImpl.java
@@ -4,7 +4,8 @@
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
-import org.apache.http.HttpStatus;
+
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.AuthTokenClient;
 import org.folio.rest.exception.TokenNotFoundException;
 import org.folio.rest.exception.OkapiModuleClientException;

diff --git a/src/main/java/org/folio/rest/client/impl/CirculationStorageModuleClientImpl.java b/src/main/java/org/folio/rest/client/impl/CirculationStorageModuleClientImpl.java
@@ -4,7 +4,8 @@
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpMethod;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpStatus;
+
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.CirculationStorageModuleClient;
 import org.folio.rest.exception.OkapiModuleClientException;
 import org.folio.rest.util.OkapiConnectionParams;

diff --git a/src/main/java/org/folio/rest/client/impl/ConfigurationClientImpl.java b/src/main/java/org/folio/rest/client/impl/ConfigurationClientImpl.java
@@ -3,7 +3,8 @@
 import io.vertx.core.Future;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpMethod;
-import org.apache.http.HttpStatus;
+
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.ConfigurationClient;
 import org.folio.rest.exception.OkapiModuleClientException;
 import org.folio.rest.jaxrs.model.Config;

diff --git a/src/main/java/org/folio/rest/client/impl/FeesFinesModuleClientImpl.java b/src/main/java/org/folio/rest/client/impl/FeesFinesModuleClientImpl.java
@@ -4,7 +4,7 @@
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpMethod;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.FeesFinesModuleClient;
 import org.folio.rest.exception.OkapiModuleClientException;
 import org.folio.rest.util.OkapiConnectionParams;

diff --git a/src/main/java/org/folio/rest/client/impl/NotificationClientImpl.java b/src/main/java/org/folio/rest/client/impl/NotificationClientImpl.java
@@ -1,6 +1,7 @@
 package org.folio.rest.client.impl;
 
-import org.apache.http.HttpStatus;
+
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.NotificationClient;
 import org.folio.rest.jaxrs.model.Notification;
 import org.folio.rest.util.OkapiConnectionParams;
@@ -15,7 +16,7 @@
 
 public class NotificationClientImpl implements NotificationClient {
 
-  private static final Logger LOG = LogManager.getLogger(NotificationClientImpl.class); 
+  private static final Logger LOG = LogManager.getLogger(NotificationClientImpl.class);
   private HttpClient httpClient;
 
   public NotificationClientImpl(HttpClient httpClient) {

diff --git a/src/main/java/org/folio/rest/client/impl/PasswordResetActionClientImpl.java b/src/main/java/org/folio/rest/client/impl/PasswordResetActionClientImpl.java
@@ -6,7 +6,7 @@
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.PasswordResetActionClient;
 import org.folio.rest.exception.OkapiModuleClientException;
 import org.folio.rest.impl.BLUsersAPI;

diff --git a/src/main/java/org/folio/rest/client/impl/UserModuleClientImpl.java b/src/main/java/org/folio/rest/client/impl/UserModuleClientImpl.java
@@ -6,7 +6,7 @@
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.folio.rest.client.UserModuleClient;
 import org.folio.rest.exception.OkapiModuleClientException;
 import org.folio.rest.jaxrs.model.User;

diff --git a/src/main/java/org/folio/rest/util/ExceptionHelper.java b/src/main/java/org/folio/rest/util/ExceptionHelper.java
@@ -1,19 +1,20 @@
 package org.folio.rest.util;
 
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.hc.core5.http.HttpStatus;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.http.HttpStatus;
 import org.folio.rest.exception.TokenNotFoundException;
 import org.folio.rest.exception.UnprocessableEntityException;
 import org.folio.rest.jaxrs.model.Error;
 import org.folio.rest.jaxrs.model.Errors;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.stream.Collectors;
-
 public final class ExceptionHelper {
 
   private static final Logger LOG = LogManager.getLogger(ExceptionHelper.class);

diff --git a/src/main/java/org/folio/service/consortia/CrossTenantUserServiceImpl.java b/src/main/java/org/folio/service/consortia/CrossTenantUserServiceImpl.java
@@ -5,7 +5,7 @@
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.folio.okapi.common.XOkapiHeaders;