From 61283ad8c9bb91665ed4514863d32906b8c84b31 Mon Sep 17 00:00:00 2001
From: Gurleen Kaur <34331959+gurleenkaurbp@users.noreply.github.com>
Date: Thu, 14 Mar 2024 19:30:58 +0530
Subject: [PATCH] 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.
---
pom.xml | 70 ++++++++++++++-----
.../rest/client/impl/AuthTokenClientImpl.java | 3 +-
.../CirculationStorageModuleClientImpl.java | 3 +-
.../client/impl/ConfigurationClientImpl.java | 3 +-
.../impl/FeesFinesModuleClientImpl.java | 2 +-
.../client/impl/NotificationClientImpl.java | 5 +-
.../impl/PasswordResetActionClientImpl.java | 2 +-
.../client/impl/UserModuleClientImpl.java | 2 +-
.../org/folio/rest/util/ExceptionHelper.java | 15 ++--
.../consortia/CrossTenantUserServiceImpl.java | 2 +-
10 files changed, 74 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7fea6dc7..880bb676 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,16 +45,23 @@
UTF-8
UTF-8
- 35.0.2
- 5.7.6
+ 35.2.0
+ 5.10.0
${basedir}/ramls
- 4.3.4
+ 4.5.4
17
- 1.9.19
+ 1.9.21.1
+
+ org.apache.logging.log4j
+ log4j-bom
+ 2.23.0
+ pom
+ import
+
io.vertx
vertx-stack-depchain
@@ -62,6 +69,13 @@
pom
import
+
+ org.junit
+ junit-bom
+ 5.10.2
+ pom
+ import
+
@@ -86,25 +100,32 @@
3.5
- commons-codec
- commons-codec
- 1.10
+ commons-codec
+ commons-codec
+ 1.16.1
- javax.xml.ws
- jaxws-api
- 2.3.1
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
- org.apache.httpcomponents
- httpcore
- 4.4.6
+ org.apache.httpcomponents.core5
+ httpcore5
+ 5.2.4
jar
+
io.rest-assured
rest-assured
- 3.0.7
+ 5.4.0
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-api
test
@@ -113,15 +134,30 @@
4.13.2
test
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
io.vertx
vertx-unit
test
+
+ io.vertx
+ vertx-junit5
+ test
+
org.folio.okapi
okapi-testing
- 4.14.1
+ 5.3.0
test
@@ -131,9 +167,9 @@
- com.github.tomakehurst
+ org.wiremock
wiremock
- 2.27.2
+ 3.4.1
net.sf.jopt-simple
diff --git a/src/main/java/org/folio/rest/client/impl/AuthTokenClientImpl.java b/src/main/java/org/folio/rest/client/impl/AuthTokenClientImpl.java
index 75353ea5..5d29460a 100644
--- 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
index e2cdfd32..34b0c630 100644
--- 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
index aead6abd..ecbb8d76 100644
--- 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
index 6d8dd79c..bd0d1884 100644
--- 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
index 43d8e721..e2221036 100644
--- 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
index d326855c..c6b3cc8d 100644
--- 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
index 1fa1d7ce..2b93b12f 100644
--- 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
index 2e13e296..52a2c54d 100644
--- 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
index 5df50a7c..8c9c9d19 100644
--- 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;