summaryrefslogtreecommitdiffstats
path: root/holmes-actions
diff options
context:
space:
mode:
Diffstat (limited to 'holmes-actions')
-rw-r--r--holmes-actions/pom.xml5
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java2
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java2
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java4
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java8
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java6
8 files changed, 17 insertions, 14 deletions
diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 01c7b8c..954e0dc 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -104,7 +104,10 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>${jakarta.ws.rs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
index cf49b84..2ea606e 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/LanguageUtil.java
@@ -17,7 +17,7 @@ package org.onap.holmes.common.utils;
import org.onap.holmes.common.constant.AlarmConst;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Locale;
public class LanguageUtil {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
index 5400b20..6a4ad15 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/UserUtil.java
@@ -17,7 +17,7 @@ package org.onap.holmes.common.utils;
import org.onap.holmes.common.constant.AlarmConst;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class UserUtil {
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
index bfe67d1..70f5e2f 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/AddHeadersHttpServletRequestWrapper.java
@@ -15,8 +15,8 @@
*/
package org.onap.holmes.common.utils.transactionid;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import java.util.HashMap;
import java.util.Map;
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
index 3451b85..7c15240 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilter.java
@@ -22,10 +22,10 @@ import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
import org.springframework.stereotype.Component;
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.UUID;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
index 06759ec..2e5e6ca 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/LanguageUtilTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
index 7b452f0..8cdeabb 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/UserUtilTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Test;
import org.powermock.api.easymock.PowerMock;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java
index cfbf747..e56c6a9 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/transactionid/TransactionIdFilterTest.java
@@ -15,9 +15,9 @@
*/
package org.onap.holmes.common.utils.transactionid;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;