Migrate to JakartaEE 10

modules/cui-jsf-api/pom.xml

@@ -23,6 +23,18 @@
             <groupId>de.cuioss.portal.core</groupId>
             <artifactId>portal-common-cdi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
             <artifactId>owasp-java-html-sanitizer</artifactId>

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/CuiVersionLoggerEventListener.java

@@ -17,8 +17,8 @@
 
 import de.cuioss.tools.logging.CuiLogger;
 
-import javax.faces.event.SystemEvent;
-import javax.faces.event.SystemEventListener;
+import jakarta.faces.event.SystemEvent;
+import jakarta.faces.event.SystemEventListener;
 
 /**
  * CuiVersionLoggerEventListener run once at jsf application start<br>

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/bundle/CuiJSfResourceBundleLocator.java

@@ -18,11 +18,11 @@
 import java.io.Serial;
 import java.util.Optional;
 
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import de.cuioss.portal.common.bundle.ResourceBundleLocator;
 import de.cuioss.portal.common.priority.PortalPriorities;
+import jakarta.annotation.Priority;
 import lombok.EqualsAndHashCode;
 
 /**

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/message/DisplayNameMessageProducer.java

@@ -19,11 +19,11 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
 
 import de.cuioss.jsf.api.common.accessor.ConverterAccessor;
 import de.cuioss.jsf.api.components.support.DummyComponent;

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/message/MessageProducer.java

@@ -17,12 +17,12 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
-import javax.inject.Provider;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Provider;
 
 import lombok.NonNull;
 
@@ -48,7 +48,7 @@ public interface MessageProducer extends Serializable {
 
     /**
      * Convenience Method for
-     * {@link #getMessageFor(String, javax.faces.application.FacesMessage.Severity, Object...)}
+     * {@link #getMessageFor(String, jakarta.faces.application.FacesMessage.Severity, Object...)}
      * that sets in addition the Messages into the {@link FacesContext}
      *
      * @param messagekey  must no be null FacesMessage.Severity severity
@@ -72,7 +72,7 @@ void addMessage(@NonNull final String message, @NonNull final FacesMessage.Sever
 
     /**
      * Convenience Method for
-     * {@link #getMessageFor(String, javax.faces.application.FacesMessage.Severity, Object...)}
+     * {@link #getMessageFor(String, jakarta.faces.application.FacesMessage.Severity, Object...)}
      * with {@link FacesMessage#SEVERITY_ERROR}
      *
      * @param messageKey must no be null FacesMessage.Severity severity
@@ -85,7 +85,7 @@ default FacesMessage getErrorMessageFor(String messageKey, Object... parameter)
 
     /**
      * Convenience Method for
-     * {@link #getMessageFor(String, javax.faces.application.FacesMessage.Severity, Object...)}
+     * {@link #getMessageFor(String, jakarta.faces.application.FacesMessage.Severity, Object...)}
      * with {@link FacesMessage#SEVERITY_INFO}
      *
      * @param messageKey must no be null FacesMessage.Severity severity

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/message/MessageProducerBean.java

@@ -4,16 +4,15 @@
 import de.cuioss.portal.common.priority.PortalPriorities;
 import de.cuioss.tools.collect.MoreCollections;
 import de.cuioss.tools.string.TextSplitter;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.annotation.Priority;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Provider;
 import java.io.Serial;
 import java.text.MessageFormat;
 import java.util.MissingResourceException;
@@ -57,7 +56,7 @@ public class MessageProducerBean implements MessageProducer {
     private Provider<FacesContext> facesContextProvider;
 
     @Override
-    public FacesMessage getMessageFor(final String messageKey, final Severity severity, final Object... parameter) {
+    public FacesMessage getMessageFor(final String messageKey, final FacesMessage.Severity severity, final Object... parameter) {
         try {
             var resultingMessage = resourceBundle.getString(messageKey);
             if (parameter.length > 0) {
@@ -73,13 +72,13 @@ public FacesMessage getMessageFor(final String messageKey, final Severity severi
     }
 
     @Override
-    public void setFacesMessage(final String messageKey, final Severity severity, final String componentId,
+    public void setFacesMessage(final String messageKey, final FacesMessage.Severity severity, final String componentId,
                                 final Object... parameter) {
         facesContextProvider.get().addMessage(componentId, getMessageFor(messageKey, severity, parameter));
     }
 
     @Override
-    public void addMessage(String message, Severity severity, String componentId, Object... parameter) {
+    public void addMessage(String message, FacesMessage.Severity severity, String componentId, Object... parameter) {
         var resultingMessage = message;
         if (!MoreCollections.isEmpty(parameter)) {
             resultingMessage = MessageFormat.format(resultingMessage, parameter);

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/navigation/NavigationUtils.java

@@ -28,12 +28,12 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.faces.application.ConfigurableNavigationHandler;
-import javax.faces.application.NavigationCase;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.faces.application.ConfigurableNavigationHandler;
+import jakarta.faces.application.NavigationCase;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.omnifaces.util.Servlets;
 

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/navigation/Redirector.java

@@ -15,8 +15,8 @@
  */
 package de.cuioss.jsf.api.application.navigation;
 
-import javax.faces.application.NavigationHandler;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.context.FacesContext;
 
 import de.cuioss.tools.net.UrlParameter;
 

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/navigation/ViewIdentifier.java

@@ -18,8 +18,8 @@
 import java.io.Serializable;
 import java.util.List;
 
-import javax.faces.application.NavigationCase;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.NavigationCase;
+import jakarta.faces.context.FacesContext;
 
 import de.cuioss.jsf.api.common.view.ViewDescriptor;
 import de.cuioss.tools.collect.CollectionLiterals;

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/application/view/matcher/OutcomeBasedViewMatcher.java

@@ -15,7 +15,7 @@
  */
 package de.cuioss.jsf.api.application.view.matcher;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 import de.cuioss.jsf.api.application.navigation.NavigationUtils;
 import de.cuioss.jsf.api.common.view.ViewDescriptor;

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/common/accessor/ConverterAccessor.java

@@ -15,8 +15,8 @@
  */
 package de.cuioss.jsf.api.common.accessor;
 
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
 
 import de.cuioss.jsf.api.converter.ObjectToStringConverter;
 import de.cuioss.jsf.api.converter.StringIdentConverter;

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/common/accessor/CuiProjectStageImpl.java

@@ -15,8 +15,8 @@
  */
 package de.cuioss.jsf.api.common.accessor;
 
-import javax.faces.application.ProjectStage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.context.FacesContext;
 
 import de.cuioss.uimodel.application.CuiProjectStage;
 import lombok.EqualsAndHashCode;

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/common/accessor/LocaleAccessor.java

@@ -17,8 +17,8 @@
 
 import java.util.Locale;
 
-import javax.faces.application.ViewHandler;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.context.FacesContext;
 
 import lombok.Getter;
 

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/common/accessor/ManagedAccessor.java

@@ -18,7 +18,7 @@
 import java.io.Serializable;
 import java.util.ResourceBundle;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 /**
  * <p>

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/common/util/CheckContextState.java

@@ -15,7 +15,7 @@
  */
 package de.cuioss.jsf.api.common.util;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 import lombok.experimental.UtilityClass;
 

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/components/JsfBehaviorComponent.java

@@ -17,8 +17,8 @@
 
 import static java.util.Objects.requireNonNull;
 
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.context.FacesContext;
 
 import lombok.experimental.UtilityClass;
 

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/components/JsfComponentIdentifier.java

@@ -21,32 +21,47 @@
  * Defines Constants identifying standard JSF-Identifier
  *
  * @author Oliver Wolff
- *
  */
 @UtilityClass
 public class JsfComponentIdentifier {
 
-    /** "javax.faces.Button" */
-    public static final String BUTTON_RENDERER_TYPE = "javax.faces.Button";
+    /**
+     * "jakarta.faces.Button"
+     */
+    public static final String BUTTON_RENDERER_TYPE = "jakarta.faces.Button";
 
-    /** "javax.faces.Text" */
-    public static final String TEXT_RENDERER_TYPE = "javax.faces.Text";
+    /**
+     * "jakarta.faces.Text"
+     */
+    public static final String TEXT_RENDERER_TYPE = "jakarta.faces.Text";
 
-    /** "javax.faces.Hidden" */
-    public static final String HIDDEN_RENDERER_TYPE = "javax.faces.Hidden";
+    /**
+     * "jakarta.faces.Hidden"
+     */
+    public static final String HIDDEN_RENDERER_TYPE = "jakarta.faces.Hidden";
 
-    /** "javax.faces.Form" */
-    public static final String FORM_RENDERER_TYPE = "javax.faces.Form";
+    /**
+     * "jakarta.faces.Form"
+     */
+    public static final String FORM_RENDERER_TYPE = "jakarta.faces.Form";
 
-    /** "javax.faces.Group" */
-    public static final String GROUP_RENDERER_TYPE = "javax.faces.Group";
+    /**
+     * "jakarta.faces.Group"
+     */
+    public static final String GROUP_RENDERER_TYPE = "jakarta.faces.Group";
 
-    /** "javax.faces.Link" */
-    public static final String LINK_RENDERER_TYPE = "javax.faces.Link";
+    /**
+     * "jakarta.faces.Link"
+     */
+    public static final String LINK_RENDERER_TYPE = "jakarta.faces.Link";
 
-    /** "javax.faces.Checkbox". */
-    public static final String CHECKBOX_RENDERER_TYPE = "javax.faces.Checkbox";
+    /**
+     * "jakarta.faces.Checkbox".
+     */
+    public static final String CHECKBOX_RENDERER_TYPE = "jakarta.faces.Checkbox";
 
-    /** "javax.faces.Input". */
-    public static final String INPUT_FAMILY = "javax.faces.Input";
+    /**
+     * "jakarta.faces.Input".
+     */
+    public static final String INPUT_FAMILY = "jakarta.faces.Input";
 }

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/components/JsfHtmlComponent.java

@@ -26,20 +26,20 @@
 
 import java.util.Collection;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIInput;
-import javax.faces.component.html.HtmlCommandButton;
-import javax.faces.component.html.HtmlForm;
-import javax.faces.component.html.HtmlInputHidden;
-import javax.faces.component.html.HtmlInputText;
-import javax.faces.component.html.HtmlOutcomeTargetButton;
-import javax.faces.component.html.HtmlOutputLink;
-import javax.faces.component.html.HtmlOutputText;
-import javax.faces.component.html.HtmlPanelGroup;
-import javax.faces.component.html.HtmlSelectBooleanCheckbox;
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.html.HtmlCommandButton;
+import jakarta.faces.component.html.HtmlForm;
+import jakarta.faces.component.html.HtmlInputHidden;
+import jakarta.faces.component.html.HtmlInputText;
+import jakarta.faces.component.html.HtmlOutcomeTargetButton;
+import jakarta.faces.component.html.HtmlOutputLink;
+import jakarta.faces.component.html.HtmlOutputText;
+import jakarta.faces.component.html.HtmlPanelGroup;
+import jakarta.faces.component.html.HtmlSelectBooleanCheckbox;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.render.Renderer;
 
 import de.cuioss.jsf.api.components.html.Node;
 import de.cuioss.jsf.api.components.util.ComponentUtility;

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/components/base/AbstractBaseCuiComponent.java

@@ -18,11 +18,11 @@
 import de.cuioss.jsf.api.components.partial.*;
 import lombok.experimental.Delegate;
 
-import javax.faces.component.StateHelper;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UINamingContainer;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.StateHelper;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.context.FacesContext;
 
 /**
  * Minimal superset for cui-based components that are no

modules/cui-jsf-api/src/main/java/de/cuioss/jsf/api/components/base/BaseCuiCommandButton.java

@@ -20,10 +20,10 @@
 import de.cuioss.jsf.api.components.partial.*;
 import lombok.experimental.Delegate;
 
-import javax.faces.component.StateHelper;
-import javax.faces.component.UIComponent;
-import javax.faces.component.html.HtmlCommandButton;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.StateHelper;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.html.HtmlCommandButton;
+import jakarta.faces.context.FacesContext;
 
 /**
  * Base class for creating cui variants of {@link HtmlCommandButton}