Migrate to Jakarta EE 10

bom/pom.xml

@@ -90,19 +90,6 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <!-- Client-->
-            <dependency>
-                <groupId>de.cuioss.portal.client</groupId>
-                <artifactId>portal-client-tracing</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>de.cuioss.portal.client</groupId>
-                <artifactId>portal-tracing-reporter-zipkin</artifactId>
-                <version>${project.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <!-- Test-->
             <dependency>
                 <groupId>de.cuioss.portal.test</groupId>

modules/authentication/portal-authentication-api/pom.xml

@@ -19,6 +19,10 @@
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/PortalLoginEvent.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Defines events that will be fired at login attempt. The payload is

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/PortalUser.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Marker identifying concrete instances of {@link AuthenticatedUserInfo}.

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/PortalUserEnricher.java

@@ -17,7 +17,7 @@
 
 import java.util.function.Function;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.facade.AuthenticationFacade;
 import de.cuioss.portal.common.priority.PortalPriorities;

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/UserChangeEvent.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Defines events that will be fired on changes on user-credentials. The payload

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/facade/AuthenticationFacade.java

@@ -15,7 +15,7 @@
  */
 package de.cuioss.portal.authentication.facade;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/facade/BaseAuthenticationFacade.java

@@ -19,8 +19,8 @@
 
 import java.util.List;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import de.cuioss.portal.authentication.PortalUserEnricher;

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/facade/FormBasedAuthenticationFacade.java

@@ -17,7 +17,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import de.cuioss.portal.authentication.model.UserStore;

modules/authentication/portal-authentication-api/src/main/java/de/cuioss/portal/authentication/facade/PortalAuthenticationFacade.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * Defines Instances of {@link AuthenticationFacade}

modules/authentication/portal-authentication-api/src/main/resources/META-INF/beans.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans bean-discovery-mode="annotated" version="1.1"
-	xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd">
+<beans bean-discovery-mode="annotated" version="4.0"
+	xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd">
 </beans>

modules/authentication/portal-authentication-api/src/test/java/de/cuioss/portal/authentication/ModuleConsistencyTest.java

@@ -20,7 +20,7 @@
 
 import java.nio.file.Paths;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.jboss.weld.environment.se.Weld;
 import org.junit.jupiter.api.Test;

modules/authentication/portal-authentication-api/src/test/java/de/cuioss/portal/authentication/facade/BaseAuthenticationFacadeTest.java

@@ -17,7 +17,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jboss.weld.junit5.auto.AddBeanClasses;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;

modules/authentication/portal-authentication-api/src/test/java/de/cuioss/portal/authentication/facade/MockBaseAuthenticationFacade.java

@@ -15,7 +15,7 @@
  */
 package de.cuioss.portal.authentication.facade;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import lombok.Setter;

modules/authentication/portal-authentication-api/src/test/java/de/cuioss/portal/authentication/facade/MockPortalUserEnricher.java

@@ -15,10 +15,9 @@
  */
 package de.cuioss.portal.authentication.facade;
 
-import javax.annotation.Priority;
-
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import de.cuioss.portal.authentication.PortalUserEnricher;
+import jakarta.annotation.Priority;
 
 @Priority(200)
 class MockPortalUserEnricher implements PortalUserEnricher {

modules/authentication/portal-authentication-dummy/pom.xml

@@ -25,6 +25,10 @@
       <groupId>de.cuioss.portal.test</groupId>
       <artifactId>portal-core-unit-testing</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>

modules/authentication/portal-authentication-dummy/src/main/java/de/cuioss/portal/authentication/dummy/DummyAuthenticationFacade.java

@@ -18,8 +18,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import de.cuioss.portal.authentication.facade.AuthenticationFacade;

modules/authentication/portal-authentication-dummy/src/main/resources/META-INF/beans.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<beans bean-discovery-mode="annotated" version="2.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans bean-discovery-mode="annotated" version="4.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd" />
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" />

modules/authentication/portal-authentication-dummy/src/test/java/de/cuioss/portal/authentication/dummy/DummyAuthenticationFacadeTest.java

@@ -20,8 +20,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.easymock.EasyMock;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;

modules/authentication/portal-authentication-mock/pom.xml

@@ -33,5 +33,9 @@
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+    </dependency>
     </dependencies>
 </project>

modules/authentication/portal-authentication-mock/src/main/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacade.java

@@ -20,11 +20,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 

modules/authentication/portal-authentication-mock/src/main/resources/META-INF/beans.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-    version="2.0" bean-discovery-mode="annotated">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    version="4.0" bean-discovery-mode="annotated">
 
 </beans>

modules/authentication/portal-authentication-mock/src/test/java/de/cuioss/portal/authentication/mock/MockAuthenticationFacadeTest.java

@@ -21,7 +21,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;

modules/authentication/portal-authentication-oauth/pom.xml

@@ -33,6 +33,14 @@
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>de.cuioss.portal.mirco-profile</groupId>
             <artifactId>portal-mp-rest-client</artifactId>
@@ -46,9 +54,15 @@
             <groupId>de.cuioss.portal.test</groupId>
             <artifactId>portal-core-unit-testing</artifactId>
         </dependency>
+        <dependency>
+            <!-- RestEasy depends on jcl. This is a way to satisfy this. -->
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-jcl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-client-microprofile</artifactId>
+            <artifactId>resteasy-cdi</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/LoginPagePath.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * String containing the path to the login page

modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/Oauth2Service.java

@@ -15,7 +15,7 @@
  */
 package de.cuioss.portal.authentication.oauth;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
 import de.cuioss.portal.authentication.oauth.impl.OauthAuthenticatedUserInfo;

modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/impl/Oauth2AuthenticationFacadeImpl.java

@@ -33,10 +33,10 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/impl/Oauth2DiscoveryConfigurationProducer.java

@@ -27,14 +27,13 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.ws.rs.GET;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.ws.rs.GET;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
@@ -44,6 +43,7 @@
 import de.cuioss.portal.configuration.PortalConfigurationChangeInterceptor;
 import de.cuioss.portal.restclient.CuiRestClientBuilder;
 import de.cuioss.tools.logging.CuiLogger;
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 
 /**