Updated Jersey Dependencies as Suggested

Issue-ID: HOLMES-546
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: Id32d044ea5ebebacadefd537798d645a37810d7e

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 13555ba..03de7ce 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -178,6 +178,10 @@
             <artifactId>spring-web</artifactId>\r
             <version>5.3.13</version>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>jakarta.ws.rs</groupId>\r
+            <artifactId>jakarta.ws.rs-api</artifactId>\r
+        </dependency>\r
     </dependencies>\r
     <build>\r
         <resources>\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java
index c34c405..40551ab 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2020 ZTE Corporation.
+ * Copyright 2018-2022 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -23,7 +23,7 @@ import org.onap.holmes.common.utils.JerseyClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Entity;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java
index f9e2e5d..d6ba800 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQueryMdons.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 - 2021 Fujitsu Limited.
+ * Copyright 2020 - 2022 Fujitsu Limited, ZTE Corporation
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -25,9 +25,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
index b1c5595..ee041e0 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/Publisher.java
@@ -21,7 +21,7 @@ import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.utils.JerseyClient;\r
 import org.springframework.stereotype.Service;\r
 \r
-import javax.ws.rs.client.Entity;\r
+import jakarta.ws.rs.client.Entity;\r
 import java.util.concurrent.TimeUnit;\r
 \r
 @Getter\r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/ExceptionUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/ExceptionUtil.java
index 419dce5..81cc82b 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/ExceptionUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/ExceptionUtil.java
@@ -1,5 +1,5 @@
 /**\r
- * Copyright 2017 ZTE Corporation.\r
+ * Copyright 2017 - 2022 ZTE Corporation.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -15,9 +15,9 @@
  */\r
 package org.onap.holmes.common.utils;\r
 \r
-import javax.ws.rs.WebApplicationException;\r
-import javax.ws.rs.core.MediaType;\r
-import javax.ws.rs.core.Response;\r
+import jakarta.ws.rs.WebApplicationException;\r
+import jakarta.ws.rs.core.MediaType;\r
+import jakarta.ws.rs.core.Response;\r
 \r
 public class ExceptionUtil {\r
 \r

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java
index d8b5215..152f5a4 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/JerseyClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 ZTE Corporation.
+ * Copyright 2020 - 2022 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 package org.onap.holmes.common.utils;
 
+import jakarta.ws.rs.client.*;
+import jakarta.ws.rs.core.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import javax.ws.rs.client.*;
-import javax.ws.rs.core.Response;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
index 957b818..21136a8 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/MsbRegister.java
@@ -26,8 +26,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 import java.util.concurrent.TimeUnit;
 
 import static org.onap.holmes.common.utils.JerseyClient.PROTOCOL_HTTP;

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java
index f70cf68..e32efaf 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/RestExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 ZTE Corporation.
+ * Copyright 2021 - 2022 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.WebApplicationException;
 
 @RestControllerAdvice
 public class RestExceptionHandler {

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java
index 346fe37..9b9d75c 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn2Test.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.holmes.common.aai
  * ================================================================================
- * Copyright (C) 2018-2021 Huawei, ZTE. All rights reserved.
+ * Copyright (C) 2018-2022 Huawei, ZTE. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ package org.onap.holmes.common.aai;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import jakarta.ws.rs.core.Response;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
@@ -36,7 +37,6 @@ import org.powermock.core.classloader.annotations.SuppressStaticInitializationFo
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
-import javax.ws.rs.core.Response;
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
index 09dce8e..9ba284f 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 - 2021 Fujitsu, ZTE Limited.
+ * Copyright 2020 - 2022 Fujitsu Limited, ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -16,6 +16,9 @@ package org.onap.holmes.common.aai;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import org.easymock.EasyMock;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
@@ -29,9 +32,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java
index 8ad154d..20eab12 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java
@@ -26,7 +26,7 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.internal.WhiteboxImpl;
 
-import javax.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Entity;
 
 import static org.easymock.EasyMock.anyObject;
 

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java
index ef4b3db..cade5f5 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 - 2021 ZTE Corporation.
+ * Copyright 2020 - 2022 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,20 @@
 
 package org.onap.holmes.common.utils;
 
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.easymock.EasyMock;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.onap.holmes.common.exception.HttpException;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.internal.WhiteboxImpl;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java
index 828fe0c..073fcc7 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MsbRegisterTest.java
@@ -28,8 +28,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.expect;

diff --git a/pom.xml b/pom.xml
index d933a5e..99283fa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,8 @@
         <dropwizard.version>2.0.9</dropwizard.version>\r
         <swagger.version>1.6.4</swagger.version>\r
         <lombok.version>1.18.4</lombok.version>\r
-        <jersey.version>2.31</jersey.version>\r
+        <jersey.version>3.0.5</jersey.version>\r
+        <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>\r
         <slf4j.version>1.7.25</slf4j.version>\r
         <jacoco.version>0.8.5</jacoco.version>\r
         <jackson.version>2.13.3</jackson.version>\r
@@ -212,6 +213,11 @@
                 <artifactId>gson</artifactId>\r
                 <version>2.8.9</version>\r
             </dependency>\r
+            <dependency>\r
+                <groupId>jakarta.ws.rs</groupId>\r
+                <artifactId>jakarta.ws.rs-api</artifactId>\r
+                <version>${jakarta.ws.rs.version}</version>\r
+            </dependency>\r
         </dependencies>\r
     </dependencyManagement>\r
 \r