You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2022/12/23 19:54:06 UTC
[myfaces] branch main updated: Quarkus 3 (#458)
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 71078e064 Quarkus 3 (#458)
71078e064 is described below
commit 71078e06482efa4efb5322f1b7020bb0c7652d23
Author: Melloware <me...@gmail.com>
AuthorDate: Fri Dec 23 14:54:01 2022 -0500
Quarkus 3 (#458)
---
.../quarkus/deployment/MyFacesProcessor.java | 34 +++++++++++-----------
extensions/quarkus/pom.xml | 2 +-
extensions/quarkus/runtime/pom.xml | 24 ++++++---------
.../quarkus/runtime/QuarkusFacesInitializer.java | 8 ++---
.../runtime/application/QuarkusApplication.java | 4 +--
.../producer/ManagedPropertyBeanCreator.java | 2 +-
.../runtime/scopes/QuarkusFacesScopeContext.java | 6 ++--
.../runtime/scopes/QuarkusFlowScopedContext.java | 14 ++++-----
.../runtime/scopes/QuarkusViewScopeContext.java | 6 ++--
.../scopes/QuarkusViewTransientScopeContext.java | 6 ++--
.../quarkus/runtime/spi/QuarkusCdiELResolver.java | 16 +++++-----
.../runtime/spi/QuarkusELResolverBuilder.java | 4 +--
.../quarkus/showcase/view/CarService.java | 4 +--
.../extensions/quarkus/showcase/view/FileView.java | 4 +--
.../quarkus/showcase/view/InputController.java | 6 ++--
.../extensions/quarkus/showcase/view/LazyView.java | 6 ++--
.../showcase/view/MethodHandleELResolverBean.java | 8 ++---
.../quarkus/showcase/view/MyBacking.java | 8 ++---
.../quarkus/showcase/view/MyValidator.java | 2 +-
.../quarkus/showcase/view/SocketView.java | 4 +--
20 files changed, 79 insertions(+), 89 deletions(-)
diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
index b4f4a8de5..cf5e6dbbe 100644
--- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
+++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
@@ -32,13 +32,13 @@ import jakarta.faces.render.FacesBehaviorRenderer;
import jakarta.faces.render.FacesRenderer;
import jakarta.faces.validator.FacesValidator;
import jakarta.faces.view.ViewScoped;
-import jakarta.faces.view.facelets.FaceletsResourceResolver;
+import jakarta.faces.view.facelets.FaceletHandler;
import jakarta.faces.webapp.FacesServlet;
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.apache.myfaces.cdi.FacesScoped;
-import org.apache.myfaces.cdi.JsfApplicationArtifactHolder;
-import org.apache.myfaces.cdi.JsfArtifactProducer;
+import org.apache.myfaces.cdi.FacesApplicationArtifactHolder;
+import org.apache.myfaces.cdi.FacesArtifactProducer;
import org.apache.myfaces.cdi.config.FacesConfigBeanHolder;
import org.apache.myfaces.cdi.model.FacesDataModelManager;
import org.apache.myfaces.cdi.view.ViewScopeBeanHolder;
@@ -67,7 +67,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
import io.quarkus.arc.deployment.BeanRegistrarBuildItem;
import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
-import io.quarkus.arc.deployment.ContextRegistrarBuildItem;
+import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -98,8 +98,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
-import javax.el.ELResolver;
-import javax.enterprise.inject.Produces;
+import jakarta.el.ELResolver;
+import jakarta.enterprise.inject.Produces;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.Application;
import jakarta.faces.component.UIComponent;
@@ -116,8 +116,8 @@ import jakarta.faces.view.facelets.ConverterHandler;
import jakarta.faces.view.facelets.MetaRuleset;
import jakarta.faces.view.facelets.TagHandler;
import jakarta.faces.view.facelets.ValidatorHandler;
-import javax.inject.Named;
-import javax.servlet.MultipartConfigElement;
+import jakarta.inject.Named;
+import jakarta.servlet.MultipartConfigElement;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.el.ExpressionFactoryImpl;
import org.apache.myfaces.application.ApplicationImplEventManager;
@@ -153,8 +153,8 @@ class MyFacesProcessor
private static final Class[] BEAN_CLASSES =
{
- JsfApplicationArtifactHolder.class,
- JsfArtifactProducer.class,
+ FacesApplicationArtifactHolder.class,
+ FacesArtifactProducer.class,
FacesConfigBeanHolder.class,
FacesDataModelManager.class,
ViewScopeBeanHolder.class,
@@ -178,7 +178,7 @@ class MyFacesProcessor
FacesRenderer.class.getName(),
NamedEvent.class.getName(),
FacesBehaviorRenderer.class.getName(),
- FaceletsResourceResolver.class.getName(),
+ FaceletHandler.class.getName(),
FlowDefinition.class.getName()
};
@@ -399,7 +399,7 @@ class MyFacesProcessor
classNames.addAll(collectSubclasses(combinedIndex, Renderer.class.getName()));
classNames.addAll(collectSubclasses(combinedIndex, ClientBehaviorRenderer.class.getName()));
- classNames.addAll(collectSubclasses(combinedIndex, javax.el.ValueExpression.class.getName()));
+ classNames.addAll(collectSubclasses(combinedIndex, jakarta.el.ValueExpression.class.getName()));
classNames.addAll(collectSubclasses(combinedIndex, SystemEvent.class.getName()));
classNames.addAll(collectSubclasses(combinedIndex, FacesContext.class.getName()));
classNames.addAll(collectSubclasses(combinedIndex, Application.class.getName()));
@@ -485,7 +485,7 @@ class MyFacesProcessor
CombinedIndexBuildItem combinedIndex)
{
reflectiveClass.produce(new ReflectiveClassBuildItem(true, true,
- "javax.faces.context._MyFacesExternalContextHelper"));
+ "jakarta.faces.context._MyFacesExternalContextHelper"));
// Register ViewScopeBeanHolder to be initialized at runtime, it uses a static random
NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder();
@@ -522,7 +522,7 @@ class MyFacesProcessor
"org/apache/myfaces/resource/web-facesconfig_4_0.dtd",
"org/apache/myfaces/resource/xml.xsd",
"META-INF/rsc/myfaces-dev-error-include.xml",
- "META-INF/services/javax.servlet.ServletContainerInitializer"));
+ "META-INF/services/jakarta.servlet.ServletContainerInitializer"));
resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.faces.Messages"));
resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.faces.Messages_ar"));
@@ -543,9 +543,9 @@ class MyFacesProcessor
resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.faces.Messages_zh_CN"));
resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.faces.Messages_zh_HK"));
resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.faces.Messages_zh_TW"));
- resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("javax.el.PrivateMessages"));
- resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("javax.servlet.LocalStrings"));
- resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("javax.el.LocalStrings"));
+ resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.el.PrivateMessages"));
+ resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.servlet.LocalStrings"));
+ resourceBundleBuildItem.produce(new NativeImageResourceBundleBuildItem("jakarta.el.LocalStrings"));
}
public List<String> collectSubclasses(CombinedIndexBuildItem combinedIndex, String className)
diff --git a/extensions/quarkus/pom.xml b/extensions/quarkus/pom.xml
index 28289364f..a7d5169a9 100644
--- a/extensions/quarkus/pom.xml
+++ b/extensions/quarkus/pom.xml
@@ -43,7 +43,7 @@
</modules>
<properties>
- <quarkus.version>2.12.2.Final</quarkus.version>
+ <quarkus.version>3.0.0.Alpha2</quarkus.version>
</properties>
<build>
diff --git a/extensions/quarkus/runtime/pom.xml b/extensions/quarkus/runtime/pom.xml
index 2a972dd1f..953936347 100644
--- a/extensions/quarkus/runtime/pom.xml
+++ b/extensions/quarkus/runtime/pom.xml
@@ -51,19 +51,14 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>9.0.37</version>
+ <version>11.0.0-M1</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-undertow-websockets</artifactId>
+ <artifactId>quarkus-websockets</artifactId>
<version>${quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-undertow-websockets</artifactId>
- <version>2.7.6.Final</version>
- </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp</artifactId>
@@ -72,22 +67,22 @@
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
- <version>3.2.5</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
- <version>2.2.2</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>2.0.2</version>
+ <version>3.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- <version>1.2.4</version>
+ <version>3.0.0</version>
<exclusions>
<!-- Exclude it, we use tomcat-el as API and IMPL -->
<exclusion>
@@ -100,13 +95,12 @@
<groupId>commons-fileupload</groupId>
<!-- primefaces fileupload, needed in quarkus native mode -->
<artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
- <!-- java 11 support -->
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
@@ -139,7 +133,7 @@
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
- <version>20.1.0</version>
+ <version>22.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/QuarkusFacesInitializer.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/QuarkusFacesInitializer.java
index 48ae84505..2b3b16ed9 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/QuarkusFacesInitializer.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/QuarkusFacesInitializer.java
@@ -20,12 +20,10 @@ package org.apache.myfaces.core.extensions.quarkus.runtime;
import java.util.Map;
-import javax.enterprise.inject.spi.CDI;
-import jakarta.faces.annotation.FacesConfig;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.model.DataModel;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
-import org.apache.myfaces.cdi.config.FacesConfigBeanHolder;
import org.apache.myfaces.cdi.model.FacesDataModelManager;
import org.apache.myfaces.spi.FactoryFinderProviderFactory;
import org.apache.myfaces.webapp.FacesInitializerImpl;
@@ -42,8 +40,6 @@ public class QuarkusFacesInitializer extends FacesInitializerImpl
@Override
public void initFaces(ServletContext servletContext)
{
- FacesConfigBeanHolder facesConfigBeanHolder = CDI.current().select(FacesConfigBeanHolder.class).get();
- facesConfigBeanHolder.setFacesConfigVersion(FacesConfig.Version.JSF_2_3);
FactoryFinderProviderFactory.setInstance(new QuarkusFactoryFinderProviderFactory());
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusApplication.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusApplication.java
index 6043ca2ce..efb7d1295 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusApplication.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusApplication.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.core.extensions.quarkus.runtime.application;
-import javax.el.CompositeELResolver;
-import javax.el.ELResolver;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELResolver;
import jakarta.faces.application.Application;
import jakarta.faces.application.ApplicationWrapper;
import jakarta.faces.context.FacesContext;
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/producer/ManagedPropertyBeanCreator.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/producer/ManagedPropertyBeanCreator.java
index b4949876d..fce6bab75 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/producer/ManagedPropertyBeanCreator.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/producer/ManagedPropertyBeanCreator.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.core.extensions.quarkus.runtime.producer;
import java.util.Map;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFacesScopeContext.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFacesScopeContext.java
index 64157ce22..a95ef6bb1 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFacesScopeContext.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFacesScopeContext.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.core.extensions.quarkus.runtime.scopes;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.CDI;
import org.apache.myfaces.cdi.FacesScopeContext;
import org.apache.myfaces.cdi.FacesScoped;
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFlowScopedContext.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFlowScopedContext.java
index 61f908897..d963e80b6 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFlowScopedContext.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusFlowScopedContext.java
@@ -20,29 +20,29 @@ package org.apache.myfaces.core.extensions.quarkus.runtime.scopes;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.flow.FlowScoped;
-import org.apache.myfaces.flow.cdi.FlowScopedContextImpl;
+import org.apache.myfaces.flow.cdi.FlowScopeContext;
import io.quarkus.arc.InjectableContext;
import org.apache.myfaces.core.extensions.quarkus.runtime.MyFacesRecorder;
public class QuarkusFlowScopedContext implements InjectableContext
{
- private FlowScopedContextImpl wrapped;
+ private FlowScopeContext wrapped;
public QuarkusFlowScopedContext()
{
}
- public FlowScopedContextImpl getWrapped()
+ public FlowScopeContext getWrapped()
{
if (wrapped == null)
{
- wrapped = new FlowScopedContextImpl(CDI.current().getBeanManager(), MyFacesRecorder.FLOW_REFERENCES);
+ wrapped = new FlowScopeContext(CDI.current().getBeanManager(), MyFacesRecorder.FLOW_REFERENCES);
}
return wrapped;
}
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewScopeContext.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewScopeContext.java
index e0f6c51bb..824b3d6e5 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewScopeContext.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewScopeContext.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.core.extensions.quarkus.runtime.scopes;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.view.ViewScoped;
import org.apache.myfaces.cdi.view.ViewScopeContext;
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewTransientScopeContext.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewTransientScopeContext.java
index 3f32422ba..80177dad2 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewTransientScopeContext.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/scopes/QuarkusViewTransientScopeContext.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.core.extensions.quarkus.runtime.scopes;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.CDI;
import org.apache.myfaces.cdi.view.ViewTransientScopeContext;
import org.apache.myfaces.cdi.view.ViewTransientScoped;
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusCdiELResolver.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusCdiELResolver.java
index 7c58d60dc..596b91a1e 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusCdiELResolver.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusCdiELResolver.java
@@ -25,14 +25,14 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.FacesException;
/**
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java
index a8cc93882..61f463fec 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.core.extensions.quarkus.runtime.spi;
-import javax.el.ELResolver;
+import jakarta.el.ELResolver;
import org.apache.myfaces.config.webparameters.MyfacesConfig;
import org.apache.myfaces.config.RuntimeConfig;
@@ -26,7 +26,7 @@ import org.apache.myfaces.el.DefaultELResolverBuilder;
/**
* Custom {@link org.apache.myfaces.el.ELResolverBuilder} which only works with EL3.x+
- * and replaces the {@link javax.enterprise.inject.spi.BeanManager#getELResolver()}
+ * and replaces the {@link jakarta.enterprise.inject.spi.BeanManager#getELResolver()}
* with our own {@link QuarkusCdiELResolver}
*/
public class QuarkusELResolverBuilder extends DefaultELResolverBuilder
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java
index a9954406d..0ede7bd83 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/CarService.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
@Named("carService")
@ApplicationScoped
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java
index 9c8f33b59..3d097aa26 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/FileView.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import org.primefaces.event.FileUploadEvent;
import org.primefaces.model.file.UploadedFile;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java
index d5582af45..defdfb76b 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/InputController.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
import jakarta.faces.annotation.ManagedProperty;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
@SessionScoped
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java
index be59f8af8..d644c1096 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/LazyView.java
@@ -19,12 +19,12 @@
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.primefaces.event.SelectEvent;
import org.primefaces.model.LazyDataModel;
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java
index a3ad37229..d26642499 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MethodHandleELResolverBean.java
@@ -20,13 +20,13 @@ package org.apache.myfaces.core.extensions.quarkus.showcase.view;
import java.io.Serializable;
import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
import jakarta.faces.event.PhaseEvent;
import jakarta.faces.event.PhaseId;
import jakarta.faces.event.PhaseListener;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
@ApplicationScoped
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java
index 42a15ff46..7314c9264 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyBacking.java
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.core.extensions.quarkus.showcase.view;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
@RequestScoped
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java
index a3543a8ed..188f65074 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/MyValidator.java
@@ -23,7 +23,7 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.FacesValidator;
import jakarta.faces.validator.Validator;
import jakarta.faces.validator.ValidatorException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@FacesValidator(value = "myVal", managed = true)
public class MyValidator implements Validator<String>{
diff --git a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java
index 16ea81bb9..8e17f45b1 100644
--- a/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java
+++ b/extensions/quarkus/showcase/src/main/java/org/apache/myfaces/core/extensions/quarkus/showcase/view/SocketView.java
@@ -25,8 +25,8 @@ import java.util.logging.Logger;
import jakarta.faces.push.Push;
import jakarta.faces.push.PushContext;
import jakarta.faces.view.ViewScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@ViewScoped
@Named