Use jakarta.ws.rs instead of javax.ws.rs

Evolveum · May 22, 2023 · d4fd390 · d4fd390
1 parent c0830d1
commit d4fd390
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 37 deletions.
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
@@ -95,8 +95,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointAbstractProvider.java b/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointAbstractProvider.java
@@ -19,11 +19,11 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.common.LocalizationService;

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointJsonProvider.java b/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointJsonProvider.java
@@ -9,9 +9,9 @@
 
 import java.io.InputStream;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.ext.Provider;
 
 import com.evolveum.midpoint.prism.PrismParser;
 import com.evolveum.midpoint.prism.PrismSerializer;

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointXmlProvider.java b/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointXmlProvider.java
@@ -9,9 +9,9 @@
 
 import java.io.InputStream;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.ext.Provider;
 
 import com.evolveum.midpoint.prism.PrismParser;
 import com.evolveum.midpoint.prism.PrismSerializer;

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointYamlProvider.java b/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointYamlProvider.java
@@ -9,9 +9,9 @@
 
 import java.io.InputStream;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.ext.Provider;
 
 import com.evolveum.midpoint.prism.PrismParser;
 import com.evolveum.midpoint.prism.PrismSerializer;

diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
@@ -105,6 +105,17 @@
             <artifactId>admin-gui</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.wicket</groupId>
+                    <artifactId>wicket-commons-fileupload</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+         <groupId>org.apache.wicket</groupId>
+                    <artifactId>wicket-commons-fileupload</artifactId>
+                    <version>${wicket.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -281,8 +292,8 @@
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...rest/src/test/java/com/evolveum/midpoint/testing/rest/AbstractRestServiceInitializer.java b/...rest/src/test/java/com/evolveum/midpoint/testing/rest/AbstractRestServiceInitializer.java
@@ -35,7 +35,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.util.Collections;
 

diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
@@ -12,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import jakarta.xml.bind.JAXBElement;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;

diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceJson.java
@@ -8,7 +8,7 @@
 package com.evolveum.midpoint.testing.rest;
 
 import java.io.File;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import com.evolveum.midpoint.common.rest.MidpointAbstractProvider;
 

diff --git a/.../src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java b/.../src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java
@@ -9,8 +9,8 @@
 import static org.testng.AssertJUnit.assertNotNull;
 
 import java.io.File;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.jaxrs.client.WebClient;

diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceXml.java
@@ -8,7 +8,7 @@
 package com.evolveum.midpoint.testing.rest;
 
 import java.io.File;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import com.evolveum.midpoint.common.rest.MidpointAbstractProvider;
 

diff --git a/...c/test/java/com/evolveum/midpoint/testing/rest/TestRestWithoutAuditingLoginAndLogout.java b/...c/test/java/com/evolveum/midpoint/testing/rest/TestRestWithoutAuditingLoginAndLogout.java
@@ -21,8 +21,8 @@
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import static org.testng.AssertJUnit.assertNotNull;
 

diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestSchemaRestService.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestSchemaRestService.java
@@ -12,8 +12,8 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.cxf.jaxrs.client.ClientConfiguration;

diff --git a/...c/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java b/...c/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java
@@ -13,8 +13,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.common.util.Base64Exception;

diff --git a/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractAuthentication.java b/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractAuthentication.java
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.AfterMethod;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 import java.io.File;
 import java.io.IOException;
 

diff --git a/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractOidcRestModule.java b/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractOidcRestModule.java
@@ -16,7 +16,7 @@
 import org.keycloak.representations.AccessTokenResponse;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 
 import static org.testng.AssertJUnit.assertNotNull;

diff --git a/.../java/com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByHMacModule.java b/.../java/com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByHMacModule.java
@@ -21,8 +21,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.io.FileInputStream;
 

diff --git a/.../com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByPublicKeyModule.java b/.../com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByPublicKeyModule.java
@@ -20,8 +20,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.io.FileInputStream;
 

diff --git a/...veum/midpoint/testing/rest/authentication/TestOptionForSkipUpdatingAuthFocusBehavior.java b/...veum/midpoint/testing/rest/authentication/TestOptionForSkipUpdatingAuthFocusBehavior.java
@@ -14,7 +14,7 @@
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.util.Optional;