You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2023/01/24 09:01:57 UTC
[openwebbeans] branch main created (now 3002d08b7)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
at 3002d08b7 OWB-1417 use arquillian enricher for jakarta
This branch includes the following new commits:
new 6cc7ac227 OWB-1417 bump version to 4.0.0-SNAPSHOT
new f82969b2e OWB-1417 move core parts to CDI-4.0
new 8eef18a98 OWB-1417 re-enable more owb modules
new c7c521074 OWB-1417 Fix diff in Session Persistence behaviour of tc10
new 3002d08b7 OWB-1417 use arquillian enricher for jakarta
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openwebbeans] 04/05: OWB-1417 Fix diff in Session Persistence behaviour of tc10
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit c7c521074f138902d462e7ae0f1cc898bfc4ecea
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Jan 24 09:49:45 2023 +0100
OWB-1417 Fix diff in Session Persistence behaviour of tc10
---
.../tomcat/test/TomcatNormalScopeProxyFactoryTest.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
index c53c33ce8..6d51d1796 100644
--- a/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
+++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
@@ -22,6 +22,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.session.FileStore;
+import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.apache.webbeans.config.WebBeansContext;
@@ -65,7 +67,14 @@ public class TomcatNormalScopeProxyFactoryTest
tomcat.setPort(0);
tomcat.setBaseDir(base.getAbsolutePath());
+
final Context ctx = tomcat.addContext("/test", war.getAbsolutePath());
+
+ //required to persist state during restart
+ final PersistentManager persistentManager = new PersistentManager();
+ final FileStore fileStore = new FileStore();
+ persistentManager.setStore(fileStore);
+ ctx.setManager(persistentManager);
ctx.addLifecycleListener(new ContextLifecycleListener());
// needed for Java9
@@ -94,17 +103,16 @@ public class TomcatNormalScopeProxyFactoryTest
final BeanManager bm = CDI.current().getBeanManager();
final Response response = new Response();
- //Xresponse.setConnector(tomcat.getConnector());
response.setCoyoteResponse(new org.apache.coyote.Response());
final Request request = new Request(tomcat.getConnector());
- //X request.setContext(ctx);
+ request.getMappingData().context = ctx;
request.setResponse(response);
request.setRequestedSessionId(sessionId);
+ response.setRequest(request);
final ContextsService contextsService = WebBeansContext.currentInstance().getContextsService();
final ServletRequestEvent startParameter = new ServletRequestEvent(ctx.getServletContext(), request);
- contextsService.startContext(RequestScoped.class, startParameter);
if (request.getSession() != null)
{
contextsService.startContext(SessionScoped.class, request.getSession());
@@ -124,9 +132,6 @@ public class TomcatNormalScopeProxyFactoryTest
// don't do to not destroy the instance
// contextsService.endContext(SessionScoped.class, request.getSession());
}
- catch (Exception e) {
- log.log(Level.SEVERE, "Exception during test execution", e);
- }
finally
{
thread.setContextClassLoader(old);
@@ -136,6 +141,7 @@ public class TomcatNormalScopeProxyFactoryTest
{
try
{
+ ctx.getManager().unload();;
tomcat.stop();
}
catch (Exception e)
[openwebbeans] 02/05: OWB-1417 move core parts to CDI-4.0
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit f82969b2e15f6f0c481061c12bef06ff0bf09df0
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sun Jan 22 23:13:57 2023 +0100
OWB-1417 move core parts to CDI-4.0
---
atinject-tck/pom.xml | 24 +--
.../atinject/tck/specific/DriverBinding.java | 2 +-
.../atinject/tck/specific/SpareBinding.java | 2 +-
.../atinject/tck/specific/SpecificProducer.java | 10 +-
distribution/pom.xml | 20 +--
pom.xml | 128 ++++++++-------
readme/README.txt | 12 +-
readme/README_1_1_2.txt | 2 +-
readme/README_1_1_3.txt | 2 +-
readme/README_1_1_4.txt | 2 +-
readme/README_1_1_5.txt | 4 +-
readme/README_1_1_6.txt | 4 +-
readme/README_1_2_0.txt | 4 +-
readme/README_M4.txt | 6 +-
samples/conversation-sample/pom.xml | 16 +-
.../webbeans/samples/conversation/Products.java | 8 +-
.../samples/conversation/ShoppingBean.java | 12 +-
samples/guess/pom.xml | 20 +--
.../sample/bean/ApplicationScopeProducer.java | 8 +-
.../org/apache/webbeans/sample/bean/LoginBean.java | 18 +--
.../apache/webbeans/sample/bean/LogoutBean.java | 4 +-
.../webbeans/sample/bindings/AppScopeBinding.java | 2 +-
.../webbeans/sample/bindings/JmsBinding.java | 2 +-
.../webbeans/sample/bindings/LoggedInUser.java | 2 +-
.../sample/conversation/ShoppingCardBean.java | 10 +-
.../webbeans/sample/dependent/LoginCheck.java | 2 +-
.../org/apache/webbeans/sample/guess/Highest.java | 2 +-
.../webbeans/sample/guess/JSFNumberGuess.java | 14 +-
.../apache/webbeans/sample/guess/NextNumber.java | 2 +-
.../webbeans/sample/guess/NumberProducer.java | 6 +-
.../org/apache/webbeans/sample/model/User.java | 2 +-
.../model/conversation/ConversationModel.java | 4 +-
.../webbeans/sample/observer/LoggedInObserver.java | 2 +-
.../webbeans/sample/util/FacesMessageUtil.java | 4 +-
samples/jsf2sample/pom.xml | 20 +--
.../org/apache/webbeans/jsf2/ConversationBean.java | 8 +-
.../org/apache/webbeans/jsf2/ConversationData.java | 6 +-
.../java/org/apache/webbeans/jsf2/Counter.java | 2 +-
.../java/org/apache/webbeans/jsf2/CounterBean.java | 6 +-
.../org/apache/webbeans/jsf2/HelloJsfBean.java | 6 +-
samples/reservation/pom.xml | 20 +--
.../webbeans/reservation/beans/LoginBean.java | 10 +-
.../webbeans/reservation/beans/LogoutBean.java | 4 +-
.../webbeans/reservation/beans/RegisterBean.java | 8 +-
.../reservation/beans/admin/AdminBean.java | 8 +-
.../reservation/beans/admin/AdminListBean.java | 8 +-
.../reservation/beans/admin/AdminListUser.java | 8 +-
.../reservation/beans/user/UserListBean.java | 8 +-
.../beans/user/UserReservationBean.java | 10 +-
.../reservation/beans/user/UserUpdateBean.java | 8 +-
.../reservation/bindings/ApplicationLog.java | 2 +-
.../reservation/bindings/DatabaseLogin.java | 2 +-
.../bindings/EntityManagerQualifier.java | 2 +-
.../bindings/intercep/Transactional.java | 2 +-
.../reservation/controller/InitializeDatabase.java | 8 +-
.../reservation/controller/LoginController.java | 6 +-
.../reservation/controller/RegisterController.java | 4 +-
.../controller/admin/AdminController.java | 6 +-
.../controller/user/UserController.java | 8 +-
.../reservation/intercept/LoginDecorator.java | 6 +-
.../intercept/TransactionalInterceptor.java | 8 +-
.../reservation/session/SessionTracker.java | 8 +-
.../reservation/util/EntityManagerUtil.java | 6 +-
.../apache/webbeans/reservation/util/LogUtil.java | 6 +-
samples/standalone-sample/pom.xml | 4 +-
.../java/org/apache/webbeans/se/sample/Boot.java | 4 +-
.../apache/webbeans/se/sample/beans/FileLogin.java | 2 +-
.../se/sample/beans/JavaLoggerFactory.java | 2 +-
.../se/sample/bindings/FileLoginBinding.java | 2 +-
.../webbeans/se/sample/bindings/JavaLogger.java | 2 +-
.../apache/webbeans/se/sample/gui/LoginWindow.java | 4 +-
samples/tomcat7-sample/pom.xml | 18 +--
.../samples/tomcat/CurrentDateProvider.java | 6 +-
.../webbeans/samples/tomcat/InjectorServlet.java | 6 +-
.../apache/webbeans/samples/tomcat/MyFilter.java | 6 +-
.../samples/tomcat/SampleContextObserver.java | 12 +-
.../owb-arquillian-standalone/pom.xml | 20 +--
.../standalone/OwbArquillianScannerService.java | 2 +-
.../arquillian/standalone/OwbLifecycleHandler.java | 8 +-
.../standalone/OwbStandaloneContainer.java | 2 +-
.../OwbArquillianImplicitBdaJarDeploymentTest.java | 4 +-
.../test/OwbArquillianJarDeploymentTest.java | 2 +-
.../OwbArquillianTrimmedBdaJarDeploymentTest.java | 4 +-
.../OwbArquillianWebInfClassesDeploymentTest.java | 2 +-
.../test/OwbArquillianWebJarDeploymentTest.java | 2 +-
.../webbeans/arquillian/test/beans/SampleUser.java | 4 +-
webbeans-ee-common/pom.xml | 10 +-
webbeans-ee/pom.xml | 18 +--
.../webbeans/ee/beans/UserTransactionProvider.java | 2 +-
.../ee/beans/ValidatorFactoryProvider.java | 2 +-
.../webbeans/ee/beans/ValidatorProvider.java | 2 +-
.../ee/event/TransactionalEventNotifier.java | 6 +-
webbeans-ejb/pom.xml | 14 +-
.../webbeans/ejb/common/component/BaseEjbBean.java | 6 +-
.../ejb/common/component/EjbBeanBuilder.java | 12 +-
.../webbeans/ejb/common/util/EjbValidator.java | 16 +-
.../ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java | 2 +-
webbeans-el22/pom.xml | 20 ++-
.../java/org/apache/webbeans/el22/EL22Adaptor.java | 4 +-
.../apache/webbeans/el22/WebBeansELResolver.java | 12 +-
.../webbeans/el22/WrappedExpressionFactory.java | 10 +-
.../webbeans/el22/WrappedMethodExpression.java | 8 +-
.../webbeans/el22/WrappedValueExpression.java | 10 +-
.../apache/webbeans/el/test/AbstractUnitTest.java | 8 +-
.../apache/webbeans/el/test/ELPerformanceTest.java | 6 +-
.../org/apache/webbeans/el/test/MockELContext.java | 8 +-
.../org/apache/webbeans/el/test/RequestBean.java | 2 +-
.../org/apache/webbeans/el/test/SampleBean.java | 6 +-
webbeans-impl/pom.xml | 34 ++--
webbeans-impl/src/it/properties/pom.xml | 8 +-
.../spi/configuration/ExcludeExtensionsTest.java | 6 +-
.../webbeans/annotation/AnnotationManager.java | 123 +++------------
.../org/apache/webbeans/annotation/AnyLiteral.java | 2 +-
.../annotation/ApplicationScopeLiteral.java | 4 +-
.../annotation/BeforeDestroyedLiteral.java | 14 +-
.../apache/webbeans/annotation/DefaultLiteral.java | 2 +-
.../webbeans/annotation/DependentScopeLiteral.java | 2 +-
.../webbeans/annotation/DestroyedLiteral.java | 14 +-
.../annotation/EmptyAnnotationLiteral.java | 4 +-
.../webbeans/annotation/InitializedLiteral.java | 14 +-
.../apache/webbeans/annotation/NamedLiteral.java | 4 +-
.../org/apache/webbeans/annotation/NewLiteral.java | 53 -------
.../webbeans/annotation/RequestedScopeLiteral.java | 2 +-
.../webbeans/annotation/SessionScopeLiteral.java | 4 +-
.../apache/webbeans/component/AbstractOwbBean.java | 18 +--
.../webbeans/component/AbstractProducerBean.java | 6 +-
.../webbeans/component/BeanAttributesImpl.java | 16 +-
.../apache/webbeans/component/BeanManagerBean.java | 2 +-
.../webbeans/component/BeanMetadataBean.java | 6 +-
.../apache/webbeans/component/BuiltInOwbBean.java | 4 +-
.../webbeans/component/CdiInterceptorBean.java | 10 +-
.../webbeans/component/ConversationBean.java | 6 +-
.../apache/webbeans/component/DecoratorBean.java | 6 +-
.../webbeans/component/DecoratorMetadataBean.java | 4 +-
.../webbeans/component/EjbInterceptorBean.java | 10 +-
.../org/apache/webbeans/component/EventBean.java | 4 +-
.../webbeans/component/EventMetadataBean.java | 2 +-
.../apache/webbeans/component/ExtensionBean.java | 2 +-
.../component/ExtensionProducerFactory.java | 10 +-
.../apache/webbeans/component/IBeanHasParent.java | 2 +-
.../webbeans/component/InjectionPointBean.java | 2 +-
.../webbeans/component/InjectionTargetBean.java | 8 +-
.../apache/webbeans/component/InstanceBean.java | 6 +-
.../InterceptedOrDecoratedBeanMetadataBean.java | 12 +-
.../component/InterceptionFactoryBean.java | 8 +-
.../apache/webbeans/component/InterceptorBean.java | 14 +-
.../component/InterceptorMetadataBean.java | 4 +-
.../org/apache/webbeans/component/ManagedBean.java | 12 +-
.../org/apache/webbeans/component/NewBean.java | 27 ----
.../apache/webbeans/component/NewManagedBean.java | 73 ---------
.../org/apache/webbeans/component/OwbBean.java | 4 +-
.../webbeans/component/PrincipalProvider.java | 2 +-
.../ProducerAwareInjectionTargetBean.java | 6 +-
.../webbeans/component/ProducerFieldBean.java | 6 +-
.../webbeans/component/ProducerMethodBean.java | 4 +-
.../apache/webbeans/component/ResourceBean.java | 4 +-
.../webbeans/component/ResourceProvider.java | 2 +-
.../webbeans/component/SelfInterceptorBean.java | 8 +-
.../webbeans/component/SimpleProducerFactory.java | 6 +-
.../apache/webbeans/component/WebBeansType.java | 2 +-
.../component/creation/AbstractBeanBuilder.java | 16 +-
.../creation/AbstractProducerBeanBuilder.java | 10 +-
.../component/creation/BaseProducerFactory.java | 28 ++--
.../component/creation/BeanAttributesBuilder.java | 30 ++--
.../creation/CdiInterceptorBeanBuilder.java | 6 +-
.../component/creation/DecoratorBeanBuilder.java | 18 +--
.../creation/EjbInterceptorBeanBuilder.java | 6 +-
.../component/creation/ExtensionBeanBuilder.java | 4 +-
.../component/creation/FieldProducerFactory.java | 12 +-
.../component/creation/InterceptorBeanBuilder.java | 28 ++--
.../component/creation/ManagedBeanBuilder.java | 8 +-
.../component/creation/MethodProducerFactory.java | 10 +-
.../component/creation/ObserverMethodsBuilder.java | 28 ++--
.../creation/ProducerFieldBeanBuilder.java | 4 +-
.../creation/ProducerFieldBeansBuilder.java | 10 +-
.../creation/ProducerMethodBeanBuilder.java | 10 +-
.../creation/ProducerMethodBeansBuilder.java | 18 +--
.../component/creation/ResourceBeanBuilder.java | 6 +-
.../creation/ResourceProducerFactory.java | 6 +-
.../creation/SelfInterceptorBeanBuilder.java | 4 +-
.../component/creation/UnproxyableBean.java | 8 +-
.../PassivationCapableThirdpartyBeanImpl.java | 4 +-
.../third/ThirdpartyBeanAttributesImpl.java | 2 +-
.../component/third/ThirdpartyBeanImpl.java | 10 +-
.../org/apache/webbeans/config/BeansDeployer.java | 54 +++----
.../apache/webbeans/config/DefaultAnnotation.java | 2 +-
.../config/DeploymentValidationService.java | 18 +--
.../webbeans/config/EJBWebBeansConfigurator.java | 6 +-
.../webbeans/config/OpenWebBeansConfiguration.java | 12 +-
.../apache/webbeans/config/WebBeansContext.java | 4 +-
.../AnnotatedConstructorConfiguratorImpl.java | 6 +-
.../AnnotatedFieldConfiguratorImpl.java | 4 +-
.../AnnotatedMethodConfiguratorImpl.java | 6 +-
.../AnnotatedParameterConfiguratorImpl.java | 4 +-
.../AnnotatedTypeConfiguratorImpl.java | 10 +-
.../BeanAttributesConfiguratorImpl.java | 6 +-
.../configurator/BeanConfiguratorImpl.java | 44 +++---
.../InjectionPointConfiguratorImpl.java | 8 +-
.../ObserverMethodConfiguratorImpl.java | 22 +--
.../configurator/ProducerConfiguratorImpl.java | 8 +-
.../webbeans/container/AnnotatedTypeWrapper.java | 10 +-
.../apache/webbeans/container/BeanCacheKey.java | 4 +-
.../apache/webbeans/container/BeanManagerImpl.java | 82 +++++-----
.../container/DecoratorInjectionTargetFactory.java | 6 +-
.../apache/webbeans/container/ExternalScope.java | 4 +-
.../webbeans/container/InjectableBeanManager.java | 58 +++----
.../webbeans/container/InjectionResolver.java | 107 ++-----------
.../container/InjectionTargetFactoryImpl.java | 18 +--
.../container/InterceptionFactoryImpl.java | 8 +-
.../InterceptorInjectionTargetFactory.java | 4 +-
.../java/org/apache/webbeans/container/OwbCDI.java | 22 ++-
.../apache/webbeans/container/OwbCDIProvider.java | 4 +-
.../webbeans/container/SerializableBean.java | 16 +-
.../webbeans/container/SerializableBeanVault.java | 8 +-
.../apache/webbeans/context/AbstractContext.java | 12 +-
.../webbeans/context/AbstractContextsService.java | 6 +-
.../webbeans/context/ApplicationContext.java | 4 +-
.../webbeans/context/ConversationContext.java | 2 +-
.../CustomAlterablePassivatingContextImpl.java | 4 +-
.../context/CustomPassivatingContextImpl.java | 6 +-
.../apache/webbeans/context/DependentContext.java | 8 +-
.../webbeans/context/PassivatingContext.java | 2 +-
.../apache/webbeans/context/RequestContext.java | 8 +-
.../apache/webbeans/context/SessionContext.java | 4 +-
.../apache/webbeans/context/SingletonContext.java | 2 +-
.../ActivateRequestContextInterceptorBean.java | 22 +--
.../control/OwbRequestContextController.java | 8 +-
.../control/RequestContextControllerBean.java | 2 +-
.../control/RequestContextControllerProducer.java | 4 +-
.../context/creational/BeanInstanceBag.java | 4 +-
.../creational/CreationalContextFactory.java | 4 +-
.../context/creational/CreationalContextImpl.java | 10 +-
.../creational/DependentCreationalContext.java | 2 +-
.../creational/WrappedCreationalContext.java | 4 +-
.../webbeans/conversation/ConversationImpl.java | 6 +-
.../webbeans/conversation/ConversationManager.java | 16 +-
.../conversation/ConversationStorageBean.java | 16 +-
.../corespi/scanner/AbstractMetaDataDiscovery.java | 6 +-
.../webbeans/corespi/se/BaseSeContextsService.java | 20 +--
.../corespi/se/DefaultContextsService.java | 2 +-
.../corespi/se/StandaloneContextsService.java | 2 +-
.../webbeans/decorator/DecoratorComparator.java | 2 +-
.../webbeans/decorator/DecoratorsManager.java | 6 +-
.../webbeans/deployment/StereoTypeModel.java | 10 +-
.../org/apache/webbeans/el/ELContextStore.java | 6 +-
.../event/ContainerEventObserverMethodImpl.java | 10 +-
.../apache/webbeans/event/EventContextImpl.java | 4 +-
.../java/org/apache/webbeans/event/EventImpl.java | 10 +-
.../apache/webbeans/event/EventMetadataImpl.java | 6 +-
.../java/org/apache/webbeans/event/EventUtil.java | 4 +-
.../apache/webbeans/event/NotificationManager.java | 52 +++----
.../apache/webbeans/event/ObserverMethodImpl.java | 38 ++---
.../apache/webbeans/event/OwbObserverMethod.java | 4 +-
.../exception/DuplicateDefinitionException.java | 2 +-
.../InconsistentSpecializationException.java | 2 +-
.../exception/WebBeansConfigurationException.java | 2 +-
.../exception/WebBeansDeploymentException.java | 2 +-
.../apache/webbeans/inject/AbstractInjectable.java | 14 +-
.../webbeans/inject/AlternativesManager.java | 10 +-
.../webbeans/inject/InjectableConstructor.java | 6 +-
.../apache/webbeans/inject/InjectableField.java | 4 +-
.../apache/webbeans/inject/InjectableMethod.java | 14 +-
.../org/apache/webbeans/inject/OWBInjector.java | 8 +-
.../inject/impl/InjectionPointFactory.java | 31 ++--
.../webbeans/inject/impl/InjectionPointImpl.java | 20 +--
.../webbeans/inject/instance/InstanceImpl.java | 32 ++--
.../intercept/AbstractInvocationContext.java | 4 +-
.../ApplicationScopedBeanInterceptorHandler.java | 8 +-
.../ConstructorInterceptorInvocationContext.java | 6 +-
.../webbeans/intercept/DecoratorHandler.java | 8 +-
.../intercept/DefaultInterceptorHandler.java | 16 +-
.../webbeans/intercept/InterceptorComparator.java | 2 +-
.../intercept/InterceptorInvocationContext.java | 6 +-
.../intercept/InterceptorResolutionService.java | 42 ++---
.../apache/webbeans/intercept/InterceptorUtil.java | 4 +-
.../webbeans/intercept/InterceptorsManager.java | 10 +-
.../LifecycleInterceptorInvocationContext.java | 8 +-
.../NormalScopedBeanInterceptorHandler.java | 14 +-
.../RequestScopedBeanInterceptorHandler.java | 6 +-
.../SessionScopedBeanInterceptorHandler.java | 6 +-
.../webbeans/lifecycle/AbstractLifeCycle.java | 2 +-
.../webbeans/lifecycle/StandaloneLifeCycle.java | 10 +-
.../webbeans/logger/WebBeansLoggerFacade.java | 2 +-
.../webbeans/plugins/OpenWebBeansJmsPlugin.java | 2 +-
.../org/apache/webbeans/plugins/PluginLoader.java | 2 +-
.../webbeans/portable/AbstractAnnotated.java | 2 +-
.../portable/AbstractAnnotatedCallable.java | 6 +-
.../webbeans/portable/AbstractAnnotatedMember.java | 4 +-
.../portable/AbstractDecoratorInjectionTarget.java | 10 +-
.../portable/AbstractEjbInjectionTarget.java | 6 +-
.../apache/webbeans/portable/AbstractProducer.java | 20 +--
.../portable/AnnotatedConstructorImpl.java | 6 +-
.../webbeans/portable/AnnotatedElementFactory.java | 12 +-
.../webbeans/portable/AnnotatedFieldImpl.java | 4 +-
.../webbeans/portable/AnnotatedMethodImpl.java | 6 +-
.../webbeans/portable/AnnotatedParameterImpl.java | 4 +-
.../webbeans/portable/AnnotatedTypeImpl.java | 10 +-
.../webbeans/portable/BaseProducerProducer.java | 16 +-
.../webbeans/portable/BeanManagerProducer.java | 4 +-
.../webbeans/portable/BeanMetadataProducer.java | 4 +-
.../webbeans/portable/ConversationProducer.java | 10 +-
.../webbeans/portable/EventMetadataProducer.java | 8 +-
.../apache/webbeans/portable/EventProducer.java | 8 +-
.../webbeans/portable/ExtensionProducer.java | 6 +-
.../webbeans/portable/InjectionPointProducer.java | 10 +-
.../webbeans/portable/InjectionTargetImpl.java | 34 ++--
.../apache/webbeans/portable/InstanceProducer.java | 6 +-
.../LazyInterceptorDefinedInjectionTarget.java | 10 +-
.../apache/webbeans/portable/MetadataProducer.java | 4 +-
.../webbeans/portable/ProducerFieldProducer.java | 14 +-
.../webbeans/portable/ProducerMethodProducer.java | 12 +-
.../webbeans/portable/ProviderBasedProducer.java | 4 +-
.../portable/ProviderBasedProducerFactory.java | 8 +-
.../apache/webbeans/portable/ResourceProducer.java | 8 +-
.../webbeans/portable/events/ExtensionLoader.java | 10 +-
.../portable/events/ProcessAnnotatedTypeImpl.java | 6 +-
.../portable/events/ProcessBeanAttributesImpl.java | 8 +-
.../webbeans/portable/events/ProcessBeanImpl.java | 6 +-
.../portable/events/ProcessInjectionPointImpl.java | 8 +-
.../events/ProcessInjectionTargetImpl.java | 6 +-
.../portable/events/ProcessManagedBeanImpl.java | 4 +-
.../portable/events/ProcessObserverMethodImpl.java | 10 +-
.../portable/events/ProcessProducerFieldImpl.java | 6 +-
.../portable/events/ProcessProducerImpl.java | 8 +-
.../portable/events/ProcessProducerMethodImpl.java | 6 +-
.../portable/events/ProcessSessionBeanImpl.java | 8 +-
.../events/ProcessSyntheticAnnotatedTypeImpl.java | 8 +-
.../events/discovery/AfterBeanDiscoveryImpl.java | 32 ++--
.../discovery/AfterDeploymentValidationImpl.java | 2 +-
.../events/discovery/AfterTypeDiscoveryImpl.java | 8 +-
.../discovery/AnnotatedTypeConfiguratorHolder.java | 4 +-
.../events/discovery/BeforeBeanDiscoveryImpl.java | 18 +--
.../events/discovery/BeforeShutdownImpl.java | 2 +-
.../portable/events/discovery/ExtensionAware.java | 2 +-
.../events/generics/GProcessAnnotatedType.java | 2 +-
.../portable/events/generics/GProcessBean.java | 4 +-
.../events/generics/GProcessBeanAttributes.java | 4 +-
.../events/generics/GProcessInjectionPoint.java | 4 +-
.../events/generics/GProcessInjectionTarget.java | 2 +-
.../events/generics/GProcessManagedBean.java | 2 +-
.../events/generics/GProcessObserverMethod.java | 4 +-
.../portable/events/generics/GProcessProducer.java | 4 +-
.../events/generics/GProcessProducerField.java | 4 +-
.../events/generics/GProcessProducerMethod.java | 4 +-
.../events/generics/GProcessSessionBean.java | 8 +-
.../generics/GProcessSyntheticAnnotatedType.java | 4 +-
.../events/generics/GProcessSyntheticBean.java | 8 +-
.../generics/GProcessSyntheticObserverMethod.java | 8 +-
.../webbeans/proxy/AbstractProxyFactory.java | 2 +-
.../proxy/InterceptorDecoratorProxyFactory.java | 4 +-
.../webbeans/proxy/NormalScopeProxyFactory.java | 8 +-
.../apache/webbeans/proxy/OwbNormalScopeProxy.java | 4 +-
.../webbeans/proxy/SubclassProxyFactory.java | 4 +-
.../service/DefaultInjectionPointService.java | 8 +-
.../webbeans/service/DefaultLoaderService.java | 2 +-
.../org/apache/webbeans/util/AnnotationUtil.java | 8 +-
.../java/org/apache/webbeans/util/ClassUtil.java | 2 +-
.../webbeans/util/InjectionExceptionUtil.java | 10 +-
.../org/apache/webbeans/util/PriorityClasses.java | 4 +-
.../apache/webbeans/util/SpecializationUtil.java | 10 +-
.../apache/webbeans/util/WebBeansConstants.java | 4 +-
.../org/apache/webbeans/util/WebBeansUtil.java | 172 ++++++++-------------
.../META-INF/openwebbeans/openwebbeans.properties | 14 +-
...r => jakarta.enterprise.inject.spi.CDIProvider} | 1 +
.../webbeans/container/OwbCDIProviderTest.java | 10 +-
.../ActivateRequestContextInterceptorBeanTest.java | 14 +-
.../control/OwbRequestContextControllerTest.java | 4 +-
.../conversation/ConversationManagerTest.java | 2 +-
.../scanner/AbstractMetaDataDiscoveryTest.java | 8 +-
.../webbeans/portable/AnnotatedTypeImplTest.java | 2 +-
.../org/apache/webbeans/test/AbstractUnitTest.java | 8 +-
.../AnnotationWithArrayOfBooleanMember.java | 2 +-
.../binding/AnnotationWithArrayOfIntMember.java | 2 +-
.../binding/AnnotationWithArrayOfStringMember.java | 2 +-
.../binding/AnnotationWithBindingMember.java | 2 +-
.../binding/AnnotationWithNonBindingMember.java | 4 +-
.../test/annotation/binding/Asynchronous.java | 2 +-
.../webbeans/test/annotation/binding/Binding1.java | 2 +-
.../test/annotation/binding/Binding1Literal.java | 2 +-
.../webbeans/test/annotation/binding/Binding2.java | 2 +-
.../webbeans/test/annotation/binding/Cash.java | 2 +-
.../webbeans/test/annotation/binding/Check.java | 2 +-
.../annotation/binding/DummyAnnotationLiteral.java | 2 +-
.../binding/NonBindingAnnotationType.java | 4 +-
.../annotation/binding/NonBindingArrayType.java | 2 +-
.../webbeans/test/annotation/binding/NotAny.java | 2 +-
.../test/annotation/binding/NotAnyLiteral.java | 2 +-
.../test/annotation/binding/ParameterBinding1.java | 2 +-
.../test/annotation/binding/ParameterBinding2.java | 2 +-
.../test/annotation/binding/ParameterBinding3.java | 2 +-
.../webbeans/test/annotation/binding/PayBy.java | 2 +-
.../test/annotation/binding/ProducerBinding1.java | 2 +-
.../test/annotation/binding/ProducerBinding2.java | 2 +-
.../webbeans/test/annotation/binding/Role.java | 2 +-
.../webbeans/test/annotation/binding/Service.java | 2 +-
.../test/annotation/binding/SingletonBinding.java | 2 +-
.../test/annotation/binding/Synchronous.java | 2 +-
.../test/annotation/binding/TestingIfExists.java | 2 +-
.../annotation/binding/TestingIfNonExists.java | 2 +-
.../test/annotation/binding/TestingNormal.java | 2 +-
.../webbeans/test/annotation/binding/Users.java | 2 +-
.../test/bean/SerializableBeanEqualTest.java | 15 +-
.../test/bean/ThirdPartyBeanLookupTest.java | 28 ++--
.../webbeans/test/component/BindingComponent.java | 2 +-
.../test/component/CheckWithCheckPayment.java | 4 +-
.../CheckWithCheckPaymentDecoratorField.java | 2 +-
.../test/component/CheckWithMoneyPayment.java | 2 +-
.../test/component/ContainUserComponent.java | 6 +-
.../test/component/ContaintsCurrentComponent.java | 6 +-
.../test/component/CurrentBindingComponent.java | 6 +-
.../test/component/DisposalMethodComponent.java | 12 +-
.../component/InjectedTypeLiteralComponent.java | 6 +-
.../test/component/NonBindingComponent.java | 4 +-
.../test/component/PaymentProcessorComponent.java | 6 +-
.../test/component/PostConstructComponent.java | 6 +-
.../PostConstructDoubleInterceptorComponent.java | 8 +-
.../PostConstructInterceptorComponent.java | 8 +-
.../test/component/PreDestroyComponent.java | 8 +-
.../apache/webbeans/test/component/Singleton.java | 6 +-
.../test/component/TypeLiteralComponent.java | 4 +-
.../webbeans/test/component/UserComponent.java | 4 +-
.../component/binding/AnyBindingComponent.java | 2 +-
...ndingWithNonBindingAnnotationTypeComponent.java | 4 +-
.../BindingWithNonBindingArrayTypeComponent.java | 2 +-
.../broken/DelegateAttributeIsnotInterface.java | 4 +-
...ateAttributeMustImplementAllDecoratedTypes.java | 4 +-
.../broken/MoreThanOneDelegateAttribute.java | 4 +-
.../decorator/broken/PaymentDecorator.java | 8 +-
.../decorator/clean/AccountComponent.java | 4 +-
.../decorator/clean/LargeTransactionDecorator.java | 6 +-
.../decorator/clean/ServiceDecorator.java | 8 +-
.../ServiceDecoratorWithCtInjectionPoint.java | 8 +-
.../component/definition/BeanTypesDefinedBean.java | 6 +-
.../component/dependent/DependentComponent.java | 2 +-
.../dependent/DependentOwnerComponent.java | 6 +-
.../dependent/MultipleDependentComponent.java | 6 +-
.../component/dependent/circular/DependentA.java | 6 +-
.../component/dependent/circular/DependentB.java | 2 +-
.../test/component/disposal/Disposal1.java | 10 +-
.../event/broken/BrokenObserverComponent1.java | 2 +-
.../event/broken/BrokenObserverComponent2.java | 2 +-
.../event/broken/BrokenObserverComponent3.java | 4 +-
.../event/broken/BrokenObserverComponent4.java | 4 +-
.../event/broken/BrokenObserverComponent5.java | 4 +-
.../event/broken/BrokenObserverComponent6.java | 4 +-
.../event/normal/ComponentWithObservable1.java | 10 +-
.../event/normal/ComponentWithObserves1.java | 6 +-
.../event/normal/ComponentWithObserves2.java | 4 +-
.../event/normal/ComponentWithObserves3.java | 10 +-
.../event/normal/ComponentWithObserves4.java | 8 +-
.../event/normal/ComponentWithObserves5.java | 10 +-
.../event/normal/ComponentWithObserves6.java | 4 +-
.../event/normal/ComponentWithObserves7.java | 8 +-
.../test/component/event/normal/Transactional.java | 2 +-
.../event/normal/TransactionalInterceptor.java | 14 +-
.../AroundInvokeWithFinalMethodComponent.java | 4 +-
.../AroundInvokeWithSameMethodNameComponent.java | 4 +-
.../AroundInvokeWithStaticMethodComponent.java | 4 +-
.../AroundInvokeWithWrongReturnTypeComponent.java | 4 +-
.../AroundInvokeWithoutParameterComponent.java | 2 +-
.../AroundInvokeWithoutReturnTypeComponent.java | 4 +-
.../MoreThanOneAroundInvokeComponent.java | 4 +-
.../MoreThanOneConstructureComponent.java | 2 +-
.../MoreThanOneConstructureComponent2.java | 2 +-
.../MoreThanOnePostConstructComponent.java | 2 +-
.../exception/MultipleDisposalMethodComponent.java | 8 +-
.../exception/NewComponentBindingComponent.java | 30 ----
.../exception/NewComponentInterfaceComponent.java | 30 ----
.../NewMethodComponentBindingComponent.java | 37 -----
...ContructMethodHasCheckedExceptionComponent.java | 2 +-
.../PostContructMethodHasParameterComponent.java | 2 +-
.../PostContructMethodHasReturnTypeComponent.java | 2 +-
.../PostContructMethodHasStaticComponent.java | 2 +-
.../exception/ProducerTypeExceptionComponent.java | 2 +-
.../exception/ProducerTypeStaticComponent.java | 2 +-
.../exception/initializer/BrokenInitializer1.java | 4 +-
.../exception/initializer/BrokenInitializer2.java | 4 +-
.../exception/initializer/BrokenInitializer3.java | 4 +-
.../exception/initializer/BrokenInitializer4.java | 4 +-
...ponentDefaultScopeWithDifferentScopeSteros.java | 2 +-
.../ComponentDefaultScopeWithNonScopeStero.java | 2 +-
.../component/inheritance/types/InhBinding1.java | 2 +-
.../component/inheritance/types/InhBinding2.java | 2 +-
.../inheritance/types/InhIntBinding1.java | 2 +-
.../inheritance/types/InhIntBinding2.java | 2 +-
.../component/inheritance/types/InhScopeType1.java | 2 +-
.../component/inheritance/types/InhScopeType2.java | 2 +-
.../component/inheritance/types/InhStereo1.java | 2 +-
.../component/inheritance/types/InhStereo2.java | 2 +-
.../inject/alternative/AlternativeComponent.java | 2 +-
.../inject/alternative/AlternativeInjector.java | 4 +-
.../broken/InstanceInjectedBrokenComponent1.java | 6 +-
.../broken/InstanceInjectedBrokenComponent2.java | 6 +-
.../broken/InstanceInjectedBrokenComponent3.java | 6 +-
.../broken/InstanceInjectedBrokenComponent4.java | 6 +-
.../broken/InstanceInjectedWorkingComponent.java | 6 +-
.../inject/generic/GenericComponentInjector.java | 4 +-
.../inject/named/NamedFieldWithNamedValue.java | 4 +-
.../inject/named/NamedFieldWithoutNamedValue.java | 4 +-
.../inject/named/NamedOtherWithNamedValue.java | 4 +-
.../inject/named/NamedOtherWithoutNamedValue.java | 4 +-
.../named/NamedPayment_PaymentProcessor.java | 4 +-
.../component/inject/named/NamedPayment_Value.java | 4 +-
.../component/intercept/InterceptedComponent.java | 8 +-
.../test/component/intercept/Interceptor1.java | 6 +-
.../test/component/intercept/Interceptor2.java | 6 +-
.../intercept/InterceptorWithSuperClass.java | 4 +-
...erceptorWithSuperClassInterceptedComponent.java | 8 +-
...dInterceptedWithClassInterceptorsComponent.java | 6 +-
...terceptedWithoutClassInterceptorsComponent.java | 8 +-
.../intercept/MultipleInterceptedComponent.java | 8 +-
.../MultipleListOfInterceptedComponent.java | 4 +-
...ListOfInterceptedWithExcludeClassComponent.java | 10 +-
.../component/intercept/MultpleInterceptor.java | 4 +-
.../intercept/NoArgConstructorInterceptor.java | 4 +-
.../NoArgConstructorInterceptorComponent.java | 2 +-
.../intercept/PostConstructInterceptor.java | 4 +-
.../intercept/webbeans/ActionInterceptor.java | 6 +-
.../webbeans/EnhancedActionInterceptor.java | 6 +-
.../webbeans/SecureAndTransactionalComponent.java | 2 +-
.../SecureAndTransactionalInterceptor.java | 6 +-
.../intercept/webbeans/SecureComponent.java | 2 +-
.../intercept/webbeans/SecureInterceptor.java | 8 +-
.../component/intercept/webbeans/ShoppingCard.java | 2 +-
.../webbeans/TransactionalInterceptor.java | 6 +-
.../webbeans/TransactionalInterceptor2.java | 6 +-
.../intercept/webbeans/WInterceptorComponent.java | 2 +-
.../webbeans/WMetaInterceptorComponent.java | 2 +-
.../intercept/webbeans/bindings/Action.java | 2 +-
.../webbeans/bindings/RuntimeExceptions.java | 2 +-
.../intercept/webbeans/bindings/Secure.java | 4 +-
.../intercept/webbeans/bindings/Secure2.java | 4 +-
.../intercept/webbeans/bindings/Transactional.java | 2 +-
.../webbeans/test/component/library/BookShop.java | 8 +-
.../literals/InstanceTypeLiteralBean.java | 10 +-
.../pfield/ProducerFieldDefinitionComponent.java | 8 +-
.../ProducerFieldDefinitionParameterized.java | 2 +-
.../pfield/ProducerFieldInjectedComponent.java | 4 +-
.../pfield/ProducerFieldInjectedWrongType.java | 2 +-
.../pfield/broken/TypeVariableProducerField.java | 2 +-
.../component/producer/ParametrizedProducer.java | 4 +-
.../test/component/producer/Producer1.java | 8 +-
.../test/component/producer/Producer2.java | 4 +-
.../test/component/producer/Producer3.java | 4 +-
.../test/component/producer/Producer4.java | 2 +-
.../producer/Producer4ConsumerComponent.java | 4 +-
.../component/producer/ScopeAdaptorComponent.java | 6 +-
.../producer/ScopeAdaptorInjectorComponent.java | 4 +-
.../test/component/producer/StaticProducer1.java | 6 +-
.../producer/broken/BrokenProducerComponent1.java | 4 +-
.../producer/broken/BrokenProducerComponent2.java | 4 +-
.../producer/broken/BrokenProducerComponent3.java | 6 +-
.../producer/broken/BrokenProducerComponent4.java | 4 +-
.../producer/broken/BrokenProducerComponent5.java | 4 +-
.../producer/broken/BrokenProducerComponent6.java | 2 +-
.../producer/primitive/PrimitiveConsumer.java | 6 +-
.../producer/primitive/PrimitiveProducer.java | 4 +-
.../producer/specializes/SpecializesProducer1.java | 4 +-
.../specializes/SpecializesProducerParentBean.java | 2 +-
.../superclazz/SpecializesProducer1SuperClazz.java | 2 +-
.../test/component/service/InjectedComponent.java | 2 +-
.../service/Producer1ConsumerComponent.java | 6 +-
.../test/component/service/ServiceImpl1.java | 2 +-
.../webbeans/test/component/service/Typed2.java | 2 +-
.../test/component/service/TypedInjection.java | 4 +-
.../service/TypedInjectionWithoutArguments.java | 4 +-
.../specializes/AsynhrounousSpecalizesService.java | 6 +-
.../SpecializesServiceInjectorComponent.java | 6 +-
.../specializes/logger/DefaultLogger.java | 2 +-
.../specializes/logger/LoggerBinding.java | 2 +-
.../logger/MockNotSpecializedLogger.java | 2 +-
.../specializes/logger/MockSpecializedLogger.java | 4 +-
.../specializes/logger/SpecializedInjector.java | 2 +-
.../test/component/third/ThirdPartyExtension.java | 19 +--
.../third/ThirdPartyProgrammaticLookupTest.java | 2 +-
.../alternativebean/CustomAlternativeBean.java | 16 +-
.../alternatives/common/AlternativeBean.java | 2 +-
.../AlternativeOnClassAndProducerMethodBean.java | 4 +-
.../common/AlternativeOnClassOnlyBean.java | 4 +-
.../AlternativeOnProducerMethodOnlyBean.java | 4 +-
.../AlternativeWithEvenHigherPriorityBean.java | 4 +-
.../common/AlternativeWithHighPriorityBean.java | 4 +-
.../common/AlternativeWithPriorityBean.java | 4 +-
.../common/AlternativeWithSamePriorityBean.java | 4 +-
.../alternatives/common/DefaultBeanProducer.java | 4 +-
.../common/DefaultBeanProducerWithoutDisposes.java | 2 +-
.../test/concepts/alternatives/common/Pen.java | 2 +-
.../alternatives/common/PencilProducerBean.java | 4 +-
.../common/QualifierProducerBased.java | 2 +-
.../alternatives/common/SimpleInjectionTarget.java | 6 +-
.../alternatives/common/YetAnotherPencil.java | 2 +-
.../tests/AlternativeBeanResolvingTest.java | 4 +-
.../tests/AlternativeInstanceTest.java | 4 +-
.../tests/AlternativeOnProducerFieldTest.java | 4 +-
.../tests/AlternativeProducerMethodTest.java | 2 +-
.../tests/CustomAlternativeBeanTest.java | 12 +-
.../BrokenInitializerMethodBecauseofGeneric.java | 5 +-
.../test/concepts/stereotypes/MyStereoType1.java | 2 +-
.../test/concepts/stereotypes/MyStereoType2.java | 4 +-
.../test/concepts/typeliterals/MyType.java | 2 +-
.../test/concepts/vetoes/VetoedPackageTest.java | 2 +-
.../vetoes/vetoedpackage/package-info.java | 2 +-
.../webbeans/test/config/BeansDeployerTest.java | 10 +-
.../AnnotatedTypeConfiguratorImplTest.java | 16 +-
.../BeanAttributesConfiguratorImplTest.java | 10 +-
.../test/configurator/DefaultQualifierTest.java | 10 +-
...erMethodConfiguratorAfterBeanDiscoveryTest.java | 16 +-
.../ComponentResolutionByTypeTest.java | 2 +-
.../webbeans/test/contexts/SerializationTest.java | 10 +-
.../contexts/StandaloneContextsServiceTest.java | 2 +-
.../conversation/ConversationScopedBean.java | 6 +-
.../conversation/ConversationScopedInitBean.java | 6 +-
.../conversation/ConversationScopedTest.java | 6 +-
.../conversation/EndConversationObserver.java | 8 +-
.../test/contexts/serialize/AppScopedBean.java | 2 +-
.../test/contexts/serialize/SessScopedBean.java | 4 +-
.../contexts/session/common/AppScopedBean.java | 14 +-
.../contexts/session/common/PersonalDataBean.java | 8 +-
.../contexts/session/tests/SessionContextTest.java | 4 +-
.../threadsafety/LongInitApplicationBean.java | 4 +-
.../ThreadSafeBeanInitialisationTest.java | 8 +-
.../test/decorators/broken/BrokenAlternative.java | 8 +-
.../test/decorators/broken/BrokenName.java | 8 +-
.../test/decorators/broken/BrokenScope.java | 8 +-
.../test/decorators/broken/ValidDecorator.java | 6 +-
.../decorators/common/ConversationDecorator.java | 8 +-
.../test/decorators/common/GarphlyDecorator.java | 6 +-
.../DecoratorConstructorInjectionTest.java | 12 +-
.../decorators/dependent/DependentDecorator.java | 8 +-
.../test/decorators/generic/DecoratedBean.java | 4 +-
.../decorators/generic/ExtendedDecoratedBean.java | 2 +-
.../generic/ExtendedGenericInterface.java | 2 +-
.../generic/ExtendedSampleDecorator.java | 8 +-
.../test/decorators/generic/SampleDecorator.java | 8 +-
.../test/decorators/multiple/Decorator1.java | 6 +-
.../test/decorators/multiple/Decorator2.java | 12 +-
.../test/decorators/multiple/Decorator3.java | 18 +--
.../test/decorators/multiple/Decorator4.java | 12 +-
.../decorators/multiple/MultipleCallDecorator.java | 6 +-
.../test/decorators/multiple/MyIntercept.java | 2 +-
.../decorators/multiple/OutputInterceptor.java | 8 +-
.../test/decorators/multiple/OutputProvider.java | 6 +-
.../test/decorators/multiple/OutsideBean.java | 4 +-
.../decorators/multiple/RequestStringBuilder.java | 2 +-
.../test/decorators/simple/LogDecorator.java | 8 +-
.../webbeans/test/decorators/simple/MyLog.java | 2 +-
.../webbeans/test/decorators/simple/OtherLog.java | 2 +-
.../decorators/simple/SimpleDecoratorTest.java | 6 +-
.../tests/ConversationDecoratorTest.java | 8 +-
.../tests/DecoratorAndInterceptorStackTests.java | 8 +-
.../decorators/tests/DecoratorInheritanceTest.java | 6 +-
.../tests/DependentDecoratorDestroyTest.java | 8 +-
.../tests/ExtendedGenericDecoratorTest.java | 14 +-
.../ExtendedMulitpleGenericDecoratorTest.java | 10 +-
.../decorators/tests/GenericDecoratorTest.java | 2 +-
.../tests/MultipleCallDecoratorTest.java | 6 +-
.../tests/MultipleDecoratorStackTests.java | 6 +-
.../tests/RepeatedGenericTypeDecoratorTest.java | 8 +-
.../proxyable/ProxyableBeanTypeTest.java | 2 +-
.../beans/BeanWithPrivateFinalMethod.java | 2 +-
.../proxyable/beans/BeanWithPublicFinalMethod.java | 2 +-
.../proxyable/beans/NonAbstractSubClassBean.java | 2 +-
.../proxyable/beans/SubClassWithNormalScope.java | 2 +-
.../InterceptorAnnotatedDiscoveryTest.java | 12 +-
.../test/disposes/DependentMethodBeanTest.java | 6 +-
.../test/disposes/DisposerMethodBeanTest.java | 10 +-
.../webbeans/test/disposes/StaticProducerTest.java | 16 +-
.../test/disposes/beans/AppScopedBean.java | 17 +-
.../disposes/beans/DependentModelProducer.java | 10 +-
.../test/disposes/beans/DisposerMethodBean.java | 15 +-
.../test/disposes/beans/InjectedIntoBean.java | 6 +-
.../disposes/beans/IntermediateDependentBean.java | 2 +-
.../test/disposes/beans/RequestModelProducer.java | 12 +-
.../disposes/beans/broken/BrokenDisposalTest.java | 2 +-
.../beans/broken/DecoratorWithDisposes.java | 8 +-
.../beans/broken/InterceptorWithDisposes.java | 8 +-
.../beans/broken/NonProducerBeanWithDisposes.java | 2 +-
.../webbeans/test/disposes/common/HttpHeader.java | 2 +-
.../test/disposes/common/RequestModel.java | 4 +-
.../webbeans/test/event/LoggedInObserver.java | 6 +-
.../test/event/TypeArgumentInterfaceObserver.java | 6 +-
.../webbeans/test/event/TypeArgumentObserver.java | 6 +-
.../webbeans/test/event/broke/BrokenObserver.java | 6 +-
.../test/events/async/ObserversAsyncTest.java | 6 +-
.../container/SpecificContainerEventTest.java | 10 +-
.../container/WildcardExtensionMatchingTest.java | 30 ++--
.../ShouldNotCatchExtensionEventBean.java | 10 +-
.../test/events/generics/GenericObserverTest.java | 8 +-
.../injectiontarget/ProcessBeanAttributesTest.java | 18 +--
.../injectiontarget/ProcessInjectionPointTest.java | 18 +--
.../ProcessInjectionTargetTest.java | 12 +-
.../ReplaceInjectionTargetTest.java | 16 +-
.../webbeans/test/events/observer/BeanA.java | 4 +-
.../webbeans/test/events/observer/BeanB.java | 2 +-
.../test/events/observer/EventSourceOwnerBean.java | 6 +-
.../webbeans/test/events/observer/EventTest.java | 18 +--
.../webbeans/test/events/observer/Litographer.java | 4 +-
.../webbeans/test/events/observer/Painter.java | 4 +-
.../webbeans/test/events/observer/Superclass.java | 2 +-
.../AlternativeSpecializedFactory.java | 4 +-
.../EventSourceOwnerBean.java | 6 +-
.../events/specializedalternative/Factory.java | 2 +-
.../beans/CircularApplicationScopedBean.java | 6 +-
...arConstructorOrProducerMethodParameterBean.java | 6 +-
.../beans/CircularDependentScopedBean.java | 6 +-
.../beans/CircularNormalInConstructor.java | 6 +-
.../CircularInjectionIntoConstructorTest.java | 4 +-
.../injection/constructor/beans/Administrator.java | 4 +-
.../BeanWithSingleParamInjectConstructor.java | 2 +-
.../beans/BeanWithTwoParamInjectConstructor.java | 2 +-
.../test/injection/constructor/beans/User.java | 2 +-
.../ArrayOuttOfBouncExceptionFromMLTest.java | 2 +-
.../webbeans/test/injection/generics/Bar.java | 6 +-
.../test/injection/generics/BarVetoExtension.java | 6 +-
.../test/injection/generics/BazEnumProducer.java | 2 +-
.../generics/FastMatchingGenericsTest.java | 4 +-
.../webbeans/test/injection/generics/Foo.java | 2 +-
.../test/injection/generics/GenericBeanTest.java | 2 +-
.../test/injection/generics/GenericFactory.java | 2 +-
.../test/injection/generics/GenericQualifier.java | 2 +-
.../test/injection/generics/GenericsTest.java | 10 +-
.../webbeans/test/injection/generics/MyBean.java | 4 +-
.../test/injection/generics/StringBean.java | 2 +-
.../injection/generics/StringBeanAbstract.java | 2 +-
.../webbeans/test/injection/generics/UsingBaz.java | 2 +-
.../generics/zoo/GenericsInTheZooTest.java | 4 +-
.../test/injection/generics/zoo/HorseStable.java | 2 +-
.../test/injection/generics/zoo/PigStable.java | 2 +-
.../test/injection/generics/zoo/Stable.java | 2 +-
.../injection/generics/zoo/StableProducer.java | 6 +-
.../beans/AbstractInjectionPointOwner.java | 2 +-
.../beans/ConstructorInjectionPointOwner.java | 8 +-
.../beans/FieldInjectionPointOwner.java | 6 +-
.../beans/InjectionPointBeansOwner.java | 6 +-
.../beans/InjectionPointMetaDataOwner.java | 8 +-
.../beans/InjectionPointObserver.java | 4 +-
.../beans/InjectionPointOwnerInstance.java | 4 +-
.../beans/InjectionPointOwnerProducer.java | 6 +-
.../injectionpoint/beans/LoggerInjectedBean.java | 6 +-
.../beans/MethodInjectionPointOwner.java | 6 +-
.../injectionpoint/beans/MyContainer.java | 2 +-
.../beans/ProducerInjectionPointInstanceOwner.java | 4 +-
.../beans/ProducerMethodInjectionPointOwner.java | 2 +-
.../injectionpoint/beans/PropertyHolder.java | 4 +-
.../beans/PropertyHolderFactory.java | 6 +-
.../injectionpoint/beans/PropertyInjector.java | 4 +-
.../beans/UnmanagedClassWithInjectionPoints.java | 2 +-
.../injectionpoint/common/LoggerQualifier.java | 2 +-
.../test/injection/named/DefaultNamedBean.java | 2 +-
.../webbeans/test/injection/named/NamedBean.java | 2 +-
.../test/injection/named/NamedInjectionPoints.java | 4 +-
.../webbeans/test/injection/named/NamedTests.java | 12 +-
.../injection/noncontextual/ContextualBean.java | 2 +-
.../noncontextual/InjectNonContextualTest.java | 16 +-
.../injection/noncontextual/NonContextualBean.java | 2 +-
.../ProducerWithNonSerializableParameterBean.java | 4 +-
.../ProducerWithNonSerializableResultBean.java | 4 +-
.../serialization/beans/SerializableBean.java | 2 +-
.../SerializableDependentInjectionTarget.java | 4 +-
.../beans/SerializableInjectionTargetFailA.java | 4 +-
.../webbeans/test/injection/typed/NotInTyped.java | 2 +-
.../webbeans/test/injection/typed/Raven.java | 2 +-
.../test/injection/typed/TypedFieldProducer.java | 6 +-
.../test/injection/typed/TypedMethodProducer.java | 6 +-
.../test/injection/typed/TypedProducerTest.java | 2 +-
.../injection/typeliteral/TypeLiteralTest.java | 4 +-
.../webbeans/test/injection/unused/UnusedBean.java | 2 +-
.../test/injection/unused/UnusedBeanDeclarer.java | 2 +-
.../test/injection/unused/UnusedBeanProducer.java | 6 +-
.../test/injection/unused/UnusedBeanTest.java | 2 +-
.../webbeans/test/instance/CdiCurrentTest.java | 8 +-
.../webbeans/test/instance/CustomProviderTest.java | 16 +-
.../test/instance/InstanceDestroyalTest.java | 22 +--
.../test/instance/InstanceInjectionPointTest.java | 20 +--
.../test/instance/InstanceIteratorTest.java | 20 +--
.../InstanceQualifierInjectionPointTest.java | 18 +--
.../webbeans/test/instance/InstanceSelectTest.java | 10 +-
.../test/instance/InstanceWithTypedTest.java | 8 +-
.../DependentInterceptorBindingType.java | 2 +-
.../interceptors/annotation/LoggingStereoType.java | 2 +-
.../interceptors/annotation/SecureStereoType.java | 2 +-
.../interceptors/beans/ApplicationScopedBean.java | 4 +-
.../interceptors/beans/DependentScopedBean.java | 6 +-
.../test/interceptors/beans/RequestScopedBean.java | 8 +-
.../interceptors/broken/BrokenAlternative.java | 6 +-
.../test/interceptors/broken/BrokenName.java | 6 +-
.../test/interceptors/broken/BrokenScope.java | 6 +-
.../common/RuntimeExceptionBindingTypeBean.java | 2 +-
.../business/common/TransactionalBaseBean.java | 2 +-
.../business/common/TransactionalChildBean.java | 2 +-
.../common/WithInheritedBindingTypeBean.java | 4 +-
.../WithInheritedStereoTypeInterceptorBean.java | 4 +-
.../common/WithStereoTypeInterceptorBean.java | 4 +-
.../business/tests/DependingInterceptorTest.java | 6 +-
.../business/tests/InterceptorPerformanceTest.java | 6 +-
.../business/tests/MultiRequestProxyTest.java | 2 +-
.../interceptors/business/tests/NewProxyTest.java | 12 +-
.../tests/WithInheritedBindingTypeTest.java | 6 +-
.../WithInheritedStereoTypeInterceptorTest.java | 4 +-
.../tests/WithStereoTypeInterceptorTest.java | 4 +-
.../interceptors/common/DependentInterceptor.java | 6 +-
.../common/RuntimeExceptionsInterceptor.java | 6 +-
.../interceptors/common/SecureInterceptor.java | 6 +-
.../common/TransactionInterceptor.java | 6 +-
.../constructor/AroundConstructTest.java | 12 +-
...rceptionOfBeanWithConstructorInjectionTest.java | 10 +-
.../dependent/DependentInterceptorTest.java | 4 +-
.../dependent/DependentLifecycleBean.java | 6 +-
.../dependent/DependentLifecycleTest.java | 4 +-
.../interceptors/dependent/DependentSuperBean.java | 4 +-
.../test/interceptors/dependent/MyExtraSuper.java | 4 +-
.../test/interceptors/ejb/EjbInterceptor.java | 4 +-
.../interceptors/ejb/EjbInterceptorExtension.java | 12 +-
.../ejb/ManagedBeanWithEjbInterceptor.java | 4 +-
.../ejb/ManagedBeanWithMethodEjbInterceptor.java | 4 +-
.../ejb/ManagedBeanWithoutInterceptor.java | 2 +-
.../extension/BeforeBeanDiscoveryImplTest.java | 28 ++--
.../InterceptorDecoratorProxyFactoryTest.java | 12 +-
.../factory/NormalScopeProxyFactoryTest.java | 19 +--
.../interceptors/factory/ProtectedUsageBean.java | 4 +-
.../factory/SubPackageInterceptedClass.java | 6 +-
.../factory/beans/ClassInterceptedClass.java | 6 +-
.../factory/beans/ClassMultiInterceptedClass.java | 6 +-
.../interceptors/factory/beans/DecoratedClass.java | 2 +-
.../beans/InterceptionFactoryBeansProducer.java | 8 +-
.../factory/beans/MyAbstractTestDecorator.java | 6 +-
.../factory/beans/PartialBeanClass.java | 2 +-
.../factory/beans/Secure2Interceptor.java | 6 +-
.../interceptors/factory/beans/SomeBaseClass.java | 2 +-
.../beans/TonsOfMethodsInterceptedClass.java | 2 +-
.../factory/beans/TransactionalInterceptor.java | 6 +-
.../factory/beans/UnproxyableClassProducer.java | 6 +-
.../inheritance/BindingIncludedByIndirect.java | 2 +-
.../inheritance/BindingIndirectInterceptor.java | 2 +-
.../BindingInheritedIncludedByIndirect.java | 2 +-
.../inheritance/BindingInheritedInterceptor.java | 2 +-
.../inheritance/BindingMethodInterceptor.java | 2 +-
.../inheritance/BindingSimpleInterceptor.java | 2 +-
.../test/interceptors/inheritance/Deck.java | 4 +-
.../test/interceptors/inheritance/DeckChild.java | 4 +-
.../interceptors/inheritance/DeckStereotyped.java | 4 +-
.../inheritance/DeckStereotypedChild.java | 4 +-
.../inheritance/DeckStereotypedGrandchild.java | 4 +-
.../inheritance/DeckStereotypedNotInherited.java | 4 +-
.../DeckStereotypedNotInheritedChild.java | 4 +-
.../inheritance/InheritedInterceptorTest.java | 4 +-
.../inheritance/InterceptorIncludedByIndirect.java | 8 +-
.../inheritance/InterceptorInherited.java | 8 +-
.../InterceptorInheritedIncludedByIndirect.java | 8 +-
.../inheritance/InterceptorMethod.java | 8 +-
.../inheritance/InterceptorSimple.java | 8 +-
.../interceptors/inheritance/StereotypeChild.java | 2 +-
.../interceptors/inheritance/StereotypeParent.java | 2 +-
.../inheritance/StereotypeParentNotInherited.java | 2 +-
.../lifecycle/InterceptorExtension.java | 10 +-
.../test/interceptors/lifecycle/LifecycleBean.java | 20 ++-
.../lifecycle/LifecycleInterceptor.java | 8 +-
.../lifecycle/LifecycleInterceptorBbd.java | 10 +-
.../lifecycle/LifecycleInterceptorPat.java | 8 +-
.../test/interceptors/lifecycle/LifecycleTest.java | 7 +-
.../interceptors/lifecycle/NotAnnotatedBean.java | 2 +-
.../inheritance/LifecycleInheritanceTest.java | 4 +-
.../LifecycleInheritedOverridenTest.java | 4 +-
.../lifecycle/inheritance/SubClassBean.java | 6 +-
.../inheritance/SubClassInheritedBean.java | 2 +-
.../lifecycle/inheritance/SuperClassBean.java | 4 +-
.../resolution/CdiInterceptorBeanBuilderTest.java | 8 +-
.../resolution/EjbInterceptorBeanBuilderTest.java | 8 +-
.../resolution/InterceptBridgeMethodTest.java | 2 +-
.../resolution/InterceptorProxyChainTest.java | 10 +-
.../InterceptorResolutionServiceTest.java | 8 +-
.../resolution/SelfInterceptorBeanBuilderTest.java | 2 +-
.../resolution/beans/UtilitySampleBean.java | 2 +-
.../interceptors/SelfInterceptedClass.java | 6 +-
.../interceptors/SelfInterceptionSubclass.java | 6 +-
.../resolution/interceptors/TestIntercepted1.java | 2 +-
.../resolution/interceptors/TestInterceptor1.java | 14 +-
.../interceptors/TestInterceptorParent.java | 10 +-
.../test/lifecycle/ExceptionOnCallbackTest.java | 6 +-
.../webbeans/test/managed/ProxyFactoryTest.java | 28 ++--
.../test/managed/generic/GenericInjectionTest.java | 4 +-
.../instance/InjectedInstanceComponentTest.java | 8 +-
.../test/managed/instance/beans/DependentBean.java | 4 +-
.../instance/beans/DependentBeanProducer.java | 6 +-
.../instance/beans/InstanceForDependentBean.java | 6 +-
.../instance/beans/InstanceInjectedComponent.java | 8 +-
.../test/managed/instance/beans/MeaningOfLife.java | 4 +-
.../multipleinterfaces/MyEntityServiceImpl.java | 2 +-
.../test/managed/newcomp/NewComponent.java | 43 ------
.../test/managed/newcomp/NewComponentTest.java | 74 ---------
.../test/managed/newcomp/ProducerNewComponent.java | 49 ------
.../specialized/SpecializeDeactivationTest.java | 10 +-
.../org/apache/webbeans/test/mock/MockManager.java | 64 +++-----
.../performance/BeanResolvingPerformanceTest.java | 4 +-
.../test/performance/StartupPerformanceTest.java | 2 -
.../test/portable/AnnotatedTypeImplTest.java | 12 +-
.../webbeans/test/portable/BeanInjectionTest.java | 4 +-
.../webbeans/test/portable/BeanManagerTest.java | 2 +-
.../test/portable/BeforeBeanDiscoveryTest.java | 18 +--
.../test/portable/CustomBeanDestroyCalledTest.java | 36 ++---
.../test/portable/CustomPrioritizedBeanTest.java | 28 ++--
.../webbeans/test/portable/ExtensionTest.java | 8 +-
.../GetInjectionPointFromCustomBeanCreateTest.java | 28 ++--
.../webbeans/test/portable/PortableTests.java | 22 +--
.../webbeans/test/portable/WithAnnotationTest.java | 12 +-
.../AddAdditionalAnnotatedTypeExtension.java | 14 +-
.../webbeans/test/portable/alternative/Egg.java | 4 +-
.../test/portable/alternative/HalfEgg.java | 4 +-
.../test/portable/alternative/WoodEgg.java | 4 +-
.../events/AfterBeanDiscoveryEventTest.java | 14 +-
.../test/portable/events/ExtensionTest.java | 2 +-
.../test/portable/events/PortableAddBeanTest.java | 14 +-
.../portable/events/ProcessObserverMethodTest.java | 4 +-
.../webbeans/test/portable/events/beans/Apple.java | 2 +-
.../test/portable/events/beans/PortableType1.java | 12 +-
.../events/extensions/AddBeanExtension.java | 20 +--
.../extensions/AddObserverMethodExtension.java | 14 +-
.../events/extensions/AlternativeExtension.java | 10 +-
.../portable/events/extensions/AppleExtension.java | 8 +-
.../events/extensions/AppleExtension1.java | 8 +-
.../extensions/MessageReceiverExtension.java | 6 +-
.../events/extensions/MessageSenderExtension.java | 10 +-
.../portable/events/extensions/MyExtension.java | 24 +--
.../events/extensions/NotAppleExtnsion.java | 8 +-
.../extensions/ProcessObserverMethodExtension.java | 8 +-
.../events/extensions/RawTypeExtension.java | 6 +-
.../portable/events/extensions/TreeExtension.java | 6 +-
.../events/extensions/TypeVariableExtension.java | 6 +-
.../events/extensions/WildcardExtension.java | 6 +-
.../extensions/WrongTypeVariableExtension.java | 6 +-
.../events/extensions/WrongWildcardExtension.java | 6 +-
.../errors/AfterBeanDiscoveryErrorExtension.java | 6 +-
.../errors/AfterBeansValidationErrorExtension.java | 6 +-
.../injectiontarget/InjectionTargetTest.java | 16 +-
.../test/portable/injectiontarget/PersonModel.java | 2 +-
.../injectiontarget/customtarget/CustomTarget.java | 4 +-
.../CustomTargetNoConstructorTest.java | 10 +-
.../injectiontarget/supportInjections/Chair.java | 2 +-
.../supportInjections/SupportInjectionBean.java | 12 +-
.../supportInjections/SupportInjectionTest.java | 16 +-
.../injectiontarget/supportInjections/Table.java | 2 +-
.../test/portable/javaee/MockInstance.java | 4 +-
.../scopeextension/BeanWithExtensionInjected.java | 4 +-
.../scopeextension/ExternalTestScopeContext.java | 10 +-
.../scopeextension/ExternalTestScopeExtension.java | 10 +-
.../scopeextension/ExternalTestScopedBean.java | 2 +-
.../broken/CdiBeanWithLifecycleObserver.java | 8 +-
...ativeWithBeanAndMethodProducerPriorityTest.java | 8 +-
.../test/producer/AmbigousProducerTest.java | 2 +-
.../webbeans/test/producer/ConsumerBean.java | 4 +-
.../test/producer/GenericProducerTest.java | 4 +-
.../webbeans/test/producer/NamedProducerTest.java | 4 +-
.../webbeans/test/producer/ProducerBean.java | 4 +-
.../webbeans/test/producer/ProducerBean2.java | 4 +-
.../test/producer/ProducerPassivationTest.java | 10 +-
.../SerializableAtRuntimeProducerTest.java | 6 +-
.../webbeans/test/producer/StringProducerTest.java | 6 +-
.../test/producer/beans/ListConsumerBean.java | 4 +-
.../producer/beans/MultipleListProducerBean.java | 4 +-
.../test/producer/beans/PrivateProducedBean.java | 2 +-
.../test/producer/beans/ProtectedProducedBean.java | 2 +-
.../test/producer/beans/SampleProducerOwner.java | 6 +-
.../webbeans/test/producer/beans/SomeUserBean.java | 2 +-
.../test/producer/broken/BrokenProducesTest.java | 2 +-
.../broken/DecoratorWithProducerField.java | 8 +-
.../broken/DecoratorWithProducerMethod.java | 8 +-
.../broken/InterceptorWithProducerField.java | 8 +-
.../broken/InterceptorWithProducerMethod.java | 8 +-
.../specializes/SpecializesProducer1Test.java | 4 +-
.../test/profields/GetterStringInjectorTest.java | 2 +-
.../InnerClassInjectStringProducerTest.java | 2 +-
.../profields/InterceptedProducerFieldTest.java | 12 +-
.../beans/classproducer/MyProductBean.java | 2 +-
.../beans/classproducer/MyProductProducer.java | 8 +-
.../beans/classproducer/ProductInjectedBean.java | 2 +-
.../stringproducer/GetterStringFieldInjector.java | 4 +-
.../stringproducer/GetterStringProducerBean.java | 4 +-
.../stringproducer/InformationConsumerBean.java | 6 +-
.../beans/stringproducer/MultipleListProducer.java | 6 +-
.../beans/stringproducer/StringProducerBean.java | 4 +-
.../innerClass/InnerClassInjectStringProducer.java | 4 +-
.../test/promethods/MethodProducer1Test.java | 10 +-
.../test/promethods/PersonProducerTest.java | 6 +-
.../promethods/beans/InjectorofMethod1Bean.java | 4 +-
.../test/promethods/beans/MethodTypeProduces1.java | 6 +-
.../test/promethods/beans/PersonProducerBean.java | 6 +-
.../test/promethods/beans/ProducerBean.java | 4 +-
.../beans/RequestScopedNullPersonProducerBean.java | 6 +-
.../beans/SessionScopedPersonProducerBean.java | 6 +-
...DecoratorInterceptorProxySerializationTest.java | 14 +-
.../proxy/DecoratorProxySerializationTest.java | 6 +-
.../webbeans/test/proxy/InnerClassProxyTest.java | 10 +-
.../proxy/InterceptorProxySerializationTest.java | 10 +-
.../webbeans/test/proxy/ProxyGenericsTest.java | 4 +-
.../webbeans/test/proxy/ProxyMappingTest.java | 2 +-
.../webbeans/test/proxy/ProxyVetoedTest.java | 2 +-
.../webbeans/test/proxy/beans/ApplicationBean.java | 2 +-
.../test/proxy/beans/ConversationBean.java | 2 +-
.../webbeans/test/proxy/beans/DummyScoped.java | 2 +-
.../test/proxy/beans/DummyScopedContext.java | 6 +-
.../test/proxy/beans/DummyScopedExtension.java | 6 +-
.../test/proxy/unproxyable/AllowProxyingTest.java | 10 +-
.../qualifier/CacheUsesQualifierOverridesTest.java | 24 +--
.../qualifier/QualifierWithOptionalInjectTest.java | 10 +-
.../test/specalization/AdvancedPenProducer.java | 10 +-
.../AlternativeSpecializesProducerTest.java | 6 +-
.../test/specalization/DefaultPenProducer.java | 6 +-
.../apache/webbeans/test/specalization/Pen.java | 2 +-
.../test/specalization/PremiumPenProducer.java | 10 +-
.../ProducerMethodSpecialisationTest.java | 10 +-
.../test/specalization/QualifierSpecialized.java | 2 +-
.../disabledspecialization/LoginService.java | 2 +-
.../disabledspecialization/MockLoginService.java | 4 +-
.../disabledspecialization/VetoMeExtension.java | 6 +-
.../VetoMeProcessBeanAttributesExtension.java | 6 +-
.../test/specalization/multiple/BeanA.java | 4 +-
.../test/specalization/multiple/BeanB.java | 2 +-
.../test/specalization/multiple/BeanB2.java | 2 +-
.../test/specalization/multiple/BeanC.java | 2 +-
.../test/specalization/multiple/BeanD.java | 4 +-
.../multiple/MultipleSpecializationTest.java | 2 +-
.../MultipleSpecializedProducerMethodsTest.java | 6 +-
.../test/specalization/observer/prot/BeanA.java | 4 +-
.../test/specalization/observer/prot/BeanB.java | 6 +-
.../test/specalization/observer/prot/BeanC.java | 6 +-
.../test/specalization/observer/prot/BeanD.java | 8 +-
.../test/specalization/observer/prot/BeanE.java | 4 +-
.../observer/prot/ProtectedObserverTest.java | 10 +-
.../test/specalization/observer/pub/BeanA.java | 4 +-
.../test/specalization/observer/pub/BeanB.java | 6 +-
.../test/specalization/observer/pub/BeanC.java | 6 +-
.../test/specalization/observer/pub/BeanD.java | 8 +-
.../test/specalization/observer/pub/BeanE.java | 4 +-
.../observer/pub/PublicObserverTest.java | 10 +-
.../specalization/passivation/DefaultXyBean.java | 2 +-
.../passivation/SpecializedXyBean.java | 4 +-
.../test/sterotype/StereoWithNonScope.java | 2 +-
.../test/sterotype/StereoWithRequestScope.java | 4 +-
.../test/sterotype/StereoWithSessionScope.java | 4 +-
.../test/sterotype/StereoWithSessionScope2.java | 4 +-
.../DependentProducerMethodInjectionPointTest.java | 6 +-
...ntProducerMethodMultipleInjectionPointTest.java | 4 +-
.../test/tests/InjectionPointInjectionTest.java | 21 +--
.../test/tests/MultipleTimeTheSameBindingTest.java | 12 +-
.../test/tests/PackageInjectionPointOwner.java | 2 +-
.../tests/PackageMethodInjectionPointOwner.java | 4 +-
.../test/unittests/annotation/LiteralType.java | 2 +-
.../test/unittests/binding/AnyBindingTest.java | 2 +-
.../binding/BrokenBindingComponentTest.java | 2 +-
.../test/unittests/clazz/GenericsUtilTest.java | 2 +-
.../test/unittests/config/ScannerTestBean.java | 4 +-
.../test/unittests/decorator/Decorator1Test.java | 2 +-
.../decorator/DecoratorExceptionTest.java | 2 +-
.../test/unittests/definition/BeanTypesTest.java | 2 +-
.../test/unittests/disposal/DisposalTest.java | 2 +-
.../webbeans/test/unittests/event/EventTest.java | 8 +-
.../event/component/BrokenComponentTest.java | 2 +-
.../event/component/ObserversComponentTest.java | 20 +--
.../event/exception/EventExceptionTest.java | 8 +-
.../exception/ExceptionComponentTest.java | 29 +---
.../exception/ScopeTypeExceptionComponentTest.java | 8 +-
.../initializer/BrokenInitializerTest.java | 2 +-
.../inject/InjectedComponentWithMemberTest.java | 2 +-
.../test/unittests/inject/TypedComponentTest.java | 2 +-
.../inject/TypedInjectedComponentTest.java | 2 +-
.../test/unittests/inject/UserComponentTest.java | 2 +-
.../InjectedInstanceBrokenComponentTest.java | 2 +-
.../test/unittests/inject/named/NamedTests.java | 10 +-
.../intercept/PreDestroyComponentTest.java | 2 +-
.../unittests/library/LibraryComponentTest.java | 4 +-
.../pfield/ProducerFieldComponentTest.java | 2 +-
.../unittests/producer/ProducerComponentTest.java | 2 +-
.../producer/broken/BrokenProducerTest.java | 2 +-
.../resolution/ManagerResolutionTest.java | 2 +-
.../specializes/SpecializationComponentTest.java | 2 +-
.../unittests/typedliteral/TypeLiteralTest.java | 4 +-
.../typedliteral/TypedLiteralComponentTest.java | 8 +-
.../unittests/xml/strict/AlternativesTest.java | 2 +-
.../webbeans/test/util/AnnotationUtilTest.java | 6 +-
.../webbeans/test/util/WebBeansUtilTest.java | 4 +-
.../webbeans/test/xml/BeanArchiveServiceTest.java | 2 +-
.../webbeans/test/xml/strict/Alternative1.java | 2 +-
.../webbeans/test/xml/strict/Alternative3.java | 2 +-
.../test/xml/strict/AlternativeStereotype.java | 4 +-
.../webbeans/test/xml/strict/DummyDecorator.java | 6 +-
.../webbeans/test/xml/strict/DummyInterceptor.java | 2 +-
.../META-INF/openwebbeans/openwebbeans.properties | 4 +-
.../AlternativeSpecializesProducer.xml | 8 +-
webbeans-jetty9/pom.xml | 14 +-
webbeans-jetty9/src/it/fatwar/pom.xml | 4 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 4 +-
.../webbeans/web/jetty9/test/TestServlet.java | 2 +-
webbeans-jetty9/src/it/module/pom.xml | 10 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 4 +-
.../webbeans/web/jetty9/test/TestServlet.java | 2 +-
webbeans-jetty9/src/it/servletinjection/pom.xml | 10 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 4 +-
.../webbeans/web/jetty9/test/TestServlet.java | 2 +-
.../org/apache/webbeans/web/jetty9/JettyUtil.java | 6 +-
.../test/JettyNormalScopeProxyFactoryTest.java | 8 +-
.../webbeans/web/jetty9/test/MySessionScoped.java | 2 +-
.../apache/webbeans/web/jetty9/test/MyWrapper.java | 4 +-
.../org/apache/webbeans/jms/component/JmsBean.java | 4 +-
.../webbeans/jms/plugin/OpenWebBeansJmsPlugin.java | 2 +-
webbeans-jsf/pom.xml | 12 +-
.../webbeans/jsf/ConversationAwareViewHandler.java | 4 +-
.../org/apache/webbeans/jsf/OwbApplication.java | 2 +-
.../apache/webbeans/jsf/OwbExceptionHandler.java | 2 +-
webbeans-junit5/pom.xml | 18 +--
.../org/apache/openwebbeans/junit5/SkipInject.java | 2 +-
.../openwebbeans/junit5/internal/CdiExtension.java | 12 +-
.../internal/CdiParametersResolverExtension.java | 8 +-
.../junit5/internal/ScopesExtension.java | 8 +-
.../junit5/CdiParameterResolversTest.java | 8 +-
.../org/apache/openwebbeans/junit5/ScopesTest.java | 12 +-
.../apache/openwebbeans/junit5/bean/MyService.java | 2 +-
.../openwebbeans/junit5/extension/DummyScoped.java | 2 +-
.../openwebbeans/junit5/extension/MyScope.java | 8 +-
.../junit5/parameter/ParameterResolutionTest.java | 2 +-
.../openwebbeans/junit5/perclass/CdiTest.java | 2 +-
.../junit5/perclass/PerMethodTest.java | 4 +-
.../apache/openwebbeans/junit5/reusable/Base.java | 2 +-
webbeans-osgi/pom.xml | 10 +-
webbeans-porting/pom.xml | 24 +--
.../org/apache/webbeans/test/tck/ContextsImpl.java | 4 +-
.../java/org/apache/webbeans/test/tck/ELImpl.java | 24 +--
.../apache/webbeans/test/tck/OwbTckElResolver.java | 8 +-
webbeans-resource/pom.xml | 4 +-
.../spi/se/StandaloneResourceInjectionService.java | 4 +-
.../spi/se/StandaloneResourceProcessor.java | 2 +-
.../org/apache/openwebbeans/se/CDILauncher.java | 10 +-
.../apache/openwebbeans/se/CDISeLoaderService.java | 2 +-
.../org/apache/openwebbeans/se/OWBContainer.java | 8 +-
.../org/apache/openwebbeans/se/OWBInitializer.java | 10 +-
.../openwebbeans/se/SeContainerSelector.java | 2 +-
.../openwebbeans/se/SeInitializerFacade.java | 8 +-
.../apache/openwebbeans/se/CDILauncherTest.java | 4 +-
.../java/org/apache/openwebbeans/se/CDISETest.java | 6 +-
webbeans-spi/pom.xml | 19 ++-
.../apache/webbeans/spi/ContainerLifecycle.java | 2 +-
.../org/apache/webbeans/spi/ContextsService.java | 4 +-
.../apache/webbeans/spi/InjectionPointService.java | 2 +-
.../webbeans/spi/ResourceInjectionService.java | 4 +-
.../org/apache/webbeans/spi/ScannerService.java | 2 +
.../apache/webbeans/spi/TransactionService.java | 10 +-
.../org/apache/webbeans/spi/ValidatorService.java | 4 +-
.../org/apache/webbeans/spi/adaptor/ELAdaptor.java | 4 +-
.../spi/plugins/OpenWebBeansEjbPlugin.java | 8 +-
webbeans-tck/pom.xml | 12 +-
.../META-INF/openwebbeans/openwebbeans.properties | 2 +-
.../scoped/BeanDiscoveryModeScopedTest.java | 6 +-
.../scoped/DefaultDiscoveryModeModule.java | 2 +-
.../beandiscovery/scoped/ModeScopedModule.java | 2 +-
.../beandiscovery/scoped/ScopedBeanConsumer.java | 2 +-
webbeans-tomcat7/pom.xml | 14 +-
webbeans-tomcat7/src/it/fatwar/pom.xml | 4 +-
.../apache/webbeans/web/tomcat7/test/TestBean.java | 4 +-
.../webbeans/web/tomcat7/test/TestRequestBean.java | 2 +-
.../webbeans/web/tomcat7/test/TestServlet.java | 4 +-
.../webbeans/web/tomcat7/test/TestSessionBean.java | 2 +-
webbeans-tomcat7/src/it/servletinjection/pom.xml | 10 +-
.../apache/webbeans/web/tomcat7/test/TestBean.java | 4 +-
.../webbeans/web/tomcat7/test/TestServlet.java | 2 +-
.../apache/webbeans/web/tomcat7/TomcatUtil.java | 6 +-
.../webbeans/web/tomcat7/test/MySessionScoped.java | 2 +-
.../webbeans/web/tomcat7/test/MyWrapper.java | 4 +-
.../test/TomcatNormalScopeProxyFactoryTest.java | 8 +-
webbeans-web/pom.xml | 20 ++-
webbeans-web/src/it/forward/b/pom.xml | 16 +-
.../java/org/superbiz/beans/RequestScopedBean.java | 2 +-
.../src/it/forward/b/src/main/webapp/target.jsp | 2 +-
webbeans-web/src/it/webcdiapp/pom.xml | 20 +--
.../org/superbiz/beans/ContextEventCounter.java | 14 +-
.../java/org/superbiz/beans/RequestScopedBean.java | 14 +-
.../org/superbiz/beans/SessionScopedCounter.java | 4 +-
.../conversation/ConversationITServlet.java | 2 +-
.../conversation/ConversationalShoppingCart.java | 6 +-
.../org/superbiz/conversation/SessionUser.java | 2 +-
.../openwebbeans/web/it/ConversationScopedIT.java | 2 +-
.../servlet/WebBeansConfigurationFilter.java | 2 +-
.../WebBeansConfigurationHttpSessionListener.java | 4 +-
.../servlet/WebBeansConfigurationListener.java | 6 +-
.../webbeans/web/context/WebContextsService.java | 16 +-
.../web/context/WebConversationFilter.java | 2 +-
.../webbeans/web/lifecycle/ServletContextBean.java | 2 +-
.../webbeans/web/lifecycle/ServletRequestBean.java | 2 +-
.../web/lifecycle/WebContainerLifecycle.java | 16 +-
.../lifecycle/test/EnterpriseTestLifeCycle.java | 8 +-
.../webbeans/web/tests/BeforeDestroyTest.java | 6 +-
.../web/tests/ConversationLoggingTest.java | 2 +-
.../apache/webbeans/web/tests/WebBeansTest.java | 4 +-
.../webbeans/web/tests/WebContextsServiceTest.java | 4 +-
.../InitializedSessionScopedTest.java | 4 +-
.../web/tests/initialization/MySession.java | 2 +-
.../web/tests/initialization/MySessionHandler.java | 14 +-
.../interceptor/CachedInterceptorHandlerTest.java | 6 +-
.../web/tests/interceptor/SerializationTest.java | 6 +-
1197 files changed, 4036 insertions(+), 4786 deletions(-)
diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml
index 2743c50d0..56c2ddabf 100644
--- a/atinject-tck/pom.xml
+++ b/atinject-tck/pom.xml
@@ -50,21 +50,21 @@
<dependencies>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject-tck</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-tck</artifactId>
<version>1</version>
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
@@ -75,13 +75,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
@@ -111,8 +111,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
diff --git a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/DriverBinding.java b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/DriverBinding.java
index 89b88a79d..5ac71b14e 100644
--- a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/DriverBinding.java
+++ b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/DriverBinding.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpareBinding.java b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpareBinding.java
index b6ac71b1d..8607dfbf0 100644
--- a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpareBinding.java
+++ b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpareBinding.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
index ab9c44cda..cb10c7a26 100644
--- a/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
+++ b/atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/SpecificProducer.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.atinject.tck.specific;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.New;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.atinject.tck.auto.Drivers;
import org.atinject.tck.auto.DriversSeat;
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c5e5d2e88..2c4f41dd0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -118,20 +118,20 @@
<!-- spec APIs -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/pom.xml b/pom.xml
index beef082df..bf25af695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<description>
Apache OpenWebBeans is an open source implementation of the
- JSR-365 CDI 2.0 Specification.
+ Jakarta CDI 4.0 Specification.
</description>
<organization>
@@ -50,9 +50,9 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git</developerConnection>
<url>https://github.com/apache/openwebbeans</url>
- <tag>openwebbeans-2.0.25</tag>
</scm>
+<!-- Should not be needed anymore
<repositories>
<repository>
<id>jboss-public-repository-group</id>
@@ -68,6 +68,7 @@
</snapshots>
</repository>
</repositories>
+-->
<issueManagement>
<system>jira</system>
@@ -75,23 +76,27 @@
</issueManagement>
<properties>
+ <jakarta.atinject-api.version>2.0.0</jakarta.atinject-api.version>
+ <jakarta.cdi-api.version>4.0.0</jakarta.cdi-api.version>
+ <jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-api.version>
+ <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
+ <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
+ <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
+ <jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
+
+
<geronimo_jaxws.version>1.2</geronimo_jaxws.version>
<geronimo_servlet.version>1.0</geronimo_servlet.version>
<geronimo_ejb.version>1.0.2</geronimo_ejb.version>
- <geronimo_el.version>1.1</geronimo_el.version>
- <geronimo_annotation.version>1.3</geronimo_annotation.version>
<geronimo_jpa.version>1.1</geronimo_jpa.version>
<geronimo_jta.version>1.1.1</geronimo_jta.version>
<geronimo_jsp.version>1.0.1</geronimo_jsp.version>
- <geronimo_cdi.version>1.3</geronimo_cdi.version>
- <geronimo_atinject.version>1.2</geronimo_atinject.version>
- <geronimo_interceptor.version>1.2</geronimo_interceptor.version>
<geronimo_validation.version>1.1</geronimo_validation.version>
<tomcat7.version>7.0.109</tomcat7.version>
<!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 -->
<jetty.version>9.4.12.v20180830</jetty.version>
<myfaces.version>2.3.6</myfaces.version>
- <xbean.version>4.21</xbean.version>
+ <xbean.version>4.22</xbean.version>
<arquillian.version>1.7.0.Alpha10</arquillian.version>
<cdi.tck.version>2.0.5.Final</cdi.tck.version>
<httpclient.version>4.5.13</httpclient.version>
@@ -394,21 +399,21 @@
</artifactSet>
<relocations>
<relocation>
- <pattern>javax.annotation</pattern>
+ <pattern>jakarta.annotation.</pattern>
<shadedPattern>jakarta.annotation</shadedPattern>
<excludes>
- <exclude>javax.annotation.processing.**</exclude>
+ <exclude>jakarta.annotation.processing.**</exclude>
</excludes>
</relocation>
<relocation>
- <pattern>javax.el</pattern>
+ <pattern>jakarta.el</pattern>
<shadedPattern>jakarta.el</shadedPattern>
</relocation>
<relocation>
<pattern>javax.enterprise</pattern>
<shadedPattern>jakarta.enterprise</shadedPattern>
<excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
+ <exclude>jakarta.enterprise.deploy.**</exclude>
</excludes>
</relocation>
<relocation>
@@ -416,11 +421,11 @@
<shadedPattern>jakarta.decorator</shadedPattern>
</relocation>
<relocation>
- <pattern>javax.inject</pattern>
+ <pattern>jakarta.inject</pattern>
<shadedPattern>jakarta.inject</shadedPattern>
</relocation>
<relocation>
- <pattern>javax.interceptor</pattern>
+ <pattern>jakarta.interceptor</pattern>
<shadedPattern>jakarta.interceptor</shadedPattern>
</relocation>
<relocation>
@@ -540,7 +545,7 @@
<dependency>
<groupId>org.apache.openwebbeans.build-tools</groupId>
<artifactId>checkstyle-rules</artifactId>
- <version>1.3</version>
+ <version>4.0-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
@@ -573,7 +578,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.1.0</version>
<executions>
<execution>
<id>enforce-java-version</id>
@@ -583,7 +588,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>1.8</version>
+ <version>17</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -660,6 +665,7 @@
<modules>
<module>webbeans-spi</module>
<module>webbeans-impl</module>
+<!--X TODO re-enable
<module>webbeans-ee-common</module>
<module>webbeans-web</module>
<module>webbeans-ejb</module>
@@ -683,11 +689,60 @@
<module>webbeans-junit5</module>
<module>webbeans-slf4j</module>
<module>bom</module>
+-->
</modules>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.atinject-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta.cdi-api.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>${jakarta.interceptor-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>${jakarta.el-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta.transaction-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>${jakarta.validation-api.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -708,17 +763,7 @@
<version>${geronimo_ejb.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <version>${geronimo_el.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <version>${geronimo_validation.version}</version>
- </dependency>
<dependency>
@@ -761,12 +806,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>${geronimo_annotation.version}</version>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -781,18 +820,6 @@
<version>${geronimo_jpa.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>${geronimo_interceptor.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo_jta.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -800,17 +827,6 @@
<version>${geronimo_jsp.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- </dependency>
<!-- this is used for TCK tests -->
<dependency>
diff --git a/readme/README.txt b/readme/README.txt
index 3c9cfb55b..aad760013 100644
--- a/readme/README.txt
+++ b/readme/README.txt
@@ -88,7 +88,7 @@ Improvement
[OWB-1392] - Fully abstract defining class service
Task
- [OWB-1390] - support javax.enterprise.inject.scan.implicit property
+ [OWB-1390] - support jakarta.enterprise.inject.scan.implicit property
[OWB-1391] - AbstractMetaDataDiscovery ignores classpath entries starting with a common path
@@ -96,7 +96,7 @@ Task
Release Notes - OpenWebBeans - Version 2.0.23
-------------------------------------------
Improvement
- [OWB-1382] - Class javax.enterprise.inject.spi.BeanManager not cached on start
+ [OWB-1382] - Class jakarta.enterprise.inject.spi.BeanManager not cached on start
[OWB-1384] - BaseSeContextsService does not honor supportsConversation flag
[OWB-1385] - Request controller is not thread safe
@@ -376,7 +376,7 @@ Bug
[OWB-1136] - Can't access SessionScoped beans inside @Observers @Initialized(SessionScoped)
[OWB-1138] - PassivationCapable bean id is not unique: PRODUCERMETHOD#class
[OWB-1139] - JSP misses CDI ELResolver
- [OWB-1140] - Caused by: javax.enterprise.inject.UnsatisfiedResolutionException: Api type [xxx] is not found with the qualifiers
+ [OWB-1140] - Caused by: jakarta.enterprise.inject.UnsatisfiedResolutionException: Api type [xxx] is not found with the qualifiers
[OWB-1149] - ContextsService doesn't re-attach mocked sessions correctly
Dependency upgrade
@@ -486,7 +486,7 @@ Bug
[OWB-989] - Clean info issue on Sonar
[OWB-1035] - WebBeansELResolver broken in case of multiple beans
[OWB-1040] - Lifecycle events fired during bean discovery do not follow specification sequence
- [OWB-1047] - Guess sample currently not working due to missing javax.annotation.Priority
+ [OWB-1047] - Guess sample currently not working due to missing jakarta.annotation.Priority
[OWB-1056] - interceptor and annotations spec jars missing in distribution
[OWB-1059] - empty beans.xml file should result in BeanDiscoveryMode.ALL
[OWB-1061] - Surplus and missing @Initialized and @Destroyed events
@@ -955,7 +955,7 @@ Bug
* [OWB-677] - improve getBeans cache key algorithm
* [OWB-680] - drop unused getInstance() methods from our services
* [OWB-681] - remove deprecated methods from BeanManagerImpl
- * [OWB-682] - get rid of OWB InterceptorType and usejavax.enterprise.inject.spi.InterceptionType instead
+ * [OWB-682] - get rid of OWB InterceptorType and usejakarta.enterprise.inject.spi.InterceptionType instead
* [OWB-683] - remove obsolete Methods from our Bean implementations and handlers
* [OWB-685] - OwbApplicationFactory doesn't set Application
* [OWB-686] - OWBApplicationFactory wrappedApp should be consistent between getter and setter and volatile
@@ -1052,7 +1052,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_1_1_2.txt b/readme/README_1_1_2.txt
index 1c1952174..0195b62ad 100644
--- a/readme/README_1_1_2.txt
+++ b/readme/README_1_1_2.txt
@@ -91,7 +91,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_1_1_3.txt b/readme/README_1_1_3.txt
index 8578da56a..5a3541fcf 100644
--- a/readme/README_1_1_3.txt
+++ b/readme/README_1_1_3.txt
@@ -111,7 +111,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_1_1_4.txt b/readme/README_1_1_4.txt
index e45c7ce84..3f25d6070 100644
--- a/readme/README_1_1_4.txt
+++ b/readme/README_1_1_4.txt
@@ -151,7 +151,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_1_1_5.txt b/readme/README_1_1_5.txt
index fd031cad4..2389f9426 100644
--- a/readme/README_1_1_5.txt
+++ b/readme/README_1_1_5.txt
@@ -93,7 +93,7 @@ Bug
* [OWB-677] - improve getBeans cache key algorithm
* [OWB-680] - drop unused getInstance() methods from our services
* [OWB-681] - remove deprecated methods from BeanManagerImpl
- * [OWB-682] - get rid of OWB InterceptorType and usejavax.enterprise.inject.spi.InterceptionType instead
+ * [OWB-682] - get rid of OWB InterceptorType and usejakarta.enterprise.inject.spi.InterceptionType instead
* [OWB-683] - remove obsolete Methods from our Bean implementations and handlers
* [OWB-685] - OwbApplicationFactory doesn't set Application
* [OWB-686] - OWBApplicationFactory wrappedApp should be consistent between getter and setter and volatile
@@ -190,7 +190,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_1_1_6.txt b/readme/README_1_1_6.txt
index 3620d50fe..73cc84a94 100644
--- a/readme/README_1_1_6.txt
+++ b/readme/README_1_1_6.txt
@@ -117,7 +117,7 @@ Bug
* [OWB-677] - improve getBeans cache key algorithm
* [OWB-680] - drop unused getInstance() methods from our services
* [OWB-681] - remove deprecated methods from BeanManagerImpl
- * [OWB-682] - get rid of OWB InterceptorType and usejavax.enterprise.inject.spi.InterceptionType instead
+ * [OWB-682] - get rid of OWB InterceptorType and usejakarta.enterprise.inject.spi.InterceptionType instead
* [OWB-683] - remove obsolete Methods from our Bean implementations and handlers
* [OWB-685] - OwbApplicationFactory doesn't set Application
* [OWB-686] - OWBApplicationFactory wrappedApp should be consistent between getter and setter and volatile
@@ -214,7 +214,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_1_2_0.txt b/readme/README_1_2_0.txt
index 65af76070..366c18158 100644
--- a/readme/README_1_2_0.txt
+++ b/readme/README_1_2_0.txt
@@ -293,7 +293,7 @@ Bug
* [OWB-677] - improve getBeans cache key algorithm
* [OWB-680] - drop unused getInstance() methods from our services
* [OWB-681] - remove deprecated methods from BeanManagerImpl
- * [OWB-682] - get rid of OWB InterceptorType and usejavax.enterprise.inject.spi.InterceptionType instead
+ * [OWB-682] - get rid of OWB InterceptorType and usejakarta.enterprise.inject.spi.InterceptionType instead
* [OWB-683] - remove obsolete Methods from our Bean implementations and handlers
* [OWB-685] - OwbApplicationFactory doesn't set Application
* [OWB-686] - OWBApplicationFactory wrappedApp should be consistent between getter and setter and volatile
@@ -390,7 +390,7 @@ Bug
* [OWB-589] - " ... requires a passivation capable dependency ..." for producer method with return type String and non serializable injected dependency
* [OWB-597] - StackOverFlow when injecting product in same bean where @Produces is placed
* [OWB-615] - remove @Overrides for interfaces to be java5 compatible
- * [OWB-616] - javax.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
+ * [OWB-616] - jakarta.el.ExpressionFactory has final methods! CDI doesn't allow that. - Test on final **PRIVATE** methods too?
* [OWB-618] - we sometimes invoke a dispose method without having created the bean upfront
* [OWB-619] - @New beans must only exist if there is at least one injection point for them
* [OWB-620] - any disabled bean of passivating scope will wrongly be detected as 'not passivatable'
diff --git a/readme/README_M4.txt b/readme/README_M4.txt
index 6cf6b5506..478439f3d 100644
--- a/readme/README_M4.txt
+++ b/readme/README_M4.txt
@@ -52,7 +52,7 @@ Release Notes - OpenWebBeans - Version M4
-------------------------------------------
Sub-task
- * [OWB-140] - Remove javax.enterprise.event.Observer
+ * [OWB-140] - Remove jakarta.enterprise.event.Observer
Bug
@@ -71,7 +71,7 @@ Bug
* [OWB-149] - BeforeShutDown (in current code) should be BeforeShutdown to match spec.
* [OWB-150] - remove ActivityManager from OWB
* [OWB-152] - @New needs a value parameter for the Class it should create
- * [OWB-153] - javax.enterprise.inject.spi.Decorator#getDelegateBindings() must be renamed to getDelegateQualifiers();
+ * [OWB-153] - jakarta.enterprise.inject.spi.Decorator#getDelegateBindings() must be renamed to getDelegateQualifiers();
* [OWB-154] - remove Bean#getDeploymentType()
* [OWB-155] - Conversation#isLongRunning() logic must be converted to isTransient();
* [OWB-156] - ProcessSessionBean SPI interface needs to be updated to the latest spec
@@ -105,7 +105,7 @@ Bug
* [OWB-201] - @New must use its value field while creating New bean
* [OWB-206] - proxies only get injected for the 1st instance of a bean
* [OWB-207] - <interceptors> may now be defined in multiple beans.xml
- * [OWB-208] - the atinject-tck must use our genonimo-cdi interface instead of javax.inject:javax.inject
+ * [OWB-208] - the atinject-tck must use our genonimo-cdi interface instead of jakarta.inject:jakarta.inject
* [OWB-210] - creating a proxy fails for beans which have the same interface defined multiple times in their declaration chain
* [OWB-211] - JSFUtil.getViewId() crashes if viewRoot is not yet set
* [OWB-215] - after leaving the incubator a new location for the site needs to be configured
diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml
index f44fe711d..2bca3291b 100644
--- a/samples/conversation-sample/pom.xml
+++ b/samples/conversation-sample/pom.xml
@@ -46,12 +46,12 @@ under the License.
<!-- Interceptor API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- JSF Plugin -->
@@ -97,14 +97,14 @@ under the License.
<!-- JSR-299 API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<!-- JSR-330 API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<!-- SPI API -->
diff --git a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
index 92653756c..0640b02ae 100644
--- a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
+++ b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/Products.java
@@ -22,10 +22,10 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
@Named
@ApplicationScoped
diff --git a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
index 01e06c2e1..d58ce729f 100644
--- a/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
+++ b/samples/conversation-sample/src/main/java/org/apache/webbeans/samples/conversation/ShoppingBean.java
@@ -22,13 +22,13 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.inject.Produces;
import javax.faces.component.UIData;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
@ConversationScoped
diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml
index 1b18a22d9..df9992bc0 100644
--- a/samples/guess/pom.xml
+++ b/samples/guess/pom.xml
@@ -83,21 +83,21 @@ under the License.
</dependency>
<!-- JSR-299 API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
<!-- JSR-330 API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<!-- JSR-250 API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- SPI API -->
@@ -108,8 +108,8 @@ under the License.
<!-- Interceptor API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<!-- MyFaces IMPL -->
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/ApplicationScopeProducer.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/ApplicationScopeProducer.java
index c40d07e19..ad9bf022e 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/ApplicationScopeProducer.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/ApplicationScopeProducer.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.sample.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.webbeans.sample.bindings.AppScopeBinding;
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
index 4fa17eeb7..58015c0db 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
@@ -19,15 +19,15 @@
package org.apache.webbeans.sample.bean;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.enterprise.inject.Produces;
import javax.faces.application.FacesMessage;
import org.apache.webbeans.sample.bindings.AppScopeBinding;
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
index b2ad638fa..2a00f83de 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.sample.bean;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpSession;
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/AppScopeBinding.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/AppScopeBinding.java
index a79799c1d..3c43a4133 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/AppScopeBinding.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/AppScopeBinding.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java
index fabbdd24d..568b23a02 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
index ce12a1418..a740ca5d4 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java b/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
index f1a13440c..14dccae58 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
@@ -20,11 +20,11 @@ package org.apache.webbeans.sample.conversation;
import java.io.Serializable;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.faces.application.FacesMessage;
import org.apache.webbeans.sample.model.conversation.ConversationModel;
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java b/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
index 931656f95..1925ecfae 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.sample.dependent;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
@Dependent
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java
index b35a62454..181e24bcc 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
index debfa8ec2..699a9e755 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
@@ -22,15 +22,15 @@ import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.util.Set;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Named;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Named;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Named("game")
@SessionScoped
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java
index 2dcbca20d..fb677e6d0 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
index 11a456080..096da47f1 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
@@ -21,9 +21,9 @@ package org.apache.webbeans.sample.guess;
import java.io.Serializable;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
+import jakarta.enterprise.inject.Produces;
@SessionScoped
@Named
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java b/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java
index 2e525b90a..ce42dc745 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/model/User.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.sample.model;
import java.io.Serializable;
-import javax.enterprise.inject.Model;
+import jakarta.enterprise.inject.Model;
/**
* Simple model object for loginned users.
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java b/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
index 0939304d2..262b9be05 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
@@ -22,8 +22,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.ConversationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.inject.Named;
@ConversationScoped
@Named
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java b/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java
index 9a2e2c0d0..087cc2046 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/observer/LoggedInObserver.java
@@ -19,7 +19,7 @@
package org.apache.webbeans.sample.observer;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
import org.apache.webbeans.sample.event.LoggedInEvent;
import org.apache.webbeans.sample.model.User;
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java b/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
index 150be9b92..e7044d5cf 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.sample.util;
-import javax.enterprise.context.Dependent;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Named;
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.FacesContext;
diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml
index 199253f06..9c7943069 100644
--- a/samples/jsf2sample/pom.xml
+++ b/samples/jsf2sample/pom.xml
@@ -52,8 +52,8 @@ under the License.
<!-- Interceptor API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<!-- JSF Plugin -->
@@ -85,21 +85,21 @@ under the License.
</dependency>
<!-- JSR 299 API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
<!-- JSR 330 API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<!-- JSR-250 API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- SPI API -->
diff --git a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java
index aa36ea985..bf8808f81 100644
--- a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java
+++ b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.jsf2;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
@RequestScoped
diff --git a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationData.java b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationData.java
index 0e9451027..7c13ef8fe 100644
--- a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationData.java
+++ b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/ConversationData.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.jsf2;
import java.io.Serializable;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
@ConversationScoped
public class ConversationData implements Serializable
diff --git a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/Counter.java b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/Counter.java
index af741b8aa..946a60436 100644
--- a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/Counter.java
+++ b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/Counter.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/CounterBean.java b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/CounterBean.java
index db1425136..8021faddd 100644
--- a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/CounterBean.java
+++ b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/CounterBean.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.jsf2;
import java.io.Serializable;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
@SessionScoped
public class CounterBean implements Serializable
diff --git a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
index 563d16033..9e0b55ab7 100644
--- a/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
+++ b/samples/jsf2sample/src/main/java/org/apache/webbeans/jsf2/HelloJsfBean.java
@@ -18,12 +18,12 @@
*/
package org.apache.webbeans.jsf2;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named("helloBean")
@RequestScoped
diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml
index b461fb73a..934c3ab9b 100644
--- a/samples/reservation/pom.xml
+++ b/samples/reservation/pom.xml
@@ -64,22 +64,22 @@ under the License.
</dependency>
<!-- CDI and atinject APIs -->
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<!-- Interceptor API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java
index d4227db4e..0343e2cd4 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.reservation.beans;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.commons.validator.GenericValidator;
import org.apache.webbeans.reservation.bindings.DatabaseLogin;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java
index b50787298..07e63bfdf 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.reservation.beans;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import javax.servlet.http.HttpSession;
import org.apache.webbeans.reservation.util.JSFUtility;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
index 3413a8112..be1d5b262 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.reservation.beans;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.commons.logging.Log;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java
index e806a1068..71f0f4b12 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.reservation.beans.admin;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.webbeans.reservation.controller.admin.AdminController;
import org.apache.webbeans.reservation.util.JSFUtility;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
index 258e5616e..95878b2e6 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
@@ -22,10 +22,10 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.faces.component.html.HtmlDataTable;
import org.apache.webbeans.reservation.controller.admin.AdminController;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
index 888b02dc3..187f4160e 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
@@ -23,10 +23,10 @@ import java.util.List;
import java.util.Set;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.faces.component.html.HtmlDataTable;
import org.apache.webbeans.reservation.controller.admin.AdminController;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
index f5300c3f8..6bfe45255 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
@@ -21,10 +21,10 @@ package org.apache.webbeans.reservation.beans.user;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.faces.component.html.HtmlDataTable;
import org.apache.webbeans.reservation.controller.user.UserController;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
index 3c291b882..66c24576e 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
@@ -26,11 +26,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.faces.component.html.HtmlDataTable;
import javax.faces.model.SelectItem;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java
index eb5b280f3..12925a662 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.reservation.beans.user;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.webbeans.reservation.controller.user.UserController;
import org.apache.webbeans.reservation.entity.User;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/ApplicationLog.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/ApplicationLog.java
index ea1aae1a4..79c786839 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/ApplicationLog.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/ApplicationLog.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/DatabaseLogin.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/DatabaseLogin.java
index 4b3cb64f4..3565d176b 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/DatabaseLogin.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/DatabaseLogin.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java
index 6474b7bea..35217efa0 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java
index a0c0ef930..3af7e6ce2 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/intercep/Transactional.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
@InterceptorBinding
@Retention(RetentionPolicy.RUNTIME)
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/InitializeDatabase.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/InitializeDatabase.java
index 9c5f18eb8..8a24c4413 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/InitializeDatabase.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/InitializeDatabase.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.reservation.controller;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.apache.webbeans.reservation.controller.admin.AdminController;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
index 1e56d8f91..d8a5df387 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
@@ -22,9 +22,9 @@ import java.util.GregorianCalendar;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.Query;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
index a483ff9f2..01bf38811 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.reservation.controller;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
import javax.persistence.EntityManager;
import org.apache.commons.logging.Log;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
index 124cf546d..0b4fe13e2 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
@@ -22,9 +22,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.Query;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
index 301c9652f..a0837c1aa 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
@@ -23,11 +23,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.RequestScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.RequestScoped;
import javax.faces.model.SelectItem;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.persistence.EntityManager;
import org.apache.commons.logging.Log;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java
index cf690f318..3a8996d5d 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java
@@ -19,9 +19,9 @@
package org.apache.webbeans.reservation.intercept;
-import javax.decorator.Delegate;
-import javax.decorator.Decorator;
-import javax.inject.Inject;
+import jakarta.decorator.Delegate;
+import jakarta.decorator.Decorator;
+import jakarta.inject.Inject;
import org.apache.commons.logging.Log;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
index 437d62d43..b156f54b2 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.reservation.intercept;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java
index 10cbf9b49..46b7e8766 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/session/SessionTracker.java
@@ -25,9 +25,9 @@ import java.io.Serializable;
import org.apache.webbeans.reservation.entity.User;
import org.apache.webbeans.reservation.events.LoggedInEvent;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Named;
@SessionScoped
@Named
@@ -39,7 +39,7 @@ public class SessionTracker implements Serializable
/**
* When event fires, this observer method is called
- * by the {@link javax.enterprise.inject.spi.BeanManager} interface.
+ * by the {@link jakarta.enterprise.inject.spi.BeanManager} interface.
*
* @param loggedInEvent event
*/
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
index bbf4f2d3c..0977163ed 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.reservation.util;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/LogUtil.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/LogUtil.java
index c65b7de9d..16ca74b00 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/LogUtil.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/LogUtil.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.reservation.util;
-import javax.inject.Named;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Named;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/samples/standalone-sample/pom.xml b/samples/standalone-sample/pom.xml
index 895e2fda9..469b14afe 100644
--- a/samples/standalone-sample/pom.xml
+++ b/samples/standalone-sample/pom.xml
@@ -48,8 +48,8 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<optional>true</optional>
</dependency>
diff --git a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
index be124687c..6375db1c0 100644
--- a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
+++ b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/Boot.java
@@ -22,8 +22,8 @@ import java.awt.BorderLayout;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import javax.swing.JFrame;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java
index 0dd0b156d..e5c04f51c 100644
--- a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java
+++ b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/FileLogin.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Properties;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.apache.webbeans.se.sample.Login;
import org.apache.webbeans.se.sample.bindings.FileLoginBinding;
diff --git a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/JavaLoggerFactory.java b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/JavaLoggerFactory.java
index 4346b9ba1..bb6702796 100644
--- a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/JavaLoggerFactory.java
+++ b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/beans/JavaLoggerFactory.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.se.sample.beans;
import java.util.logging.Logger;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.apache.webbeans.se.sample.LoggerFactory;
import org.apache.webbeans.se.sample.bindings.JavaLogger;
diff --git a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/FileLoginBinding.java b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/FileLoginBinding.java
index d8abaebad..6cf49bd27 100644
--- a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/FileLoginBinding.java
+++ b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/FileLoginBinding.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/JavaLogger.java b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/JavaLogger.java
index e5d2bc872..e62c68ed2 100644
--- a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/JavaLogger.java
+++ b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/bindings/JavaLogger.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java
index cd8108bb5..34db7e8b2 100644
--- a/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java
+++ b/samples/standalone-sample/src/main/java/org/apache/webbeans/se/sample/gui/LoginWindow.java
@@ -24,8 +24,8 @@ import java.awt.event.ActionListener;
import java.util.Arrays;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
diff --git a/samples/tomcat7-sample/pom.xml b/samples/tomcat7-sample/pom.xml
index a54a16a30..ae8f94ef6 100644
--- a/samples/tomcat7-sample/pom.xml
+++ b/samples/tomcat7-sample/pom.xml
@@ -63,23 +63,21 @@ under the License.
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
index 698eaa930..063dece82 100644
--- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
+++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
@@ -22,9 +22,9 @@ import java.io.Serializable;
import java.security.Principal;
import java.util.Date;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
@SessionScoped // just to test @Initialized(SessionScoped.class)
public class CurrentDateProvider implements Serializable
diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
index 98ae23ab1..e5f43aeb2 100644
--- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
+++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
@@ -21,9 +21,9 @@ package org.apache.webbeans.samples.tomcat;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
index c320a1c90..36c52f19a 100644
--- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
+++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.util.Set;
import java.util.logging.Logger;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
index 09cb53121..d2c7ad111 100644
--- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
+++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
@@ -18,12 +18,12 @@
*/
package org.apache.webbeans.samples.tomcat;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Destroyed;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Destroyed;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Observes;
import java.util.logging.Logger;
/**
diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
index 82793cf0a..72ea89731 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml
+++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
@@ -36,27 +36,27 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
index c42aa5bea..87cea4f09 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.arquillian.standalone;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.BDABeansXmlScanner;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbLifecycleHandler.java b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbLifecycleHandler.java
index 4028c4f4c..8bc7cfaac 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbLifecycleHandler.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbLifecycleHandler.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.arquillian.standalone;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
import org.apache.webbeans.spi.ContainerLifecycle;
import org.apache.webbeans.spi.ContextsService;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
index 23c4dd648..e0564957e 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbStandaloneContainer.java
@@ -32,7 +32,7 @@ import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.descriptor.api.Descriptor;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianImplicitBdaJarDeploymentTest.java b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianImplicitBdaJarDeploymentTest.java
index a225c9229..4be53448a 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianImplicitBdaJarDeploymentTest.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianImplicitBdaJarDeploymentTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.arquillian.test;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import org.apache.webbeans.arquillian.test.beans.NonCdiBean;
import org.apache.webbeans.arquillian.test.beans.SampleUser;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianJarDeploymentTest.java b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianJarDeploymentTest.java
index a8a42caaa..49b3d8011 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianJarDeploymentTest.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianJarDeploymentTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.arquillian.test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.webbeans.arquillian.test.beans.SampleUser;
import org.jboss.arquillian.container.test.api.Deployment;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianTrimmedBdaJarDeploymentTest.java b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianTrimmedBdaJarDeploymentTest.java
index 8fb6a0c4b..74a9dc81f 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianTrimmedBdaJarDeploymentTest.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianTrimmedBdaJarDeploymentTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.arquillian.test;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import org.apache.webbeans.arquillian.test.beans.NonCdiBean;
import org.apache.webbeans.arquillian.test.beans.SampleUser;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebInfClassesDeploymentTest.java b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebInfClassesDeploymentTest.java
index f6ef6bb38..c44bb6baa 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebInfClassesDeploymentTest.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebInfClassesDeploymentTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.arquillian.test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.webbeans.arquillian.test.beans.SampleUser;
import org.jboss.arquillian.container.test.api.Deployment;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebJarDeploymentTest.java b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebJarDeploymentTest.java
index 9422b7ac8..20a802e54 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebJarDeploymentTest.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/OwbArquillianWebJarDeploymentTest.java
@@ -26,7 +26,7 @@ import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.webbeans.arquillian.test.beans.SampleUser;
import org.jboss.arquillian.container.test.api.Deployment;
diff --git a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/beans/SampleUser.java b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/beans/SampleUser.java
index 529c43d85..44a69b443 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/beans/SampleUser.java
+++ b/webbeans-arquillian/owb-arquillian-standalone/src/test/java/org/apache/webbeans/arquillian/test/beans/SampleUser.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.arquillian.test.beans;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
import java.io.Serializable;
/**
diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml
index 270cc9434..812c10c4c 100644
--- a/webbeans-ee-common/pom.xml
+++ b/webbeans-ee-common/pom.xml
@@ -42,15 +42,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git a/webbeans-ee/pom.xml b/webbeans-ee/pom.xml
index 35ec99b4b..5c6214009 100644
--- a/webbeans-ee/pom.xml
+++ b/webbeans-ee/pom.xml
@@ -40,19 +40,18 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -68,9 +67,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
index f62943833..226990460 100644
--- a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
+++ b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/UserTransactionProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.ee.beans;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.transaction.UserTransaction;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
index 0bbf750b1..87284e250 100644
--- a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
+++ b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorFactoryProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.ee.beans;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.validation.ValidatorFactory;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
index e0e76ac34..b4bfb1b07 100644
--- a/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
+++ b/webbeans-ee/src/main/java/org/apache/webbeans/ee/beans/ValidatorProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.ee.beans;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.validation.Validator;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java b/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
index 487dd8014..7633d5d4f 100644
--- a/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
+++ b/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.ee.event;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.ObserverMethod;
import javax.transaction.RollbackException;
import javax.transaction.Status;
import javax.transaction.Synchronization;
diff --git a/webbeans-ejb/pom.xml b/webbeans-ejb/pom.xml
index 51c99a353..faf40c531 100644
--- a/webbeans-ejb/pom.xml
+++ b/webbeans-ejb/pom.xml
@@ -34,21 +34,19 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
index 3dec0b209..e048e08c0 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
@@ -26,9 +26,9 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectionTargetFactoryImpl;
import org.apache.webbeans.util.ClassUtil;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.SessionBeanType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.SessionBeanType;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
index f24b4b68a..e14319385 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
@@ -21,12 +21,12 @@ package org.apache.webbeans.ejb.common.component;
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.ejb.common.util.EjbValidator;
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
index 8c80e193a..6c3f24a3a 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
@@ -24,14 +24,14 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.decorator.Decorator;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.SessionBeanType;
-import javax.interceptor.Interceptor;
+import jakarta.decorator.Decorator;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.SessionBeanType;
+import jakarta.interceptor.Interceptor;
import org.apache.webbeans.ejb.common.component.BaseEjbBean;
import org.apache.webbeans.event.ObserverMethodImpl;
diff --git a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
index 5f40f47f5..e50d79d7c 100644
--- a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
+++ b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Annotation;
import javax.ejb.PrePassivate;
import javax.ejb.PostActivate;
-import javax.interceptor.AroundTimeout;
+import jakarta.interceptor.AroundTimeout;
import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
diff --git a/webbeans-el22/pom.xml b/webbeans-el22/pom.xml
index e53093cad..1eadba9d9 100644
--- a/webbeans-el22/pom.xml
+++ b/webbeans-el22/pom.xml
@@ -52,25 +52,23 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -93,7 +91,7 @@
<configuration>
<instructions>
<Import-Package>
- javax.el.*;version="${osgi.el.range}",
+ jakarta.el.*;version="${osgi.el.range}",
*
</Import-Package>
</instructions>
diff --git a/webbeans-el22/src/main/java/org/apache/webbeans/el22/EL22Adaptor.java b/webbeans-el22/src/main/java/org/apache/webbeans/el22/EL22Adaptor.java
index be65cf77b..9550e96e4 100644
--- a/webbeans-el22/src/main/java/org/apache/webbeans/el22/EL22Adaptor.java
+++ b/webbeans-el22/src/main/java/org/apache/webbeans/el22/EL22Adaptor.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.el22;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
import org.apache.webbeans.spi.adaptor.ELAdaptor;
diff --git a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
index 775ae828a..6fe6b0344 100644
--- a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
+++ b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
@@ -23,12 +23,12 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.el.ELContextStore;
-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 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 java.beans.FeatureDescriptor;
import java.lang.reflect.Type;
import java.util.Iterator;
diff --git a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java
index 65fdd8b64..59262884b 100644
--- a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java
+++ b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedExpressionFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.el22;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
public class WrappedExpressionFactory extends ExpressionFactory
{
diff --git a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
index a62628d85..05c6e2f59 100644
--- a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
+++ b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
@@ -20,10 +20,10 @@ package org.apache.webbeans.el22;
import org.apache.webbeans.el.ELContextStore;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
public class WrappedMethodExpression extends MethodExpression
{
diff --git a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
index d29b404b6..896cecf92 100644
--- a/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
+++ b/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.el22;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import org.apache.webbeans.el.ELContextStore;
@@ -39,7 +39,7 @@ public class WrappedValueExpression extends ValueExpression
/* (non-Javadoc)
- * @see javax.el.ValueExpression#getValueReference(javax.el.ELContext)
+ * @see jakarta.el.ValueExpression#getValueReference(jakarta.el.ELContext)
*/
@Override
public ValueReference getValueReference(ELContext context)
diff --git a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/AbstractUnitTest.java b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/AbstractUnitTest.java
index 730afa089..7b799e980 100644
--- a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/AbstractUnitTest.java
+++ b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/AbstractUnitTest.java
@@ -25,9 +25,9 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
@@ -141,7 +141,7 @@ public abstract class AbstractUnitTest
/**
* Add a CDI Extension which should get used in the test case.
* Use this function instead of defining test Extensions via the usual
- * META-INF/services/javax.enterprise.inject.spi.Extension file!
+ * META-INF/services/jakarta.enterprise.inject.spi.Extension file!
*
* @param ext the {@link Extension} which should get loaded
*/
diff --git a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java
index cbd43d07a..4a2d9d8f6 100644
--- a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java
+++ b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/ELPerformanceTest.java
@@ -32,9 +32,9 @@ import org.apache.webbeans.spi.ContextsService;
import org.junit.Assert;
import org.junit.Test;
-import javax.el.ELContext;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
+import jakarta.el.ELContext;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
public class ELPerformanceTest extends AbstractUnitTest
{
diff --git a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/MockELContext.java b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/MockELContext.java
index c63a19388..eff9c4eb1 100644
--- a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/MockELContext.java
+++ b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/MockELContext.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.el.test;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.VariableMapper;
public class MockELContext extends ELContext
{
diff --git a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/RequestBean.java b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/RequestBean.java
index 48a10bb7a..6a02740f8 100644
--- a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/RequestBean.java
+++ b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/RequestBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.el.test;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import java.io.Serializable;
@RequestScoped
diff --git a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/SampleBean.java b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/SampleBean.java
index ca6564a26..405684d2b 100644
--- a/webbeans-el22/src/test/java/org/apache/webbeans/el/test/SampleBean.java
+++ b/webbeans-el22/src/test/java/org/apache/webbeans/el/test/SampleBean.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.el.test;
import java.io.Serializable;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@SessionScoped
@Named
diff --git a/webbeans-impl/pom.xml b/webbeans-impl/pom.xml
index 2fe51b1ca..464eb46c7 100644
--- a/webbeans-impl/pom.xml
+++ b/webbeans-impl/pom.xml
@@ -32,14 +32,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -53,15 +53,13 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
@@ -70,8 +68,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -107,12 +105,12 @@
<configuration>
<instructions>
<Import-Package>
- javax.annotation.*;version="[1.2,2)",
- javax.inject.*;version="[1.0,2)",
- javax.decorator.*;version="[1.1,3)",
- javax.enterprise.*;version="[1.1,3)",
- javax.interceptor.*;version="[1.2,2)",
- javax.el.*;version="[${osgi.el.range},3)";resolution:="optional",
+ jakarta.annotation.*;version="[1.2,2)",
+ jakarta.inject.*;version="[1.0,2)",
+ jakarta.decorator.*;version="[1.1,3)",
+ jakarta.enterprise.*;version="[1.1,3)",
+ jakarta.interceptor.*;version="[1.2,2)",
+ jakarta.el.*;version="[${osgi.el.range},3)";resolution:="optional",
*
</Import-Package>
</instructions>
diff --git a/webbeans-impl/src/it/properties/pom.xml b/webbeans-impl/src/it/properties/pom.xml
index 49c3175eb..cb43576b6 100644
--- a/webbeans-impl/src/it/properties/pom.xml
+++ b/webbeans-impl/src/it/properties/pom.xml
@@ -53,13 +53,13 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<optional>true</optional>
</dependency>
diff --git a/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ExcludeExtensionsTest.java b/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ExcludeExtensionsTest.java
index f52640f21..4d65ac6b5 100644
--- a/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ExcludeExtensionsTest.java
+++ b/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ExcludeExtensionsTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.test.spi.configuration;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
import java.util.HashSet;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
index b934ea905..4cf49a2fc 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
@@ -18,7 +18,6 @@
*/
package org.apache.webbeans.annotation;
-import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.deployment.stereotype.IStereoTypeModel;
@@ -30,22 +29,21 @@ import org.apache.webbeans.util.ArrayUtil;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
-import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Qualifier;
-import javax.inject.Scope;
-import javax.interceptor.InterceptorBinding;
+import jakarta.enterprise.context.NormalScope;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Scope;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.Annotation;
import java.lang.annotation.Repeatable;
@@ -106,13 +104,13 @@ public final class AnnotationManager
/**
* Returns true if the annotation is defined in xml or annotated with
- * {@link javax.interceptor.InterceptorBinding} or an InterceptorBinding
- * registered via {@link javax.enterprise.inject.spi.BeforeBeanDiscovery}.
+ * {@link jakarta.interceptor.InterceptorBinding} or an InterceptorBinding
+ * registered via {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery}.
* False otherwise.
*
* @param clazz type of the annotation
* @return true if the annotation is defined in xml or annotated with
- * {@link javax.interceptor.InterceptorBinding}, false otherwise
+ * {@link jakarta.interceptor.InterceptorBinding}, false otherwise
*/
public boolean isInterceptorBindingAnnotation(Class<? extends Annotation> clazz)
{
@@ -259,11 +257,11 @@ public final class AnnotationManager
/**
* Returns true if the annotation is defined in xml or annotated with
- * {@link javax.inject.Qualifier} false otherwise.
+ * {@link jakarta.inject.Qualifier} false otherwise.
*
* @param clazz type of the annotation
* @return true if the annotation is defined in xml or annotated with
- * {@link javax.inject.Qualifier} false otherwise
+ * {@link jakarta.inject.Qualifier} false otherwise
*/
public boolean isQualifierAnnotation(Class<? extends Annotation> clazz)
{
@@ -526,11 +524,11 @@ public final class AnnotationManager
/**
* Returns true if the annotation is defined in xml or annotated with
- * {@link javax.enterprise.inject.Stereotype} false otherwise.
+ * {@link jakarta.enterprise.inject.Stereotype} false otherwise.
*
* @param clazz type of the annotation
* @return true if the annotation is defined in xml or annotated with
- * {@link javax.enterprise.inject.Stereotype} false otherwise
+ * {@link jakarta.enterprise.inject.Stereotype} false otherwise
*/
public boolean isStereoTypeAnnotation(Class<? extends Annotation> clazz)
{
@@ -815,81 +813,6 @@ public final class AnnotationManager
}
- /**
- * Check conditions for the new binding.
- * @param annotations annotations
- * @return Annotation[] with all binding annotations
- * @throws WebBeansConfigurationException if New plus any other binding annotation is set
- */
- public Annotation[] checkForNewQualifierForDeployment(Type type, Class<?> clazz, String name,
- Annotation[] annotations)
- {
- Asserts.assertNotNull(type, "Type argument");
- Asserts.nullCheckForClass(clazz);
- Asserts.assertNotNull(annotations, "Annotations argument");
-
- Annotation[] as = getQualifierAnnotations(annotations);
- for (Annotation a : annotations)
- {
- if (a.annotationType().equals(New.class))
- {
- if (as.length > 1)
- {
- throw new WebBeansConfigurationException("@New binding annotation can not have any binding "
- + "annotation in class : " + clazz.getName()
- + " in field/method : " + name);
- }
- }
- }
-
- return as;
- }
-
- /**
- * Configures the name of the producer method for specializing the parent.
- *
- * @param component producer method component
- * @param method specialized producer method
- * @param superMethod overriden super producer method
- */
- public boolean isSuperMethodNamed(AbstractOwbBean<?> component,
- Method method,
- Method superMethod)
- {
- Asserts.assertNotNull(component,"component");
- Asserts.assertNotNull(method,"method");
- Asserts.assertNotNull(superMethod,"superMethod");
-
- boolean hasName = false;
- if(AnnotationUtil.hasMethodAnnotation(superMethod, Named.class))
- {
- hasName = true;
- }
- else
- {
- Annotation[] anns = getStereotypeMetaAnnotations(superMethod.getAnnotations());
- for(Annotation ann : anns)
- {
- if(ann.annotationType().isAnnotationPresent(Stereotype.class))
- {
- hasName = true;
- break;
- }
- }
- }
-
- if(hasName)
- {
- if(AnnotationUtil.hasMethodAnnotation(method, Named.class))
- {
- throw new WebBeansConfigurationException("Specialized method : " + method.getName() + " in class : "
- + component.getReturnType().getName() + " may not define @Named annotation");
- }
- }
-
- return hasName;
- }
-
@SuppressWarnings("unchecked")
public <X> Method getDisposalWithGivenAnnotatedMethod(AnnotatedType<X> annotatedType, Type beanType, Annotation[] qualifiers)
{
@@ -945,7 +868,7 @@ public final class AnnotationManager
}
/**
- * JavaEE components can not inject {@link javax.enterprise.inject.spi.InjectionPoint}.
+ * JavaEE components can not inject {@link jakarta.enterprise.inject.spi.InjectionPoint}.
* @param clazz javaee component class info
* @throws WebBeansConfigurationException exception if condition is not applied
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
index ebcfa6a40..ab711383c 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnyLiteral.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.annotation;
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.Any;
+import jakarta.enterprise.inject.Any;
public class AnyLiteral extends EmptyAnnotationLiteral<Any> implements Any
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
index da8127a58..4974d9ca6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
- * {@link javax.enterprise.context.RequestScoped} literal annotation.
+ * {@link jakarta.enterprise.context.RequestScoped} literal annotation.
*
* @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
* @since 1.0
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/BeforeDestroyedLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/BeforeDestroyedLiteral.java
index bcfa55571..f9b81acf6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/BeforeDestroyedLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/BeforeDestroyedLiteral.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.BeforeDestroyed;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.BeforeDestroyed;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Singleton;
import java.lang.annotation.Annotation;
/**
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
index dff5106bf..8d0b71c8a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DefaultLiteral.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Annotation;
import java.util.Collections;
import java.util.Set;
-import javax.enterprise.inject.Default;
+import jakarta.enterprise.inject.Default;
/**
* {@link Default} literal annotation.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
index 7ee7bbc2f..24bd1fc3f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* {@link Dependent} literal annotation.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java
index 3828c45c1..784413688 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DestroyedLiteral.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.Destroyed;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.Destroyed;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Singleton;
import java.lang.annotation.Annotation;
/**
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java
index 1aa6d448c..6cb2f3a71 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -66,7 +66,7 @@ public abstract class EmptyAnnotationLiteral<T extends Annotation> extends Annot
* Implemented for performance reasons.
* This is needed because an Annotation always returns 0 as hashCode
* if there is no method in it.
- * Contrary to this the generic {@link javax.enterprise.util.AnnotationLiteral#hashCode()}
+ * Contrary to this the generic {@link jakarta.enterprise.util.AnnotationLiteral#hashCode()}
* always does search for methods via reflection and only then returns 0.
* Not very well performing ...
* @return always 0
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java
index 551e89c9e..6e14b524a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedLiteral.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Singleton;
import java.lang.annotation.Annotation;
/**
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
index be99c9d75..7c4ba78b3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Named;
/**
* Named literal.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
deleted file mode 100644
index 8d708cad5..000000000
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.webbeans.annotation;
-
-import javax.enterprise.inject.New;
-import javax.enterprise.util.AnnotationLiteral;
-
-/**
- * {@link New} literal annotation.
- *
- * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
- * @since 1.0
- */
-public class NewLiteral extends AnnotationLiteral<New> implements New
-{
- private static final long serialVersionUID = -2981014729208063412L;
- private Class<?> clazz;
-
- public NewLiteral()
- {
- clazz = New.class;
- }
-
- public NewLiteral(Class<?> clazz)
- {
- this.clazz = clazz;
- }
-
- /** {@inheritDoc} */
- @Override
- public Class<?> value()
- {
- return clazz;
- }
-
-
-}
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
index 8213eb3f3..ff0169caf 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
/**
* {@link RequestScoped} literal annotation.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
index d4de0afd5..cd3a1f488 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.annotation;
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
/**
- * {@link javax.enterprise.context.RequestScoped} literal annotation.
+ * {@link jakarta.enterprise.context.RequestScoped} literal annotation.
*
* @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
* @since 1.0
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
index 78f3df479..caea4bdda 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.SerializableBean;
@@ -26,13 +26,13 @@ import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.CreationException;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.CreationException;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.Producer;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
@@ -48,7 +48,7 @@ import java.util.logging.Logger;
*
* @version $Rev$ $Date$
*
- * @see javax.enterprise.inject.spi.Bean
+ * @see jakarta.enterprise.inject.spi.Bean
*
*/
public abstract class AbstractOwbBean<T>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
index 3e72d1792..efa1ea327 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
@@ -21,10 +21,10 @@ package org.apache.webbeans.component;
import java.io.Serializable;
import java.lang.reflect.Modifier;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.ProducerFactory;
import org.apache.webbeans.container.AnnotatedTypeWrapper;
import org.apache.webbeans.util.WebBeansUtil;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
index ba5217e7d..c8071b64a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanAttributesImpl.java
@@ -24,9 +24,9 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.util.AnnotationUtil;
public class BeanAttributesImpl<T> implements BeanAttributes<T>
@@ -128,16 +128,6 @@ public class BeanAttributesImpl<T> implements BeanAttributes<T>
return name;
}
- /**
- * Since CDI-1.1 we do not rely on isNullable for a bean as this information is really determined through other facts.
- * @return always {@code false}
- * @deprecated
- */
- public boolean isNullable()
- {
- return false;
- }
-
@Override
public Set<Class<? extends Annotation>> getStereotypes()
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
index 08074cf71..d76c81f0c 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.BeanManagerProducer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
index d377bd76e..e85343c8e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanMetadataBean.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.util.TypeLiteral;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.MetadataProducer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
index b59f6e663..fb368cb87 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/BuiltInOwbBean.java
@@ -18,12 +18,12 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.CollectionUtil;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.ProducerFactory;
import org.apache.webbeans.config.WebBeansContext;
public abstract class BuiltInOwbBean<T> extends AbstractOwbBean<T>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/CdiInterceptorBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/CdiInterceptorBean.java
index c38df944d..966e31e17 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/CdiInterceptorBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/CdiInterceptorBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InterceptionType;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -31,10 +31,10 @@ import org.apache.webbeans.config.WebBeansContext;
/**
- * <p>{@link javax.enterprise.inject.spi.Interceptor}
+ * <p>{@link jakarta.enterprise.inject.spi.Interceptor}
* Bean implementation for CDI-style Beans.
* This is Interceptors which got defined using
- * @{@link javax.interceptor.InterceptorBinding}.</p>
+ * @{@link jakarta.interceptor.InterceptorBinding}.</p>
*/
public class CdiInterceptorBean<T> extends InterceptorBean<T>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
index ad49faa7f..76f2e18a3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.RequestScoped;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.conversation.ConversationImpl;
@@ -50,7 +50,7 @@ public class ConversationBean extends BuiltInOwbBean<ConversationImpl> implement
CollectionUtil.<Type>unmodifiableSet(Conversation.class, ConversationImpl.class, Object.class),
AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET,
RequestScoped.class,
- "javax.enterprise.context.conversation",
+ "jakarta.enterprise.context.conversation",
Collections.<Class<? extends Annotation>>emptySet(),
false),
ConversationImpl.class,
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
index 4af3ee823..b50d3bf0c 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Decorator;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.DecoratorInjectionTargetFactory;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
index 4f744d865..8a35889b6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorMetadataBean.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.util.TypeLiteral;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.MetadataProducer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/EjbInterceptorBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/EjbInterceptorBean.java
index db2d24b15..714b7ebca 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/EjbInterceptorBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/EjbInterceptorBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InterceptionType;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -30,9 +30,9 @@ import java.util.Set;
import org.apache.webbeans.config.WebBeansContext;
/**
- * <p>{@link javax.enterprise.inject.spi.Interceptor} Bean implementation for EJB-style Beans.
+ * <p>{@link jakarta.enterprise.inject.spi.Interceptor} Bean implementation for EJB-style Beans.
* This is Interceptors which got defined by being referenced via
- * @{@link javax.interceptor.Interceptors}.</p>
+ * @{@link jakarta.interceptor.Interceptors}.</p>
*/
public class EjbInterceptorBean<T> extends InterceptorBean<T>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
index 289df37c1..4bb460387 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.event.Event;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.util.TypeLiteral;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.event.EventImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
index 850059468..57462a031 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/EventMetadataBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.EventMetadata;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.EventMetadataProducer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
index 291f45e89..5c51444f0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.AnnotationUtil;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
index c60a29c23..c39093a12 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionProducerFactory.java
@@ -18,16 +18,16 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.ProducerFactory;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.ExtensionProducer;
/**
- * A factory for {@link javax.enterprise.inject.spi.Producer}s that produce CDI {@link javax.enterprise.inject.spi.Extension}s.
+ * A factory for {@link jakarta.enterprise.inject.spi.Producer}s that produce CDI {@link jakarta.enterprise.inject.spi.Extension}s.
*
* @version $Rev: 1440403 $ $Date: 2013-01-30 14:27:15 +0100 (Mi, 30 Jan 2013) $
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java
index b48991c5e..7173b915c 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.CreationalContext;
public interface IBeanHasParent<T>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
index 2029f94e9..52bf24861 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.InjectionPointProducer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
index b2c6c9b7a..724062e85 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
@@ -18,14 +18,14 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InjectionTargetFactory;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectionTargetFactoryImpl;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import java.io.NotSerializableException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
index 8466197dc..364c5c5d3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Provider;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.inject.instance.InstanceImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
index 696631731..9cd6cc88f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptedOrDecoratedBeanMetadataBean.java
@@ -21,13 +21,13 @@ package org.apache.webbeans.component;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.TypeLiteral;
-import javax.enterprise.inject.Decorated;
-import javax.enterprise.inject.Intercepted;
+import jakarta.enterprise.inject.Decorated;
+import jakarta.enterprise.inject.Intercepted;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.BeanMetadataProducer;
import org.apache.webbeans.util.CollectionUtil;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
index 12b49c672..34aa0adfb 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptionFactoryBean.java
@@ -25,10 +25,10 @@ import org.apache.webbeans.portable.AbstractProducer;
import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.CollectionUtil;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InterceptionFactory;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InterceptionFactory;
+import jakarta.enterprise.inject.spi.Interceptor;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Map;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
index 0d4cb9fe7..1b2d735d3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.interceptor.InvocationContext;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -30,14 +30,14 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Map;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectionTargetFactoryImpl;
import org.apache.webbeans.container.InterceptorInjectionTargetFactory;
import org.apache.webbeans.util.ExceptionUtil;
/**
- * <p>Abstract {@link javax.enterprise.inject.spi.Interceptor} Bean implementation.
+ * <p>Abstract {@link jakarta.enterprise.inject.spi.Interceptor} Bean implementation.
*
* <p>Any Interceptor is also an InjectionTarget as they can contain
* @Inject InjectionPoints.</p>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
index a9b965cca..18a301f5e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorMetadataBean.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.component;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.util.TypeLiteral;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.MetadataProducer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
index 48a081c34..2b687447f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
@@ -18,18 +18,18 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.portable.InjectionTargetImpl;
/**
- * Managed bean implementation of the {@link javax.enterprise.inject.spi.Bean}.
+ * Managed bean implementation of the {@link jakarta.enterprise.inject.spi.Bean}.
*
* @version $Rev$Â $Date$
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java
deleted file mode 100644
index 3e587fe83..000000000
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.webbeans.component;
-
-/**
- * Marker interface for @New based beans
- */
-public interface NewBean<T>
-{
-
-}
\ No newline at end of file
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java
deleted file mode 100644
index 07d602944..000000000
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.webbeans.component;
-
-import java.util.Set;
-
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.portable.AbstractProducer;
-
-/**
- * Component definition with {@link javax.enterprise.inject.New} binding annotation.
- *
- * <p>
- * It is defined as concrete java class component.
- * </p>
- *
- */
-public class NewManagedBean<T> extends ManagedBean<T> implements NewBean<T>
-{
-
- public NewManagedBean(WebBeansContext webBeansContext,
- WebBeansType webBeansType,
- AnnotatedType<T> annotatedType,
- BeanAttributesImpl<T> beanAttributes,
- Class<T> beanClass,
- Set<InjectionPoint> injectionPoints)
- {
- super(webBeansContext, webBeansType, annotatedType, beanAttributes, beanClass);
- if (getProducer() instanceof AbstractProducer)
- {
- AbstractProducer<T> producer = (AbstractProducer<T>)getProducer();
- producer.defineInterceptorStack(this, annotatedType, webBeansContext);
- }
- }
-
- /**
- * always true for New qualifier
- */
- @Override
- public boolean isDependent()
- {
- return true;
- }
-
- /**
- * always false for New qualifier
- */
- @Override
- public boolean isAlternative()
- {
- return false;
- }
-
-}
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
index 2e859ca8a..636892f47 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalProvider.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalProvider.java
index f549de0bb..53228466a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalProvider.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/PrincipalProvider.java
@@ -22,7 +22,7 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.security.Principal;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.SecurityService;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
index 3637ef383..ddabd8fd0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.component;
import org.apache.webbeans.config.WebBeansContext;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.ProducerFactory;
import java.io.NotSerializableException;
import java.io.ObjectStreamException;
import java.io.Serializable;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
index 7fff79aa5..97f4b7388 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
@@ -20,10 +20,10 @@ package org.apache.webbeans.component;
import java.lang.reflect.Field;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.ProducerFactory;
/**
* Defines the producer field component implementation.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
index dade0b77a..ca6b9b6dc 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.component;
import java.lang.reflect.Method;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.component.creation.MethodProducerFactory;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
index 37f167d39..0a7392820 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
@@ -23,8 +23,8 @@ import java.lang.annotation.Annotation;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.spi.api.ResourceReference;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.ProducerFactory;
public class ResourceBean<X, T extends Annotation> extends ProducerFieldBean<X>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java
index 55f9626a5..410d5899e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceProvider.java
@@ -23,7 +23,7 @@ import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.spi.api.ResourceReference;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import java.io.ObjectStreamException;
import java.io.Serializable;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
index 849510941..cb0992ab2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/SelfInterceptorBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InterceptionType;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Collections;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/SimpleProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/SimpleProducerFactory.java
index 0be70b772..462cf2ac1 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/SimpleProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/SimpleProducerFactory.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.component;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.ProducerFactory;
/**
* @version $Rev: 1440403 $ $Date: 2013-01-30 14:27:15 +0100 (Mi, 30 Jan 2013) $
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
index a2a952a72..2c99a6b67 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
@@ -35,7 +35,7 @@ package org.apache.webbeans.component;
* <p>
* Producer Method Components are defined within the class that is annotated
* with {@link OwbBean} annotation. In these classes, there are methods that
- * are annotated with {@link javax.enterprise.inject.Produces} annotation.
+ * are annotated with {@link jakarta.enterprise.inject.Produces} annotation.
* These methods become the producer method components of this web beans component.
* It maybe defined using the web-beans.xml file using the <producer> element.
* It is possible to mix these two definitons.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
index a340ad61b..a74347849 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
@@ -18,14 +18,14 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import java.util.Collection;
import java.util.HashMap;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
index 2434c092e..236e1ac07 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.DefinitionException;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
index 70e123215..c7fc31add 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
@@ -26,20 +26,20 @@ import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.GenericsUtil;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProducerFactory;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProducerFactory;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
index eb6693f7a..1e4d20683 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
@@ -29,21 +29,21 @@ import java.util.List;
import java.util.Set;
import java.util.function.Supplier;
-import javax.decorator.Decorator;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.inject.Named;
-import javax.inject.Scope;
-import javax.interceptor.Interceptor;
+import jakarta.decorator.Decorator;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.NormalScope;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.inject.Named;
+import jakarta.inject.Scope;
+import jakarta.interceptor.Interceptor;
import org.apache.webbeans.annotation.AnnotationManager;
import org.apache.webbeans.annotation.AnyLiteral;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
index 0918e3a8d..2533d6782 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
@@ -19,9 +19,9 @@
package org.apache.webbeans.component.creation;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InterceptionType;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
index 8ce3c3e6b..93dae9b61 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
@@ -18,15 +18,15 @@
*/
package org.apache.webbeans.component.creation;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.lang.annotation.Annotation;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
index 958d9df37..5b2bdf2c1 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/EjbInterceptorBeanBuilder.java
@@ -22,9 +22,9 @@ package org.apache.webbeans.component.creation;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.component.EjbInterceptorBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
index 6e8ddf0f5..18b19533a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.webbeans.component.ExtensionBean;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
index 8cc9d452d..c9f65e6bf 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/FieldProducerFactory.java
@@ -23,12 +23,12 @@ import org.apache.webbeans.portable.ProducerFieldProducer;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.inject.Inject;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
index e9f7abc58..afef5b65a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
@@ -18,18 +18,18 @@
*/
package org.apache.webbeans.component.creation;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.interceptor.AroundConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.interceptor.AroundConstruct;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -111,10 +111,10 @@ public abstract class InterceptorBeanBuilder<T, B extends InterceptorBean<T>> ex
/**
* <p>Grab all methods which act as interceptors for the various
- * {@link javax.enterprise.inject.spi.InterceptionType}s.</p>
+ * {@link jakarta.enterprise.inject.spi.InterceptionType}s.</p>
*
* <p>This method will also check some rules, e.g. that there must not be
- * more than a single {@link javax.interceptor.AroundInvoke} method
+ * more than a single {@link jakarta.interceptor.AroundInvoke} method
* on a class.</p>
*
* <p>For the interceptors where multiple are allowed, the following rules apply:
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
index d7b0eb819..68ed56916 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.WebBeansType;
@@ -30,7 +30,7 @@ import org.apache.webbeans.util.WebBeansUtil;
/**
* Bean builder for <i>Managed Beans</i>. A <i>ManagedBean</i> is a class
- * which gets scanned and picked up as {@link javax.enterprise.inject.spi.Bean}.
+ * which gets scanned and picked up as {@link jakarta.enterprise.inject.spi.Bean}.
*
* @version $Rev$ $Date$
*
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java
index d9984458a..f0ccdd45a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/MethodProducerFactory.java
@@ -22,11 +22,11 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.ProducerMethodProducer;
import org.apache.webbeans.util.Asserts;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
import java.util.HashSet;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
index e40bf2b71..392682810 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
@@ -23,20 +23,20 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.event.Reception;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.inject.Inject;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
index 09d00dbf1..5e77bdb85 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.component.creation;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ProducerFieldBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
index dddf029b4..021f18b33 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
@@ -23,11 +23,11 @@ import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.inject.Named;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.inject.Named;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ProducerFieldBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
index 0f82ab79c..784e2609d 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
@@ -20,11 +20,11 @@ package org.apache.webbeans.component.creation;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.DefinitionException;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ProducerMethodBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
index bd66d4235..1b1a4cbca 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
@@ -28,15 +28,15 @@ import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.inject.Inject;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
index c8169f3e6..dc431e4b6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.component.creation;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ResourceBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceProducerFactory.java
index b70682908..be23a9d73 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceProducerFactory.java
@@ -24,9 +24,9 @@ import org.apache.webbeans.portable.ProviderBasedProducerFactory;
import org.apache.webbeans.portable.ResourceProducer;
import org.apache.webbeans.spi.api.ResourceReference;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Producer;
public class ResourceProducerFactory<P> extends ProviderBasedProducerFactory<P>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java
index 4a977975b..deef0fb04 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/SelfInterceptorBeanBuilder.java
@@ -22,8 +22,8 @@ package org.apache.webbeans.component.creation;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.component.SelfInterceptorBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/UnproxyableBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/UnproxyableBean.java
index fb2e24c3e..84846e35b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/UnproxyableBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/UnproxyableBean.java
@@ -22,10 +22,10 @@ import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.config.WebBeansContext;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
class UnproxyableBean<T> extends ManagedBean<T>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/PassivationCapableThirdpartyBeanImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/PassivationCapableThirdpartyBeanImpl.java
index 4e7994f26..96fdca5d8 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/PassivationCapableThirdpartyBeanImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/PassivationCapableThirdpartyBeanImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.component.third;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
index 8e483294a..01d27b44d 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanAttributesImpl.java
@@ -22,7 +22,7 @@ import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.util.SingleItemSet;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
index 3487b883e..e1bf382a0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
@@ -20,11 +20,11 @@ package org.apache.webbeans.component.third;
import java.util.Set;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.WebBeansType;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
index 2183b47cb..48a49e494 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
@@ -54,12 +54,12 @@ import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.WebBeansDeploymentException;
import org.apache.webbeans.exception.WebBeansException;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.DefinitionException;
import org.apache.webbeans.inject.AlternativesManager;
import org.apache.webbeans.intercept.InterceptorsManager;
@@ -93,20 +93,20 @@ import org.apache.webbeans.util.WebBeansConstants;
import org.apache.webbeans.util.WebBeansUtil;
import org.apache.webbeans.xml.DefaultBeanArchiveInformation;
-import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.Model;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.AmbiguousResolutionException;
+import jakarta.enterprise.inject.Model;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.Producer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
@@ -145,7 +145,7 @@ public class BeansDeployer
{
//Logger instance
private static final Logger logger = WebBeansLoggerFacade.getLogger(BeansDeployer.class);
- public static final String JAVAX_ENTERPRISE_PACKAGE = "javax.enterprise.";
+ public static final String JAVAX_ENTERPRISE_PACKAGE = "jakarta.enterprise.";
/**Deployment is started or not*/
@@ -238,7 +238,7 @@ public class BeansDeployer
webBeansContext.getInterceptorsManager().addCdiInterceptor(webBeansContext.getWebBeansUtil().getRequestContextInterceptorBean());
webBeansContext.getInterceptorsManager().addPriorityClazzInterceptor(
ActivateRequestContextInterceptorBean.InterceptorClass.class,
- javax.interceptor.Interceptor.Priority.PLATFORM_BEFORE + 100);
+ jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE + 100);
//Fire Event
fireBeforeBeanDiscoveryEvent();
@@ -575,7 +575,7 @@ public class BeansDeployer
/**
- * @throws DefinitionException if {@link javax.enterprise.inject.spi.Decorator#getDecoratedTypes()} isEmpty
+ * @throws DefinitionException if {@link jakarta.enterprise.inject.spi.Decorator#getDecoratedTypes()} isEmpty
*/
private void validateDecoratorDecoratedTypes()
{
@@ -671,7 +671,7 @@ public class BeansDeployer
alternativesManager.addPriorityClazzAlternative(annotatedType.getJavaClass(), priority);
}
}
- if (annotatedType.getAnnotation(javax.interceptor.Interceptor.class) != null)
+ if (annotatedType.getAnnotation(jakarta.interceptor.Interceptor.class) != null)
{
Priority priority = annotatedType.getAnnotation(Priority.class);
if (priority != null)
@@ -680,7 +680,7 @@ public class BeansDeployer
interceptorsManager.addPriorityClazzInterceptor(javaClass, priority.value());
}
}
- if (annotatedType.getAnnotation(javax.decorator.Decorator.class) != null)
+ if (annotatedType.getAnnotation(jakarta.decorator.Decorator.class) != null)
{
Priority priority = annotatedType.getAnnotation(Priority.class);
if (priority != null)
@@ -1116,7 +1116,7 @@ public class BeansDeployer
validate(decorators);
//Adding interceptors to validate
- List<javax.enterprise.inject.spi.Interceptor<?>> interceptors = interceptorsManager.getCdiInterceptors();
+ List<jakarta.enterprise.inject.spi.Interceptor<?>> interceptors = interceptorsManager.getCdiInterceptors();
logger.fine("Validation of the interceptor's injection points has started.");
@@ -1822,7 +1822,7 @@ public class BeansDeployer
classAnnotations = new Annotation[0];
}
- if (AnnotationUtil.hasAnnotation(classAnnotations, javax.interceptor.Interceptor.class) &&
+ if (AnnotationUtil.hasAnnotation(classAnnotations, jakarta.interceptor.Interceptor.class) &&
!webBeansContext.getAnnotationManager().hasInterceptorBindingMetaAnnotation(classAnnotations))
{
throw new WebBeansDeploymentException(createConfigurationFailedMessage(bdaLocation) + "Interceptor class : "
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
index 95cf6c126..81df3a776 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
@@ -77,7 +77,7 @@ public final class DefaultAnnotation implements InvocationHandler, Annotation
}
/**
- * Copied from javax.enterprise.util.AnnotationLiteral#toString()
+ * Copied from jakarta.enterprise.util.AnnotationLiteral#toString()
* with minor changes.
*
* @return
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java
index 3dc5442ba..dca4e15d8 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/DeploymentValidationService.java
@@ -25,15 +25,15 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Set;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.TransientReference;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.TransientReference;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import org.apache.webbeans.component.EnterpriseBeanMarker;
import org.apache.webbeans.component.OwbBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
index 70313c26f..878de732b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.config;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.plugins.PluginLoader;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
index 1a5a6d518..b2b2f1a15 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
@@ -61,11 +61,11 @@ public class OpenWebBeansConfiguration
* Environment property which comma separated list of classes which
* should NOT fail with UnproxyableResolutionException
*/
- public static final String ALLOW_PROXYING_PARAM = "javax.enterprise.inject.allowProxying.classes";
+ public static final String ALLOW_PROXYING_PARAM = "jakarta.enterprise.inject.allowProxying.classes";
/**
- * Lifycycle methods like {@link javax.annotation.PostConstruct} and
- * {@link javax.annotation.PreDestroy} must not define a checked Exception
+ * Lifycycle methods like {@link jakarta.annotation.PostConstruct} and
+ * {@link jakarta.annotation.PreDestroy} must not define a checked Exception
* regarding to the spec. But this is often unnecessary restrictive so we
* allow to disable this check application wide.
*/
@@ -131,9 +131,9 @@ public class OpenWebBeansConfiguration
*
* Example:
* <pre>
- * org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler
- * org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler
- * org.apache.webbeans.proxy.mapping.javax.enterprise.context.SessionScoped=org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler
+ * org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler
+ * org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.RequestScoped=org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler
+ * org.apache.webbeans.proxy.mapping.jakarta.enterprise.context.SessionScoped=org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler
* </pre>
*
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
index 500fc8cec..0ee0c856e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
@@ -72,8 +72,8 @@ import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
import org.apache.webbeans.xml.DefaultBeanArchiveService;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
/**
* This is the central point to manage the whole CDI container
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java
index 71fc1188d..7fd1ddea5 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedConstructorConfiguratorImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.configurator.AnnotatedConstructorConfigurator;
-import javax.enterprise.inject.spi.configurator.AnnotatedParameterConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedConstructorConfigurator;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedParameterConfigurator;
import java.lang.annotation.Annotation;
import java.util.List;
import java.util.function.Predicate;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedFieldConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedFieldConfiguratorImpl.java
index aa212108f..759d82292 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedFieldConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedFieldConfiguratorImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.configurator.AnnotatedFieldConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedFieldConfigurator;
import java.lang.annotation.Annotation;
import java.util.function.Predicate;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java
index ba95b5180..953643c17 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedMethodConfiguratorImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.configurator.AnnotatedMethodConfigurator;
-import javax.enterprise.inject.spi.configurator.AnnotatedParameterConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedMethodConfigurator;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedParameterConfigurator;
import java.lang.annotation.Annotation;
import java.util.List;
import java.util.function.Predicate;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedParameterConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedParameterConfiguratorImpl.java
index b570c6c4d..ad891efa2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedParameterConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedParameterConfiguratorImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.configurator.AnnotatedParameterConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedParameterConfigurator;
import java.lang.annotation.Annotation;
import java.util.function.Predicate;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedTypeConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedTypeConfiguratorImpl.java
index de05ae81f..4756f92d2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedTypeConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/AnnotatedTypeConfiguratorImpl.java
@@ -24,11 +24,11 @@ import org.apache.webbeans.portable.AnnotatedFieldImpl;
import org.apache.webbeans.portable.AnnotatedMethodImpl;
import org.apache.webbeans.portable.AnnotatedTypeImpl;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.configurator.AnnotatedConstructorConfigurator;
-import javax.enterprise.inject.spi.configurator.AnnotatedFieldConfigurator;
-import javax.enterprise.inject.spi.configurator.AnnotatedMethodConfigurator;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedConstructorConfigurator;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedFieldConfigurator;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedMethodConfigurator;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
import java.lang.annotation.Annotation;
import java.util.Set;
import java.util.function.Predicate;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
index a78d4615d..6ad5bb04e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanAttributesConfiguratorImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.configurator.BeanAttributesConfigurator;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.configurator.BeanAttributesConfigurator;
+import jakarta.enterprise.util.TypeLiteral;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.HashSet;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
index 644e949c3..247170bbf 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/BeanConfiguratorImpl.java
@@ -18,20 +18,20 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.configurator.BeanConfigurator;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
@@ -69,6 +69,9 @@ public class BeanConfiguratorImpl<T> implements BeanConfigurator<T>
private String name;
private boolean alternative;
+ //X TODO implement!
+ private Integer priority;
+
private Set<Type> typeClosures = new LinkedHashSet<>();
private Set<InjectionPoint> injectionPoints = new HashSet<>();
private Set<Annotation> qualifiers = new HashSet<>();
@@ -92,6 +95,13 @@ public class BeanConfiguratorImpl<T> implements BeanConfigurator<T>
return this;
}
+ @Override
+ public BeanConfigurator<T> priority(int priority)
+ {
+ this.priority = priority;
+ return this;
+ }
+
@Override
public BeanConfigurator<T> addInjectionPoint(InjectionPoint injectionPoint)
{
@@ -513,12 +523,6 @@ public class BeanConfiguratorImpl<T> implements BeanConfigurator<T>
return alternative;
}
- @Override
- public boolean isNullable()
- {
- return false;
- }
-
@Override
public void destroy(T instance, CreationalContext<T> context)
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/InjectionPointConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/InjectionPointConfiguratorImpl.java
index 7f29ef80d..833ce9c00 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/InjectionPointConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/InjectionPointConfiguratorImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.configurator.InjectionPointConfigurator;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.configurator.InjectionPointConfigurator;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java
index 186ec0b53..1f721bce0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ObserverMethodConfiguratorImpl.java
@@ -18,17 +18,17 @@
*/
package org.apache.webbeans.configurator;
-import javax.annotation.Priority;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.EventContext;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.configurator.ObserverMethodConfigurator;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.EventContext;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.configurator.ObserverMethodConfigurator;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ProducerConfiguratorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ProducerConfiguratorImpl.java
index 17fc0e7ea..ea89bd774 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ProducerConfiguratorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/configurator/ProducerConfiguratorImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.configurator;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.configurator.ProducerConfigurator;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.configurator.ProducerConfigurator;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java
index 3a5d28436..dafd51619 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/AnnotatedTypeWrapper.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.container;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Extension;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
index 9b128959f..b6fed7603 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
@@ -21,8 +21,8 @@ package org.apache.webbeans.container;
import org.apache.webbeans.annotation.EmptyAnnotationLiteral;
import org.apache.webbeans.util.AnnotationUtil;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.util.Nonbinding;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index 4091b5769..92cb21c29 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -34,26 +34,26 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.NormalScope;
-import javax.enterprise.context.spi.AlterableContext;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.*;
-import javax.inject.Scope;
-import javax.interceptor.InterceptorBinding;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.NormalScope;
+import jakarta.enterprise.context.spi.AlterableContext;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.*;
+import jakarta.inject.Scope;
+import jakarta.interceptor.InterceptorBinding;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.Referenceable;
@@ -69,7 +69,6 @@ import org.apache.webbeans.component.EnterpriseBeanMarker;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.JmsBeanMarker;
import org.apache.webbeans.component.ManagedBean;
-import org.apache.webbeans.component.NewBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.component.ProducerAwareInjectionTargetBean;
import org.apache.webbeans.component.WebBeansType;
@@ -153,7 +152,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
/**
* This list contains additional qualifiers which got set via the
- * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addQualifier(Class)}
+ * {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery#addQualifier(Class)}
* event function.
*/
private List<Class<? extends Annotation>> additionalQualifiers = new ArrayList<>();
@@ -161,7 +160,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
/**
* This list contains additional scopes which got set via the
- * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)} event function.
+ * {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)} event function.
*/
private List<ExternalScope> additionalScopes = new ArrayList<>();
@@ -177,7 +176,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
private ErrorStack errorStack = new ErrorStack();
/**
- * This map stores all beans along with their unique {@link javax.enterprise.inject.spi.PassivationCapable} id.
+ * This map stores all beans along with their unique {@link jakarta.enterprise.inject.spi.PassivationCapable} id.
* This is used as a reference for serialization.
*/
private ConcurrentMap<String, Bean<?>> passivationBeans = new ConcurrentHashMap<>();
@@ -199,13 +198,13 @@ public class BeanManagerImpl implements BeanManager, Referenceable
/**
* This flag will get set to handle lifecyle around
- * {@link javax.enterprise.inject.spi.AfterBeanDiscovery}
+ * {@link jakarta.enterprise.inject.spi.AfterBeanDiscovery}
*/
private LifecycleState beanDiscoveryState = LifecycleState.BEFORE_DISCOVERY;
/**
* This flag will get set to {@code true} after the
- * {@link javax.enterprise.inject.spi.AfterDeploymentValidation} gets fired
+ * {@link jakarta.enterprise.inject.spi.AfterDeploymentValidation} gets fired
*/
private boolean afterDeploymentValidationFired;
@@ -445,9 +444,10 @@ public class BeanManagerImpl implements BeanManager, Referenceable
/**
- * {@inheritDoc}
+ * @deprecated This method got deprecated in CDI-2.0.
+ * Users should use {@link #getEvent()} instead.
*/
- @Override
+ @Deprecated
public void fireEvent(Object event, Annotation... bindings)
{
fireEvent(event, false, bindings);
@@ -537,7 +537,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
return deploymentBeans;
}
- private void addContext(Class<? extends Annotation> scopeType, javax.enterprise.context.spi.Context context)
+ private void addContext(Class<? extends Annotation> scopeType, jakarta.enterprise.context.spi.Context context)
{
Asserts.assertNotNull(scopeType, "scopeType");
Asserts.assertNotNull(context, "context");
@@ -754,7 +754,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
{
boolean isProducer = AbstractProducerBean.class.isInstance(bean);
if(!isProducer && // we have different rules for producers
- !isBeanTypeAssignableToGivenType(bean.getTypes(), beanType, bean instanceof NewBean, isProducer) &&
+ !isBeanTypeAssignableToGivenType(bean.getTypes(), beanType, isProducer) &&
!GenericsUtil.satisfiesDependency(false, isProducer, beanType, bean.getBeanClass(), new HashMap<>()) &&
!GenericsUtil.satisfiesDependencyRaw(false, isProducer, beanType, bean.getBeanClass(), new HashMap<>()))
{
@@ -930,7 +930,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
}
- private boolean isBeanTypeAssignableToGivenType(Set<Type> beanTypes, Type givenType, boolean newBean, boolean producer)
+ private boolean isBeanTypeAssignableToGivenType(Set<Type> beanTypes, Type givenType, boolean producer)
{
for (Type beanApiType : beanTypes)
{
@@ -938,18 +938,6 @@ public class BeanManagerImpl implements BeanManager, Referenceable
{
return true;
}
- else
- {
- //Check for @New
- if (newBean && ClassUtil.isParametrizedType(givenType))
- {
- Class<?> requiredType = ClassUtil.getClass(givenType);
- if (ClassUtil.isClassAssignableFrom(requiredType, ClassUtil.getClass(beanApiType)))
- {
- return true;
- }
- }
- }
}
return false;
@@ -1233,9 +1221,10 @@ public class BeanManagerImpl implements BeanManager, Referenceable
}
/**
- * {@inheritDoc}
+ * @deprecated This method got deprecated in CDI-1.1 and removed in CDI-4.0.
+ * Use {@link #getInjectionTargetFactory(AnnotatedType)} instead.
*/
- @Override
+ @Deprecated
public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
{
InjectionTargetFactoryImpl<T> factory = new InjectionTargetFactoryImpl<>(type, webBeansContext);
@@ -1317,8 +1306,7 @@ public class BeanManagerImpl implements BeanManager, Referenceable
{
if (id == null)
{
- addAdditionalAnnotatedType(extension, inAnnotatedType);
- return;
+ id = AnnotatedElementFactory.OWB_DEFAULT_KEY;
}
AnnotatedType<T> annotatedType = new AnnotatedTypeWrapper<>(Extension.class.cast(extension), inAnnotatedType, id);
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java
index fd1f352dd..7b87f2727 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/DecoratorInjectionTargetFactory.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.container;
import java.lang.reflect.Modifier;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.AbstractDecoratorInjectionTarget;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java
index e57fae66f..b03cb7b37 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java
@@ -26,7 +26,7 @@ import org.apache.webbeans.config.DefaultAnnotation;
/**
* A wrapper for an external scope which can be added by
- * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)}.
+ * {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)}.
*/
public class ExternalScope
{
@@ -61,7 +61,7 @@ public class ExternalScope
/**
* @return an instance of the annotation class we got set
- * in {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)}
+ * in {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery#addScope(Class, boolean, boolean)}
*/
public Annotation getScopeAnnotation()
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
index 13304485c..b3f86ef45 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
@@ -27,31 +27,31 @@ import java.lang.reflect.Type;
import java.util.List;
import java.util.Set;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.InjectionTargetFactory;
-import javax.enterprise.inject.spi.InterceptionFactory;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
+import jakarta.enterprise.inject.spi.InterceptionFactory;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.ProducerFactory;
import org.apache.webbeans.config.WebBeansContext;
@@ -97,13 +97,13 @@ public class InjectableBeanManager implements BeanManager, Externalizable
return bm.createCreationalContext(contextual);
}
- @Override
+ @Deprecated
public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
{
return bm.createInjectionTarget(type);
}
- @Override
+ @Deprecated
public void fireEvent(Object event, Annotation... qualifiers)
{
bm.fireEvent(event, qualifiers);
@@ -414,7 +414,7 @@ public class InjectableBeanManager implements BeanManager, Externalizable
/**
- * @throws IllegalStateException if {@link javax.enterprise.inject.spi.AfterBeanDiscovery}
+ * @throws IllegalStateException if {@link jakarta.enterprise.inject.spi.AfterBeanDiscovery}
*/
private void checkAfterBeanDiscoveryProcessed(String message)
{
@@ -425,7 +425,7 @@ public class InjectableBeanManager implements BeanManager, Externalizable
}
/**
- * @throws IllegalStateException if {@link javax.enterprise.inject.spi.AfterDeploymentValidation}
+ * @throws IllegalStateException if {@link jakarta.enterprise.inject.spi.AfterDeploymentValidation}
*/
private void checkAfterDeploymentValidationFired(String message)
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
index e2b8df624..8d2f8a55e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
@@ -18,11 +18,9 @@
*/
package org.apache.webbeans.container;
-import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.AbstractProducerBean;
-import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.config.WebBeansContext;
@@ -40,13 +38,12 @@ import org.apache.webbeans.util.InjectionExceptionUtil;
import org.apache.webbeans.util.SingleItemSet;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.annotation.Annotation;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
@@ -226,14 +223,6 @@ public class InjectionResolver
Set<Bean<?>> beanSet = implResolveByType(injectionPoint.isDelegate(), type, injectionPointClass, qualifiers);
- if (beanSet.isEmpty())
- {
- if (qualifiers.length == 1 && qualifiers[0].annotationType().equals(New.class))
- {
- createNewBean(injectionPoint, type, qualifiers, beanSet);
- }
- }
-
Bean<?> bean = resolve(beanSet, injectionPoint);
if (bean == null)
@@ -284,56 +273,12 @@ public class InjectionResolver
if (beanSet.isEmpty())
{
- if (qualifiers.length == 1 && qualifiers[0].annotationType().equals(New.class))
- {
- createNewBean(injectionPoint, type, qualifiers, beanSet);
- }
- else
- {
- InjectionExceptionUtil.throwUnsatisfiedResolutionException(clazz, injectionPoint, qualifiers);
- }
+ InjectionExceptionUtil.throwUnsatisfiedResolutionException(clazz, injectionPoint, qualifiers);
}
return resolve(beanSet, injectionPoint);
}
- private void createNewBean(InjectionPoint injectionPoint, Type type, Annotation[] qualifiers, Set<Bean<?>> beanSet)
- {
- New newQualifier = (New) qualifiers[0];
- Class<?> newType;
- if (newQualifier.value() == New.class)
- {
- newType = ClassUtil.getClass(type);
- }
- else
- {
- newType = newQualifier.value();
- }
- Set<Bean<?>> beans = implResolveByType(injectionPoint.isDelegate(), newType, injectionPoint.getBean().getBeanClass(), AnyLiteral.INSTANCE);
- if (beans.isEmpty())
- {
- beanSet.add(webBeansContext.getWebBeansUtil().createNewComponent(newType));
- }
- else
- {
- // we just need the bean for the injection points. So when we find an InjectionTargetBean, we can just take it.
- for (Bean<?> bean: beans)
- {
- if (bean instanceof InjectionTargetBean)
- {
- beanSet.add(webBeansContext.getWebBeansUtil().createNewComponent((OwbBean)bean, (Class)newType));
- break;
- }
- }
- if (beanSet.isEmpty())
- {
- //Hmm, no InjectionTargetBean available, then we have to create the injection points on our own
- beanSet.add(webBeansContext.getWebBeansUtil().createNewComponent((Class)newType));
- }
- }
- }
-
-
private Bean<?> getInstanceOrEventInjectionBean(Type type)
{
Class<?> clazz;
@@ -410,7 +355,7 @@ public class InjectionResolver
/**
* Resolution by type.
*
- * @param isDelegate whether the InjectionPoint is for a {@link javax.decorator.Delegate}
+ * @param isDelegate whether the InjectionPoint is for a {@link jakarta.decorator.Delegate}
* @param injectionPointType injection point api type
* @param qualifiers qualifiers of the injection point
* @return set of resolved beans
@@ -435,7 +380,7 @@ public class InjectionResolver
/**
* Resolution by type.
*
- * @param isDelegate whether the InjectionPoint is for a {@link javax.decorator.Delegate}
+ * @param isDelegate whether the InjectionPoint is for a {@link jakarta.decorator.Delegate}
* @param injectionPointType injection point api type
* @param qualifiers qualifiers of the injection point
* @return set of resolved beans
@@ -551,11 +496,6 @@ public class InjectionResolver
}
}
- if (resolvedComponents.isEmpty())
- {
- findNewBean(resolvedComponents, injectionPointType, qualifiers);
- }
-
if (!startup && !resolvedComponents.isEmpty())
{
resolvedBeansByType.put(cacheKey, resolvedComponents);
@@ -569,33 +509,6 @@ public class InjectionResolver
return resolvedComponents;
}
- private void findNewBean(Set<Bean<?>> resolvedComponents, Type injectionPointType, Annotation[] qualifiers)
- {
- try
- {
- if (qualifiers.length == 1 && New.class.equals(qualifiers[0].annotationType()))
- {
- // happen in TCKs, shouldn't be the case in real apps
- New newQualifier = (New) qualifiers[0];
- Class<?> beanClass;
- if (newQualifier.value() != New.class)
- {
- beanClass = newQualifier.value();
- }
- else
- {
- beanClass = GenericsUtil.getRawType(injectionPointType);
- }
-
- resolvedComponents.add(webBeansContext.getWebBeansUtil().createNewComponent(beanClass));
- }
- }
- catch (NoClassDefFoundError e)
- {
- logger.log(Level.FINE, "DEBUG_NEW_ANNOTATION_MISSING", e);
- }
- }
-
private Set<Bean<?>> findByBeanType(Set<Bean<?>> allComponents, Type injectionPointType, boolean isDelegate)
{
if (allComponents == null || allComponents.isEmpty())
@@ -745,7 +658,7 @@ public class InjectionResolver
* @param injectionPoint only used for logging. Can be null.
* @param <X>
* @return the single resolved bean, null if none is activated
- * @throws javax.enterprise.inject.AmbiguousResolutionException if more than 1 bean is active
+ * @throws jakarta.enterprise.inject.AmbiguousResolutionException if more than 1 bean is active
*/
public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans, InjectionPoint injectionPoint)
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
index 5055f1ce0..2763a3723 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.container;
-import javax.enterprise.inject.spi.InjectionTargetFactory;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.config.WebBeansContext;
@@ -27,14 +27,14 @@ import org.apache.webbeans.portable.InjectionTargetImpl;
import org.apache.webbeans.portable.events.generics.GProcessInjectionTarget;
import org.apache.webbeans.util.Asserts;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
import java.util.List;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java
index 8dbbf214e..15c31361a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptionFactoryImpl.java
@@ -26,10 +26,10 @@ import org.apache.webbeans.portable.AnnotatedTypeImpl;
import org.apache.webbeans.proxy.InterceptorDecoratorProxyFactory;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InterceptionFactory;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InterceptionFactory;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptorInjectionTargetFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptorInjectionTargetFactory.java
index a63ed4a43..84342b3e8 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptorInjectionTargetFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/InterceptorInjectionTargetFactory.java
@@ -21,8 +21,8 @@ package org.apache.webbeans.container;
import java.util.Collections;
import java.util.List;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
index 6882bc093..e28b6693b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDI.java
@@ -25,10 +25,10 @@ import org.apache.webbeans.corespi.DefaultSingletonService;
import org.apache.webbeans.inject.instance.InstanceImpl;
import org.apache.webbeans.spi.SingletonService;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.enterprise.util.TypeLiteral;
import java.lang.annotation.Annotation;
import java.util.Iterator;
@@ -85,6 +85,20 @@ public class OwbCDI extends CDI<Object>
InstanceImpl.class.cast(instance).destroy(instance);
}
+ @Override
+ public Handle<Object> getHandle()
+ {
+ //X TODO implement!
+ return null;
+ }
+
+ @Override
+ public Iterable<? extends Handle<Object>> handles()
+ {
+ //X TODO implement!
+ return null;
+ }
+
@Override
public <U> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers)
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDIProvider.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDIProvider.java
index b020ef7b4..6644594e4 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDIProvider.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/OwbCDIProvider.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.container;
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.inject.spi.CDIProvider;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDIProvider;
public class OwbCDIProvider implements CDIProvider
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
index addcbfae9..36677c795 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
@@ -22,10 +22,10 @@ import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansDeploymentException;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.io.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -37,7 +37,7 @@ import java.util.Set;
* This is basically a delegate to an underlying Bean<T>.
*
* We use the {@link PassivationCapable#getId()} and
- * {@link javax.enterprise.inject.spi.BeanManager#getPassivationCapableBean(String)}
+ * {@link jakarta.enterprise.inject.spi.BeanManager#getPassivationCapableBean(String)}
* for serialisation and deserialisation.
*
* @version $Rev$Â $Date$
@@ -93,12 +93,6 @@ public final class SerializableBean<T> implements Bean<T>, PassivationCapable, S
return bean.getName();
}
- @Override
- public boolean isNullable()
- {
- return bean.isNullable();
- }
-
@Override
public Set<InjectionPoint> getInjectionPoints()
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java b/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java
index 35087edb8..bb1bb8cf3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBeanVault.java
@@ -21,8 +21,8 @@ package org.apache.webbeans.container;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.spi.Bean;
import org.apache.webbeans.util.WebBeansUtil;
@@ -34,9 +34,9 @@ import org.apache.webbeans.util.WebBeansUtil;
* like e.g. the SessionContext, the ConversationContext or any 3-rd party Context
* for a NormalScoped(passivating=true) and therefore PassivationCapable Scope needs to be Serializable.</p>
* <p>Normal {@link Bean}s are not serializable because they contain non transportable information. But each
- * {@link javax.enterprise.inject.spi.PassivationCapable} {@link Bean} is uniquely
+ * {@link jakarta.enterprise.inject.spi.PassivationCapable} {@link Bean} is uniquely
* identifyable via it's id and can be restored by
- * {@link javax.enterprise.inject.spi.BeanManager#getPassivationCapableBean(String)}.</p>
+ * {@link jakarta.enterprise.inject.spi.BeanManager#getPassivationCapableBean(String)}.</p>
* <p>Since a custom Context implementation doesn't know when it gets passivated (for a Http Session
* this is pretty seldom), the Contextual<T> handed over to the Context implementation must be
* Serializable.</p>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
index 94a6db1b8..499a4b83b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
@@ -30,19 +30,19 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.AlterableContext;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.AlterableContext;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
import org.apache.webbeans.container.SerializableBean;
import org.apache.webbeans.container.SerializableBeanVault;
import org.apache.webbeans.context.creational.BeanInstanceBag;
/**
- * Abstract implementation of the {@link javax.enterprise.context.spi.Context} interfaces.
+ * Abstract implementation of the {@link jakarta.enterprise.context.spi.Context} interfaces.
*
- * @see javax.enterprise.context.spi.Context
+ * @see jakarta.enterprise.context.spi.Context
* @see RequestContext
* @see DependentContext
* @see SessionContext
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
index 43ec3c0fd..a2ab5e6c2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
@@ -22,9 +22,9 @@ import java.lang.annotation.Annotation;
import java.util.Iterator;
import java.util.Set;
-import javax.enterprise.context.ContextException;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.Context;
+import jakarta.enterprise.context.ContextException;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.Context;
import org.apache.webbeans.annotation.BeforeDestroyedLiteral;
import org.apache.webbeans.annotation.DestroyedLiteral;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
index 3ac848e64..2151dca51 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
@@ -22,8 +22,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.Contextual;
import org.apache.webbeans.component.BuiltInOwbBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
index 9d1c59511..cc9d3c0c5 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
@@ -23,7 +23,7 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.ConversationScoped;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.conversation.ConversationImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomAlterablePassivatingContextImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomAlterablePassivatingContextImpl.java
index a2e12e4a8..4502cf808 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomAlterablePassivatingContextImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomAlterablePassivatingContextImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.context;
-import javax.enterprise.context.spi.AlterableContext;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.AlterableContext;
+import jakarta.enterprise.context.spi.Contextual;
import org.apache.webbeans.container.SerializableBeanVault;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomPassivatingContextImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomPassivatingContextImpl.java
index b104c05ce..3a7651fad 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomPassivatingContextImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomPassivatingContextImpl.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.context;
import org.apache.webbeans.container.SerializableBeanVault;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
import java.lang.annotation.Annotation;
/**
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
index 4536ddd84..b0b8734ad 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
@@ -18,12 +18,12 @@
*/
package org.apache.webbeans.context;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
/**
- * Defines the component {@link javax.enterprise.context.Dependent} context.
+ * Defines the component {@link jakarta.enterprise.context.Dependent} context.
* <p>
* Each web beans component has a dependent context, that saves its dependent
* objects. Dependent context is destroyed at the end of the component
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java
index 0e6456bfc..8f993a931 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/PassivatingContext.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.context;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.Contextual;
import java.io.Externalizable;
import java.io.IOException;
import java.io.NotSerializableException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
index ff6568882..79af5c201 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.context;
import java.util.HashMap;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.spi.Contextual;
import org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler;
@@ -63,8 +63,8 @@ public class RequestContext extends AbstractContext
* For a synthetic 'request' this is null. For a real http ServletRequest
* this is the HttpServletRequest.
* This is what gets used as payload for various
- * {@link javax.enterprise.context.Initialized} and
- * {@link javax.enterprise.context.Destroyed} events.
+ * {@link jakarta.enterprise.context.Initialized} and
+ * {@link jakarta.enterprise.context.Destroyed} events.
*
* This can be overloaded in web requests.
* @return the ServletRequest or {@code null} for other kind of requests‚
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
index 04440f5a4..58aa1e33f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.context;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.Contextual;
import org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
index c82a0cd2e..2c6b4bcaa 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.context;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Application context implementation.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/ActivateRequestContextInterceptorBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/ActivateRequestContextInterceptorBean.java
index 890420469..196026f0f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/ActivateRequestContextInterceptorBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/ActivateRequestContextInterceptorBean.java
@@ -23,14 +23,14 @@ import org.apache.webbeans.annotation.EmptyAnnotationLiteral;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.AnnotationUtil;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.control.ActivateRequestContext;
-import javax.enterprise.context.control.RequestContextController;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.interceptor.InvocationContext;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -105,12 +105,6 @@ public class ActivateRequestContextInterceptorBean
return InterceptorClass.class;
}
- @Override
- public boolean isNullable()
- {
- return false;
- }
-
@Override
public Set<Type> getTypes()
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/OwbRequestContextController.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/OwbRequestContextController.java
index b1b315595..d307abb5e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/OwbRequestContextController.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/OwbRequestContextController.java
@@ -23,10 +23,10 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler;
import org.apache.webbeans.spi.ContextsService;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.control.RequestContextController;
-import javax.enterprise.context.spi.Context;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.context.spi.Context;
public class OwbRequestContextController implements RequestContextController
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
index e9041aaff..3c6b64257 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerBean.java
@@ -27,7 +27,7 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.CollectionUtil;
-import javax.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.context.control.RequestContextController;
public class RequestContextControllerBean extends BuiltInOwbBean<RequestContextController>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerProducer.java
index 597b79350..3b6d841a6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/control/RequestContextControllerProducer.java
@@ -23,8 +23,8 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.portable.AbstractProducer;
-import javax.enterprise.context.control.RequestContextController;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.inject.spi.Interceptor;
import java.util.Map;
public class RequestContextControllerProducer extends AbstractProducer<RequestContextController>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
index d85615f4c..e71b15700 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.context.creational;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
import java.io.Serializable;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
index 7c6fa4532..47ef88869 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.context.creational;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
index b0f4fe064..1edc243de 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
@@ -22,11 +22,11 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java
index 1c8f12bc3..167c29cb9 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java
@@ -24,7 +24,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.Contextual;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.WebBeansUtil;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java
index b053a56ab..cacad4254 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.context.creational;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
index c5e7eb57e..4dea1d51f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
@@ -25,9 +25,9 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.BusyConversationException;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.BusyConversationException;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.ConversationScoped;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
index 71cdddc58..08b5c07ef 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
@@ -22,14 +22,14 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.BusyConversationException;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.NonexistentConversationException;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.BusyConversationException;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.NonexistentConversationException;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.annotation.BeforeDestroyedLiteral;
import org.apache.webbeans.annotation.DefaultLiteral;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
index f77745bcc..56ce37783 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.conversation;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.io.Serializable;
import java.lang.annotation.Annotation;
@@ -86,12 +86,6 @@ public class ConversationStorageBean implements Bean<Set<ConversationContext>>,
return Set.class;
}
- @Override
- public boolean isNullable()
- {
- return false;
- }
-
@Override
public Set<Type> getTypes()
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
index 64c7838fb..3080013a5 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
@@ -42,9 +42,9 @@ import org.apache.xbean.finder.archive.Archive;
import org.apache.xbean.finder.filter.Filter;
import org.apache.xbean.finder.util.Files;
-import javax.decorator.Decorator;
-import javax.enterprise.context.Dependent;
-import javax.interceptor.Interceptor;
+import jakarta.decorator.Decorator;
+import jakarta.enterprise.context.Dependent;
+import jakarta.interceptor.Interceptor;
import java.io.File;
import java.io.IOException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
index bc432a5cf..d324af1a0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
@@ -20,16 +20,16 @@ package org.apache.webbeans.corespi.se;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.BusyConversationException;
-import javax.enterprise.context.ContextException;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.NonexistentConversationException;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.Context;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.BusyConversationException;
+import jakarta.enterprise.context.ContextException;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.NonexistentConversationException;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.inject.Singleton;
import org.apache.webbeans.annotation.BeforeDestroyedLiteral;
import org.apache.webbeans.annotation.DestroyedLiteral;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
index 8d80abe44..e98aa4b00 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.corespi.se;
-import javax.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Context;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.SingletonContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/StandaloneContextsService.java b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/StandaloneContextsService.java
index d56361dfd..d731aaf11 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/StandaloneContextsService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/StandaloneContextsService.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.corespi.se;
-import javax.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Context;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.SingletonContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java b/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
index 2fd519bb3..9fdae4654 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.decorator;
import java.util.Comparator;
-import javax.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.Decorator;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
index db472deb9..45f5982d6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
@@ -28,8 +28,8 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
-import javax.annotation.Priority;
-import javax.enterprise.inject.spi.Decorator;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.spi.Decorator;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.component.OwbBean;
@@ -127,7 +127,7 @@ public class DecoratorsManager
for(Class<?> decoratorClazz : enabledDecorators)
{
//Validate decorator classes
- if(!decoratorClazz.isAnnotationPresent(javax.decorator.Decorator.class) && !containsCustomDecoratorClass(decoratorClazz))
+ if(!decoratorClazz.isAnnotationPresent(jakarta.decorator.Decorator.class) && !containsCustomDecoratorClass(decoratorClazz))
{
throw new WebBeansDeploymentException("Given class : " + decoratorClazz + " is not a decorator class");
}
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java b/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
index 96b0b0a8a..d0646405f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
@@ -26,11 +26,11 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Typed;
-import javax.inject.Named;
-import javax.inject.Scope;
+import jakarta.enterprise.context.NormalScope;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Typed;
+import jakarta.inject.Named;
+import jakarta.inject.Scope;
import org.apache.webbeans.annotation.AnnotationManager;
import org.apache.webbeans.config.OWBLogConst;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java b/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
index 37eee6c5e..92c0928ff 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
@@ -21,15 +21,15 @@ package org.apache.webbeans.el;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
/**
* The ELContextStore serves two different purposes
*
* <ol>
* <li>
- * Store {@link javax.enterprise.context.Dependent} objects of the same
+ * Store {@link jakarta.enterprise.context.Dependent} objects of the same
* invocation. See spec section 6.4.3. <i>Dependent pseudo-scope and Unified EL</i>.
* This gets cleaned up with {@link #destroyDependents()} after the whole Expression
* got scanned.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java
index 20426e9cb..52ef319dc 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/ContainerEventObserverMethodImpl.java
@@ -23,11 +23,11 @@ import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.portable.events.AfterObserver;
import org.apache.webbeans.portable.events.discovery.ExtensionAware;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.WithAnnotations;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.WithAnnotations;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventContextImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventContextImpl.java
index d4fe74dce..cb911bb02 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventContextImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventContextImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.event;
-import javax.enterprise.inject.spi.EventContext;
-import javax.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.EventContext;
+import jakarta.enterprise.inject.spi.EventMetadata;
public class EventContextImpl<T> implements EventContext<T>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
index 5f7b71fb1..c19c44d1d 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
@@ -31,11 +31,11 @@ import java.util.concurrent.CompletionStage;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.NotificationOptions;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.NotificationOptions;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.util.TypeLiteral;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.Asserts;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java
index 9de50e0c8..6c9a3cee5 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventMetadataImpl.java
@@ -34,9 +34,9 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.util.TypeLiteral;
import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.config.OwbParametrizedTypeImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
index 84e326034..865ed79ba 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
@@ -25,8 +25,8 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
index 5b7b6ef2e..6cce9156f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
@@ -46,32 +46,32 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.NotificationOptions;
-import javax.enterprise.event.ObserverException;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.EventContext;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessBeanAttributes;
-import javax.enterprise.inject.spi.ProcessInjectionPoint;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.ProcessProducerField;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
-import javax.enterprise.inject.spi.ProcessSyntheticBean;
-import javax.enterprise.inject.spi.ProcessSyntheticObserverMethod;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.event.NotificationOptions;
+import jakarta.enterprise.event.ObserverException;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.EventContext;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessBeanAttributes;
+import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.ProcessSyntheticBean;
+import jakarta.enterprise.inject.spi.ProcessSyntheticObserverMethod;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.config.OWBLogConst;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
index cae44f4cf..a7f985307 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
@@ -31,24 +31,24 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Priority;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.EventContext;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.WithAnnotations;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.EventContext;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.WithAnnotations;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.component.AbstractOwbBean;
@@ -77,7 +77,7 @@ import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
* }
* </pre>
* Above class X instance observes for the event with type <code>LoggedInEvent</code>
- * and event qualifier is <code>Current</code>. Whenever event is fired, its {@link javax.enterprise.inject.spi.ObserverMethod#notify()}
+ * and event qualifier is <code>Current</code>. Whenever event is fired, its {@link jakarta.enterprise.inject.spi.ObserverMethod#notify()}
* method is called.
* </p>
*
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
index a3010d5a6..7cf17d469 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/OwbObserverMethod.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.event;
import java.util.Set;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ObserverMethod;
import org.apache.webbeans.component.AbstractOwbBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/exception/DuplicateDefinitionException.java b/webbeans-impl/src/main/java/org/apache/webbeans/exception/DuplicateDefinitionException.java
index 74954e9e6..814d1a0ad 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/exception/DuplicateDefinitionException.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/exception/DuplicateDefinitionException.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.exception;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.DefinitionException;
import org.apache.webbeans.exception.helper.DescriptiveException;
import org.apache.webbeans.exception.helper.ExceptionMessageBuilder;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/exception/InconsistentSpecializationException.java b/webbeans-impl/src/main/java/org/apache/webbeans/exception/InconsistentSpecializationException.java
index 7e4929dd1..0e23dab0e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/exception/InconsistentSpecializationException.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/exception/InconsistentSpecializationException.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.exception;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.DefinitionException;
import org.apache.webbeans.exception.helper.DescriptiveException;
import org.apache.webbeans.exception.helper.ExceptionMessageBuilder;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java b/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
index 4c930ccbe..65b0a4402 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.exception;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.DefinitionException;
import org.apache.webbeans.exception.helper.DescriptiveException;
import org.apache.webbeans.exception.helper.ExceptionMessageBuilder;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansDeploymentException.java b/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansDeploymentException.java
index d463dd67c..3639a512b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansDeploymentException.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansDeploymentException.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.exception;
-import javax.enterprise.inject.spi.DeploymentException;
+import jakarta.enterprise.inject.spi.DeploymentException;
import org.apache.webbeans.exception.helper.DescriptiveException;
import org.apache.webbeans.exception.helper.ExceptionMessageBuilder;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
index 636088880..15a427268 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
@@ -23,13 +23,13 @@ import java.lang.reflect.Member;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.inject.TransientReference;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.IllegalProductException;
+import jakarta.enterprise.inject.TransientReference;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.component.AbstractProducerBean;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
index 33992aacc..1f69165ad 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Prioritized;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Prioritized;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
@@ -48,7 +48,7 @@ import org.apache.webbeans.util.PriorityClasses;
* After that the AnnotatedType scanning is performed and all @Alternatives with
* @Priority get added as well. We will also add classes which have an Alternative stereotype.
*
- * After the AnnotatedTypes got scanned we have to fire the {@link javax.enterprise.inject.spi.AfterTypeDiscovery}
+ * After the AnnotatedTypes got scanned we have to fire the {@link jakarta.enterprise.inject.spi.AfterTypeDiscovery}
* event with the collected <i>effective</i> alternative classes sorted by their priority.
* Any extension can re-order the alternatives which then form the base of the resolve() handling
* at runtime.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
index 515ff8392..e8c9766db 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
@@ -22,9 +22,9 @@ import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.exception.WebBeansException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
index 12ee84c59..3f6950298 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.inject;
import java.lang.reflect.Field;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.exception.WebBeansException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
index e05341d2f..26cc224ed 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethod.java
@@ -26,13 +26,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.component.ProducerMethodBean;
import org.apache.webbeans.container.InjectionResolver;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
index 952b04209..cd4cf6f04 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.inject;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
/**
* Injects dependencies of the given Java EE component
@@ -53,7 +53,7 @@ public final class OWBInjector
}
AnnotatedType annotatedType = beanManager.createAnnotatedType(instanceUnderInjection.getClass());
- beanManager.createInjectionTarget(annotatedType).inject(instanceUnderInjection, creationalContext);
+ beanManager.getInjectionTargetFactory(annotatedType).createInjectionTarget(null).inject(instanceUnderInjection, creationalContext);
}
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
index f97708f40..a3a735ca3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
@@ -27,20 +27,20 @@ import org.apache.webbeans.spi.InjectionPointService;
import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.Asserts;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -264,9 +264,6 @@ public class InjectionPointFactory
for (AnnotatedParameter<?> annotatedParameter : annotatedMethod.getParameters())
{
- annotationManager.checkForNewQualifierForDeployment(annotatedParameter.getBaseType(), annotatedMethod.getDeclaringType().getJavaClass(),
- method.getName(), AnnotationUtil.asArray(annotatedParameter.getAnnotations()));
-
if (annotatedParameter.isAnnotationPresent(Disposes.class) ||
annotatedParameter.isAnnotationPresent(Observes.class) ||
annotatedParameter.isAnnotationPresent(ObservesAsync.class))
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
index 1f9190635..f2acf9feb 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
@@ -36,16 +36,16 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.decorator.Delegate;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.decorator.Delegate;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
index c8eb74640..059c94497 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
@@ -34,15 +34,15 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
-import javax.enterprise.context.spi.AlterableContext;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Provider;
+import jakarta.enterprise.context.spi.AlterableContext;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Provider;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.config.WebBeansContext;
@@ -109,6 +109,20 @@ public class InstanceImpl<T> implements Instance<T>, Serializable
}
}
+ @Override
+ public Handle<T> getHandle()
+ {
+ //X TODO implement!
+ return null;
+ }
+
+ @Override
+ public Iterable<? extends Handle<T>> handles()
+ {
+ //X TODO implement!
+ return null;
+ }
+
/**
* Returns the bean instance with given qualifier annotations.
*
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
index 7158ec37e..6144c80f6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
@@ -25,8 +25,8 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Provider;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Provider;
+import jakarta.interceptor.InvocationContext;
import org.apache.webbeans.util.ExceptionUtil;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java
index d7b4750f7..8eb2214d1 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java
@@ -18,19 +18,19 @@
*/
package org.apache.webbeans.intercept;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
/**
- * <p>This is a {@link javax.inject.Provider} especially
+ * <p>This is a {@link jakarta.inject.Provider} especially
* made for @ApplicationScoped beans.</p>
*
* <p>Since there is only one single contextual instance of an @ApplicationScoped bean,
* we can simply cache this instance inside our bean. We only need to reload this instance
* if it is null. This happens at the first usage and after the MethodHandler got deserialized</p>
*
- * <p>Also if the application uses the {@link javax.enterprise.context.spi.AlterableContext#destroy(javax.enterprise.context.spi.Contextual)}
+ * <p>Also if the application uses the {@link jakarta.enterprise.context.spi.AlterableContext#destroy(jakarta.enterprise.context.spi.Contextual)}
* method on any ApplicationScoped bean, then the standard NormalScopedBeanInterceptorHandler must be configured to prevent any caching.
* Be careful as this might slow down your application!</p>
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java
index 9b197d6c0..eedd7b809 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ConstructorInterceptorInvocationContext.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.intercept;
import org.apache.webbeans.util.ExceptionUtil;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.inject.Provider;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
index 5e68b7d0a..c83460d51 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
@@ -27,10 +27,10 @@ import org.apache.webbeans.proxy.InterceptorHandler;
import org.apache.webbeans.util.ExceptionUtil;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.Producer;
import java.io.Externalizable;
import java.io.IOException;
import java.io.NotSerializableException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
index 89ef74caf..634cd59a5 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
@@ -27,12 +27,12 @@ import org.apache.webbeans.proxy.InterceptorHandler;
import org.apache.webbeans.util.ExceptionUtil;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.inject.Provider;
import java.io.Externalizable;
import java.io.IOException;
import java.io.NotSerializableException;
@@ -66,7 +66,7 @@ public class DefaultInterceptorHandler<T> implements InterceptorHandler, Externa
/**
* The passivation if in case this is a
- * {@link javax.enterprise.inject.spi.PassivationCapable} bean.
+ * {@link jakarta.enterprise.inject.spi.PassivationCapable} bean.
* we just keep this field for serializing it away
*/
private String beanPassivationId;
@@ -82,7 +82,7 @@ public class DefaultInterceptorHandler<T> implements InterceptorHandler, Externa
* @param delegate the outermost Decorator or the intercepted instance
* @param interceptors Map with all active interceptors for each method.
* @param instances the Interceptor instances
- * @param beanPassivationId passivationId if a Bean is {@link javax.enterprise.inject.spi.PassivationCapable}
+ * @param beanPassivationId passivationId if a Bean is {@link jakarta.enterprise.inject.spi.PassivationCapable}
*/
public DefaultInterceptorHandler(T target,
T delegate,
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
index 4bbe8031e..4f5404f53 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.intercept;
import java.util.Comparator;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java
index 2ef4c9a28..8b9055cce 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorInvocationContext.java
@@ -22,9 +22,9 @@ import java.lang.reflect.AccessibleObject;
import java.util.List;
import java.util.Map;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.inject.Provider;
/**
* InvocationContext for business method interceptors
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
index 9a02b7cda..c2f35c10a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
@@ -35,24 +35,24 @@ import org.apache.webbeans.util.AnnotationUtil;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -253,8 +253,8 @@ public class InterceptorResolutionService
}
/**
- * Lifycycle methods like {@link javax.annotation.PostConstruct} and
- * {@link javax.annotation.PreDestroy} must not define a checked Exception
+ * Lifycycle methods like {@link jakarta.annotation.PostConstruct} and
+ * {@link jakarta.annotation.PreDestroy} must not define a checked Exception
* regarding to the spec. But this is often unnecessary restrictive so we
* allow to disable this check application wide.
*
@@ -1011,7 +1011,7 @@ public class InterceptorResolutionService
}
/**
- * The (sorted) EJB-style ({@link javax.interceptor.Interceptors})
+ * The (sorted) EJB-style ({@link jakarta.interceptor.Interceptors})
* Interceptor Beans for a specific method or <code>null</code>
* if no Interceptor exists for this method.
* They must be called <i>before</i> the {@link #cdiInterceptors}!
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
index 92042b87a..e18ea9be9 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
@@ -24,8 +24,8 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.annotation.AnnotationManager;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
index 15c7ffe97..6b3822c69 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
@@ -31,9 +31,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.component.BeanAttributesImpl;
import org.apache.webbeans.component.creation.BeanAttributesBuilder;
@@ -276,7 +276,7 @@ public class InterceptorsManager
/**
* Add a CDI-style interceptor.
- * These are interceptors declared using an {@link javax.interceptor.InterceptorBinding}.
+ * These are interceptors declared using an {@link jakarta.interceptor.InterceptorBinding}.
* @param interceptor
*/
public void addCdiInterceptor(Interceptor interceptor)
@@ -339,7 +339,7 @@ public class InterceptorsManager
AnnotatedType<?> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(interceptorClass);
// Validate decorator classes
- if(!annotatedType.isAnnotationPresent(javax.interceptor.Interceptor.class) &&
+ if(!annotatedType.isAnnotationPresent(jakarta.interceptor.Interceptor.class) &&
!containsCustomInterceptorClass(interceptorClass))
{
throw new WebBeansDeploymentException("Given class : " + interceptorClass + " is not a interceptor class");
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java
index dc62fb91b..dd18b1d89 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/LifecycleInterceptorInvocationContext.java
@@ -20,10 +20,10 @@ package org.apache.webbeans.intercept;
import org.apache.webbeans.util.ExceptionUtil;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.interceptor.InvocationContext;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
index 41334f8c8..8766f6397 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.intercept;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.UnproxyableResolutionException;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.inject.Provider;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.inject.Provider;
import java.io.NotSerializableException;
import java.io.ObjectStreamException;
import java.io.Serializable;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java
index e6149998c..53c4b7494 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.intercept;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.util.HashMap;
/**
- * <p>This is a {@link javax.inject.Provider} especially
+ * <p>This is a {@link jakarta.inject.Provider} especially
* made for @RequestScoped beans used in web applications.</p>
*
* <p>Since there is only one single contextual instance of an @RequestScoped bean per thread,
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java
index bca71b800..e40e2dc76 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.intercept;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.util.HashMap;
/**
- * <p>This is a {@link javax.inject.Provider} especially
+ * <p>This is a {@link jakarta.inject.Provider} especially
* made for @SessionScoped beans used in web applications.</p>
*
* <p>Since there is only one single contextual instance of an @SessionScoped bean per thread,
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
index 3802a20c4..3121fd977 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.config.BeansDeployer;
import org.apache.webbeans.config.OWBLogConst;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
index 7afa83ee0..60b1fddea 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.lifecycle;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Singleton;
import java.util.Properties;
import java.util.logging.Logger;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java b/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
index 5796fc57f..7946f0fd0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
@@ -25,7 +25,7 @@ package org.apache.webbeans.logger;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.util.WebBeansConstants;
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java b/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java
index b495958e3..dc8673cc2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJmsPlugin.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.plugins;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Bean;
import org.apache.webbeans.jms.JMSModel;
import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java b/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
index dc94575f9..2531c6cd7 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.exception.WebBeansConfigurationException;
-import javax.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.DefinitionException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
import org.apache.webbeans.spi.plugins.OpenWebBeansJavaEEPlugin;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
index 741e73a8c..d0a8b4aa7 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
@@ -30,7 +30,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.logging.Level;
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Annotated;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
index 8b7d2ee5b..f7a80eb65 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
@@ -26,9 +26,9 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
/**
* Implementation of {@link AnnotatedCallable} interface.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
index b9e03eddb..b57f8b451 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
@@ -22,8 +22,8 @@ import java.lang.reflect.Member;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
index 53864b9a6..88d221194 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractDecoratorInjectionTarget.java
@@ -24,11 +24,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractEjbInjectionTarget.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractEjbInjectionTarget.java
index 1d70355e6..9ec749b9b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractEjbInjectionTarget.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractEjbInjectionTarget.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.portable;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
index d2c0c1f66..6eaa61345 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
@@ -24,16 +24,16 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.decorator.Delegate;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.decorator.Delegate;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.component.BeanManagerBean;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java
index 62ce90dcd..d0254f691 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java
@@ -27,9 +27,9 @@ import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
/**
* Implementation of {@link AnnotatedConstructor} interface.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
index 460c932cc..af02078b8 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
@@ -29,10 +29,10 @@ import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
@@ -41,7 +41,7 @@ import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ClassUtil;
/**
- * Factory for {@link javax.enterprise.inject.spi.Annotated} elements.
+ * Factory for {@link jakarta.enterprise.inject.spi.Annotated} elements.
*
* @version $Rev$ $Date$
*/
@@ -123,7 +123,7 @@ public final class AnnotatedElementFactory
/**
* This method will get used to manually add AnnoatedTypes to our storage.
* Those AnnotatedTypes are coming from Extensions and get registered e.g. via
- * {@link javax.enterprise.inject.spi.BeforeBeanDiscovery#addAnnotatedType(AnnotatedType)}
+ * {@link jakarta.enterprise.inject.spi.BeforeBeanDiscovery#addAnnotatedType(AnnotatedType)}
*
* Sets the annotatedType and replace the given one.
* @param annotatedType
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java
index 715d6f9cd..8c583b5ae 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java
@@ -23,8 +23,8 @@ import org.apache.webbeans.util.GenericsUtil;
import java.lang.reflect.Field;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedType;
/**
* Implementation of {@link AnnotatedField} interface.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java
index 2bda95ed8..4573423e7 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java
@@ -25,9 +25,9 @@ import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
/**
* Implementation of {@link AnnotatedMethod} interface.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
index 22ff3f4a3..b6628f1c7 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
@@ -22,8 +22,8 @@ import org.apache.webbeans.config.WebBeansContext;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
/**
* Implementation of {@link AnnotatedParameter} interface.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
index 1610b745b..6a68db8de 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
@@ -30,11 +30,11 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
index 9a36df1a2..8803b50bb 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
@@ -24,14 +24,14 @@ import org.apache.webbeans.inject.InjectableMethod;
import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
import org.apache.webbeans.util.Asserts;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Set;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanManagerProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanManagerProducer.java
index 7a62aa353..ef5568677 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanManagerProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanManagerProducer.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.portable;
import java.util.Map;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectableBeanManager;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanMetadataProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanMetadataProducer.java
index edc1ebef4..2714d32bb 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanMetadataProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanMetadataProducer.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.portable;
import java.util.Map;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ConversationProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ConversationProducer.java
index 751657518..d0d7d355c 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ConversationProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ConversationProducer.java
@@ -20,11 +20,11 @@ package org.apache.webbeans.portable;
import java.util.Collections;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.ConversationContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventMetadataProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventMetadataProducer.java
index 4b7c4380d..a114b2ba8 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventMetadataProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventMetadataProducer.java
@@ -21,10 +21,10 @@ package org.apache.webbeans.portable;
import java.util.Collections;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.EventMetadata;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.EventMetadata;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java
index e6c2459ca..75b9f823b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java
@@ -26,10 +26,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ExtensionProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ExtensionProducer.java
index 77410899b..2fde0c9c3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ExtensionProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ExtensionProducer.java
@@ -20,9 +20,9 @@ package org.apache.webbeans.portable;
import java.util.Map;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java
index 633375ca1..97c60efe1 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionPointProducer.java
@@ -29,11 +29,11 @@ import java.lang.reflect.Type;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.component.InjectionPointBean;
import org.apache.webbeans.component.third.ThirdpartyBeanImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
index e24d968b6..875b79a44 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
@@ -41,23 +41,23 @@ import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.ExceptionUtil;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.interceptor.InvocationContext;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
index abd03b5f6..99e430ebf 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InstanceProducer.java
@@ -24,9 +24,9 @@ import java.lang.reflect.Type;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.component.InstanceBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java
index b23aca0d3..01adea918 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/LazyInterceptorDefinedInjectionTarget.java
@@ -22,11 +22,11 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.creational.CreationalContextImpl;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.annotation.Annotation;
import java.util.HashSet;
import java.util.List;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/MetadataProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/MetadataProducer.java
index 2330e794d..12a14b744 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/MetadataProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/MetadataProducer.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.portable;
import java.util.Map;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
index 0686590e5..d55387ca6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerFieldProducer.java
@@ -28,13 +28,13 @@ import org.apache.webbeans.proxy.OwbInterceptorProxy;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Collections;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
index 4492da5b6..c47652b35 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProducerMethodProducer.java
@@ -23,11 +23,11 @@ import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
@@ -36,7 +36,7 @@ import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
import org.apache.webbeans.util.Asserts;
/**
- * A {@link javax.enterprise.inject.spi.Producer} for producer-method beans.
+ * A {@link jakarta.enterprise.inject.spi.Producer} for producer-method beans.
*/
public class ProducerMethodProducer<T, P> extends BaseProducerProducer<T, P>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java
index be3f209fe..69a2d611d 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducer.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.portable;
import java.util.Map;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.inject.Provider;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
index f3266bac6..d059f7966 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ProviderBasedProducerFactory.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.portable;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Producer;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.inject.Provider;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.ProducerFactory;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.Asserts;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ResourceProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ResourceProducer.java
index 6b1a5d8d9..c5f4ebecd 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/ResourceProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/ResourceProducer.java
@@ -26,10 +26,10 @@ import org.apache.webbeans.spi.api.ResourceReference;
import java.lang.reflect.Modifier;
import java.util.Collections;
import java.util.Map;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
public class ResourceProducer<T, P> extends ProducerFieldProducer<T, P>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
index 4d067c3ca..0c5df6a58 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
@@ -33,10 +33,10 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.DefinitionException;
-import javax.enterprise.inject.spi.DeploymentException;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.DeploymentException;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.webbeans.component.ExtensionBean;
import org.apache.webbeans.component.creation.ExtensionBeanBuilder;
@@ -51,7 +51,7 @@ import org.apache.webbeans.util.WebBeansUtil;
import org.apache.xbean.finder.archive.FileArchive;
/**
- * Loads META-INF/services/javax.enterprise.inject.spi.Extension
+ * Loads META-INF/services/jakarta.enterprise.inject.spi.Extension
* services.
*
* @version $Rev$ $Date$
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
index f493ae0b7..acc0bd5d6 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
@@ -21,9 +21,9 @@ package org.apache.webbeans.portable.events;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.configurator.AnnotatedTypeConfiguratorImpl;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
/**
* Default implementation of the {@link ProcessAnnotatedType}.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java
index 9c5a136e6..ad8d6f1ac 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanAttributesImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.ProcessBeanAttributes;
-import javax.enterprise.inject.spi.configurator.BeanAttributesConfigurator;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.ProcessBeanAttributes;
+import jakarta.enterprise.inject.spi.configurator.BeanAttributesConfigurator;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.configurator.BeanAttributesConfiguratorImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
index 733ddb36c..cd8d12a92 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.ProcessBean;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java
index 7f6a5626d..a025e12c4 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionPointImpl.java
@@ -21,13 +21,13 @@ package org.apache.webbeans.portable.events;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.configurator.InjectionPointConfiguratorImpl;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessInjectionPoint;
-import javax.enterprise.inject.spi.configurator.InjectionPointConfigurator;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
+import jakarta.enterprise.inject.spi.configurator.InjectionPointConfigurator;
/**
* Fired for every {@link InjectionPoint} of every Java EE component class supporting injection,
- * including every {@link javax.annotation.ManagedBean}, EJB session or message-driven bean, bean, interceptor or decorator.
+ * including every {@link jakarta.annotation.ManagedBean}, EJB session or message-driven bean, bean, interceptor or decorator.
*
* @param <T> bean class
* @param <X> declared type
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
index e738924a2..1b5f75ac3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
index 0e5ad371a..431d6e75a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import org.apache.webbeans.component.ManagedBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
index 25cdd2aa7..cc8b1ba83 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.configurator.ObserverMethodConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.configurator.ObserverMethodConfigurator;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.configurator.ObserverMethodConfiguratorImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
index 111a659fd..0c18d9457 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
import org.apache.webbeans.component.ProducerFieldBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
index eb0df5f61..1daf3b7a4 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.Producer;
-import javax.enterprise.inject.spi.configurator.ProducerConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.configurator.ProducerConfigurator;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.configurator.ProducerConfiguratorImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
index b07a15e7b..1f6ec1ef1 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
import org.apache.webbeans.component.ProducerMethodBean;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
index 12261e930..0093127aa 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.ProcessSessionBean;
-import javax.enterprise.inject.spi.SessionBeanType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.ProcessSessionBean;
+import jakarta.enterprise.inject.spi.SessionBeanType;
/**
* Implementation of {@link ProcessSessionBean}.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
index a6780dc84..0e387413b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSyntheticAnnotatedTypeImpl.java
@@ -18,14 +18,14 @@
*/
package org.apache.webbeans.portable.events;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessSyntheticAnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType;
import org.apache.webbeans.config.WebBeansContext;
/**
- * Default implementation of the {@link javax.enterprise.inject.spi.ProcessSyntheticAnnotatedType}.
+ * Default implementation of the {@link jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType}.
*
* @param <X> bean class info
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
index f025a2fd2..fdbd8675f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
@@ -18,22 +18,22 @@
*/
package org.apache.webbeans.portable.events.discovery;
-import javax.annotation.Priority;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.EventContext;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.Prioritized;
-import javax.enterprise.inject.spi.ProcessSyntheticBean;
-import javax.enterprise.inject.spi.configurator.BeanConfigurator;
-import javax.enterprise.inject.spi.configurator.ObserverMethodConfigurator;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.EventContext;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.Prioritized;
+import jakarta.enterprise.inject.spi.ProcessSyntheticBean;
+import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
+import jakarta.enterprise.inject.spi.configurator.ObserverMethodConfigurator;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.config.OWBLogConst;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java
index 7ab7a1b90..cd30a07a2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.portable.events.discovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.portable.events.EventBase;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterTypeDiscoveryImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterTypeDiscoveryImpl.java
index 802170467..acffb6af0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterTypeDiscoveryImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterTypeDiscoveryImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events.discovery;
-import javax.enterprise.inject.spi.AfterTypeDiscovery;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.enterprise.inject.spi.AfterTypeDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AnnotatedTypeConfiguratorHolder.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AnnotatedTypeConfiguratorHolder.java
index 0e6a95882..36154fa13 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AnnotatedTypeConfiguratorHolder.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AnnotatedTypeConfiguratorHolder.java
@@ -18,13 +18,13 @@
*/
package org.apache.webbeans.portable.events.discovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.webbeans.configurator.AnnotatedTypeConfiguratorImpl;
/**
* Hold information for lifecycle Events which can modify or add multiple
- * {@link javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator}
+ * {@link jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator}
*/
public class AnnotatedTypeConfiguratorHolder<T>
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
index b6443ee80..0c4c8253a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
@@ -25,10 +25,10 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.configurator.AnnotatedTypeConfiguratorImpl;
@@ -59,16 +59,6 @@ public class BeforeBeanDiscoveryImpl extends EventBase implements BeforeBeanDisc
beanManager = this.webBeansContext.getBeanManagerImpl();
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void addAnnotatedType(AnnotatedType<?> type)
- {
- checkState();
- beanManager.addAdditionalAnnotatedType(extension, type);
- }
-
/**
* {@inheritDoc}
*/
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeShutdownImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeShutdownImpl.java
index 619d54ad6..1eace9d7f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeShutdownImpl.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeShutdownImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.portable.events.discovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
/**
* Event that is fired by the container before it shuts down.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ExtensionAware.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ExtensionAware.java
index 960beb753..395312dc9 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ExtensionAware.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ExtensionAware.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.portable.events.discovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
public interface ExtensionAware
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java
index 7b3f41254..5780ea7ea 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.events.ProcessAnnotatedTypeImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java
index 5aa4a15ac..be6cc315a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
import org.apache.webbeans.portable.events.ProcessBeanImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java
index 5651d035d..1abac1cb2 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBeanAttributes.java
@@ -21,8 +21,8 @@ package org.apache.webbeans.portable.events.generics;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.events.ProcessBeanAttributesImpl;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanAttributes;
public class GProcessBeanAttributes extends ProcessBeanAttributesImpl implements GenericBeanEvent
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionPoint.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionPoint.java
index 909e58f6b..9882b572d 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionPoint.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionPoint.java
@@ -20,8 +20,8 @@ package org.apache.webbeans.portable.events.generics;
import org.apache.webbeans.portable.events.ProcessInjectionPointImpl;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.reflect.Type;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java
index 8b187a7ec..7594b2a07 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java
@@ -21,7 +21,7 @@ package org.apache.webbeans.portable.events.generics;
import org.apache.webbeans.portable.InjectionTargetImpl;
import org.apache.webbeans.portable.events.ProcessInjectionTargetImpl;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
@SuppressWarnings("unchecked")
public class GProcessInjectionTarget extends ProcessInjectionTargetImpl implements GenericBeanEvent
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java
index 8cd833705..d5bee2c1b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.portable.events.ProcessManagedBeanImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObserverMethod.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObserverMethod.java
index f896ca540..6d69d83b7 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObserverMethod.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObserverMethod.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.ObserverMethod;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.events.ProcessObserverMethodImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducer.java
index f3999c77c..09e294f59 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducer.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.webbeans.portable.events.ProcessProducerImpl;
import org.apache.webbeans.util.ClassUtil;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerField.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerField.java
index 1b05e6aa3..98ddac558 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerField.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerField.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
import org.apache.webbeans.component.ProducerFieldBean;
import org.apache.webbeans.portable.events.ProcessProducerFieldImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerMethod.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerMethod.java
index 4d8cc2b0d..6c993c092 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerMethod.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerMethod.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
import org.apache.webbeans.component.ProducerMethodBean;
import org.apache.webbeans.portable.events.ProcessProducerMethodImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSessionBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSessionBean.java
index 107aba3b1..bbdec7373 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSessionBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSessionBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.ProcessSessionBean;
-import javax.enterprise.inject.spi.SessionBeanType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.ProcessSessionBean;
+import jakarta.enterprise.inject.spi.SessionBeanType;
import org.apache.webbeans.portable.events.ProcessSessionBeanImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
index 1fc79815e..1cd514dcb 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticAnnotatedType.java
@@ -18,8 +18,8 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.events.ProcessSyntheticAnnotatedTypeImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticBean.java
index 78ad0b3a2..5a38ac599 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticBean.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticBean.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessSyntheticBean;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessSyntheticBean;
@SuppressWarnings("unchecked")
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticObserverMethod.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticObserverMethod.java
index 7c3ced037..5a61fdcc4 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticObserverMethod.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSyntheticObserverMethod.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.portable.events.generics;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.ProcessSyntheticObserverMethod;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessSyntheticObserverMethod;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
index 34f3ee910..fddd32846 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
@@ -44,7 +44,7 @@ import org.apache.xbean.asm9.Opcodes;
import org.apache.xbean.asm9.Type;
import org.apache.xbean.asm9.shade.commons.EmptyVisitor;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
/**
* Base class for all OWB Proxy factories
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
index 5b8f8210f..8dfedfaea 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
@@ -31,8 +31,8 @@ import org.apache.xbean.asm9.MethodVisitor;
import org.apache.xbean.asm9.Opcodes;
import org.apache.xbean.asm9.Type;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
import java.io.ObjectStreamException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
index be4471d2f..4b89518ce 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.proxy;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Provider;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Provider;
import java.io.ObjectStreamException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -49,7 +49,7 @@ import org.apache.xbean.asm9.Type;
/**
* This factory creates proxies which delegate the
* method invocations 1:1 to an instance which gets
- * resolved via a {@link javax.inject.Provider}.
+ * resolved via a {@link jakarta.inject.Provider}.
*/
public class NormalScopeProxyFactory extends AbstractProxyFactory
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbNormalScopeProxy.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbNormalScopeProxy.java
index b1e6a9b7d..dcd7b439a 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbNormalScopeProxy.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/OwbNormalScopeProxy.java
@@ -22,11 +22,11 @@ package org.apache.webbeans.proxy;
import java.io.Serializable;
/**
- * <p>Interface for all OpenWebBeans {@link javax.enterprise.context.NormalScope} Proxies.
+ * <p>Interface for all OpenWebBeans {@link jakarta.enterprise.context.NormalScope} Proxies.
* A normalscoping proxy just resolves the underlying Contextual Instance
* and directly invokes the target method onto it.</p>
*
- * <p>Each <code>OwbNormalScopeProxy</code> contains a {@link javax.inject.Provider}
+ * <p>Each <code>OwbNormalScopeProxy</code> contains a {@link jakarta.inject.Provider}
* which returns the current Contextual Instance.</p>
*
* <p>This interface extends Serializable because every NormalScoped bean proxy must
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
index 26483ef8f..605a31034 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
@@ -32,8 +32,8 @@ import org.apache.xbean.asm9.MethodVisitor;
import org.apache.xbean.asm9.Opcodes;
import org.apache.xbean.asm9.Type;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedType;
/**
* This factory creates subclasses for abstract classes.
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultInjectionPointService.java b/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultInjectionPointService.java
index ca12f6b44..792e45cb0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultInjectionPointService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultInjectionPointService.java
@@ -18,10 +18,10 @@
*/
package org.apache.webbeans.service;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.Annotated;
-import javax.inject.Inject;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.inject.Inject;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java b/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
index 4a7c88291..86b544f66 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
@@ -23,7 +23,7 @@ import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.spi.LoaderService;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
import java.util.List;
import java.util.ServiceLoader;
import java.util.logging.Level;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
index fba8093f2..55d730360 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
@@ -27,10 +27,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.util.Nonbinding;
import org.apache.webbeans.annotation.AnyLiteral;
import org.apache.webbeans.annotation.DefaultLiteral;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
index 67b4540fc..50370f002 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.WebBeansException;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtil.java
index e75e58e64..e9624624f 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtil.java
@@ -21,11 +21,11 @@ package org.apache.webbeans.util;
import org.apache.webbeans.exception.helper.ViolationMessageBuilder;
import static org.apache.webbeans.exception.helper.ViolationMessageBuilder.newViolation;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.UnproxyableResolutionException;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.AmbiguousResolutionException;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.UnproxyableResolutionException;
import java.util.Set;
import java.lang.annotation.Annotation;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java
index 90ec2d217..933381a69 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/PriorityClasses.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.util;
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -51,7 +51,7 @@ public class PriorityClasses
/**
* Used for Classes which are added by Beans which implement the
- * {@link javax.enterprise.inject.spi.Prioritized} interface
+ * {@link jakarta.enterprise.inject.spi.Prioritized} interface
*/
public void add(Class<?> clazz, int priority)
{
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java
index c47e45fc9..7cec43f59 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/SpecializationUtil.java
@@ -18,11 +18,11 @@
*/
package org.apache.webbeans.util;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanAttributes;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Arrays;
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
index 5ea7ac6a7..12469d604 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
@@ -33,7 +33,7 @@ public final class WebBeansConstants
}
public static final String [] OWB_INJECTABLE_RESOURCE_ANNOTATIONS = {"javax.ejb.EJB",
- "javax.annotation.Resource",
+ "jakarta.annotation.Resource",
"javax.xml.ws.WebServiceRef",
"javax.persistence.PersistenceUnit",
"javax.persistence.PersistenceContext"};
@@ -53,7 +53,7 @@ public final class WebBeansConstants
public static final String WEB_BEANS_XML_IF_CLASS_AVAILABLE = "if-class-available";
public static final String WEB_BEANS_XML_IF_SYSTEM_PROPERTY = "if-system-property";
- /**JNDI name of the {@link javax.enterprise.inject.spi.BeanManager} instance*/
+ /**JNDI name of the {@link jakarta.enterprise.inject.spi.BeanManager} instance*/
public static final String WEB_BEANS_MANAGER_JNDI_NAME = "java:comp/BeanManager";
public final static String WEB_BEANS_MESSAGES = "openwebbeans/Messages";
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
index cbd36388a..0aa876d57 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
@@ -20,7 +20,6 @@ package org.apache.webbeans.util;
import org.apache.webbeans.annotation.AnnotationManager;
import org.apache.webbeans.annotation.DefaultLiteral;
-import org.apache.webbeans.annotation.NewLiteral;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.AbstractProducerBean;
import org.apache.webbeans.component.BeanAttributesImpl;
@@ -38,13 +37,11 @@ import org.apache.webbeans.component.InterceptedOrDecoratedBeanMetadataBean;
import org.apache.webbeans.component.InterceptionFactoryBean;
import org.apache.webbeans.component.InterceptorMetadataBean;
import org.apache.webbeans.component.ManagedBean;
-import org.apache.webbeans.component.NewManagedBean;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.component.PrincipalBean;
import org.apache.webbeans.component.ProducerFieldBean;
import org.apache.webbeans.component.ProducerMethodBean;
import org.apache.webbeans.component.ResourceBean;
-import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.component.creation.BeanAttributesBuilder;
import org.apache.webbeans.component.creation.ManagedBeanBuilder;
import org.apache.webbeans.component.creation.ObserverMethodsBuilder;
@@ -86,55 +83,55 @@ import org.apache.webbeans.spi.InjectionPointService;
import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin;
-import javax.annotation.Priority;
-import javax.decorator.Decorator;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Decorated;
-import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Intercepted;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.DefinitionException;
-import javax.enterprise.inject.spi.DeploymentException;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InterceptionFactory;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessBeanAttributes;
-import javax.enterprise.inject.spi.ProcessInjectionPoint;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.ProcessProducerField;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
-import javax.enterprise.inject.spi.ProcessSessionBean;
-import javax.enterprise.inject.spi.ProcessSyntheticAnnotatedType;
-import javax.enterprise.inject.spi.ProcessSyntheticBean;
-import javax.enterprise.inject.spi.ProcessSyntheticObserverMethod;
-import javax.enterprise.inject.spi.Producer;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.decorator.Decorator;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Decorated;
+import jakarta.enterprise.inject.IllegalProductException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Intercepted;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.DefinitionException;
+import jakarta.enterprise.inject.spi.DeploymentException;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InterceptionFactory;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessBeanAttributes;
+import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.ProcessSessionBean;
+import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessSyntheticBean;
+import jakarta.enterprise.inject.spi.ProcessSyntheticObserverMethod;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.annotation.Annotation;
@@ -148,8 +145,6 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -157,7 +152,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.enterprise.inject.spi.AfterTypeDiscovery;
+import jakarta.enterprise.inject.spi.AfterTypeDiscovery;
/**
@@ -346,13 +341,13 @@ public final class WebBeansUtil
public void checkManagedBeanCondition(Class<?> clazz) throws WebBeansConfigurationException
{
- if (AnnotationUtil.hasClassAnnotation(clazz, Decorator.class) && AnnotationUtil.hasClassAnnotation(clazz, javax.interceptor.Interceptor.class))
+ if (AnnotationUtil.hasClassAnnotation(clazz, Decorator.class) && AnnotationUtil.hasClassAnnotation(clazz, jakarta.interceptor.Interceptor.class))
{
throw new WebBeansConfigurationException("ManagedBean implementation class : " + clazz.getName()
+ " may not annotated with both @Interceptor and @Decorator annotation");
}
- if (!AnnotationUtil.hasClassAnnotation(clazz, Decorator.class) && !AnnotationUtil.hasClassAnnotation(clazz, javax.interceptor.Interceptor.class))
+ if (!AnnotationUtil.hasClassAnnotation(clazz, Decorator.class) && !AnnotationUtil.hasClassAnnotation(clazz, jakarta.interceptor.Interceptor.class))
{
webBeansContext.getInterceptorUtil().checkSimpleWebBeansInterceptorConditions(clazz);
}
@@ -436,47 +431,6 @@ public final class WebBeansUtil
return null;
}
- public <T> Bean<T> createNewComponent(Class<T> type)
- {
- Asserts.nullCheckForClass(type);
-
- OpenWebBeansEjbPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbPlugin();
- if (ejbPlugin != null && ejbPlugin.isNewSessionBean(type))
- {
- return ejbPlugin.defineNewSessionBean(type);
- }
-
- AnnotatedType<T> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type);
- BeanAttributesImpl<T> defaultBeanAttributes = BeanAttributesBuilder.forContext(webBeansContext).newBeanAttibutes(annotatedType).build();
- BeanAttributesImpl<T> newBeanAttributes = new BeanAttributesImpl<>(defaultBeanAttributes.getTypes(), Collections.<Annotation>singleton(new NewLiteral(type)));
- // TODO replace this by InjectionPointBuilder
- ManagedBeanBuilder<T, ManagedBean<T>> beanBuilder = new ManagedBeanBuilder<>(webBeansContext, annotatedType, newBeanAttributes, false);
- NewManagedBean<T> newBean
- = new NewManagedBean<>(webBeansContext, WebBeansType.MANAGED, annotatedType, newBeanAttributes, type, beanBuilder.getBean().getInjectionPoints());
- return newBean;
- }
-
- /**
- * New WebBeans component class.
- *
- * @return the new component
- */
- public <T> NewManagedBean<T> createNewComponent(OwbBean<T> bean, Class<T> type)
- {
- Asserts.assertNotNull(bean, "bean");
- if (!EnumSet.of(WebBeansType.MANAGED, WebBeansType.ENTERPRISE, WebBeansType.PRODUCERMETHOD, WebBeansType.PRODUCERFIELD).contains(bean.getWebBeansType()))
- {
- throw new WebBeansConfigurationException("@New annotation on type : " + bean.getBeanClass()
- + " must defined as a simple or an enterprise web bean");
- }
-
- AnnotatedType<T> annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type);
- BeanAttributesImpl<T> newBeanAttributes = new BeanAttributesImpl<>(bean.getTypes(), Collections.<Annotation>singleton(new NewLiteral(type)));
- NewManagedBean<T> newBean = new NewManagedBean<>(bean.getWebBeansContext(), bean.getWebBeansType(), annotatedType, newBeanAttributes, type, bean.getInjectionPoints());
- //TODO XXX set producer
- return newBean;
- }
-
/**
* Creates a new manager bean instance.
* @return new manager bean instance
@@ -634,7 +588,7 @@ public final class WebBeansUtil
if(!(rawType.isAssignableFrom(Instance.class)))
{
throw new WebBeansConfigurationException("<Instance> field injection " + injectionPoint.toString()
- + " must have type javax.inject.Instance");
+ + " must have type jakarta.inject.Instance");
}
else
{
@@ -1188,7 +1142,7 @@ public final class WebBeansUtil
}
/**
- * This method will be used in {@link AfterBeanDiscovery#addBean(javax.enterprise.inject.spi.Bean)}}
+ * This method will be used in {@link AfterBeanDiscovery#addBean(jakarta.enterprise.inject.spi.Bean)}}
*/
public <T> ManagedBean<T> defineManagedBeanWithoutFireEvents(AnnotatedType<T> type)
{
... 15053 lines suppressed ...
[openwebbeans] 01/05: OWB-1417 bump version to 4.0.0-SNAPSHOT
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 6cc7ac227c536f81678a22cb889b3174dbb79b6a
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sun Jan 22 16:18:12 2023 +0100
OWB-1417 bump version to 4.0.0-SNAPSHOT
---
atinject-tck/pom.xml | 2 +-
bom/openwebbeans-se-bom/pom.xml | 2 +-
bom/openwebbeans-web-bom/pom.xml | 2 +-
bom/pom.xml | 2 +-
distribution/pom.xml | 2 +-
pom.xml | 2 +-
samples/conversation-sample/pom.xml | 2 +-
samples/guess/pom.xml | 2 +-
samples/jsf2sample/pom.xml | 2 +-
samples/pom.xml | 2 +-
samples/reservation/pom.xml | 2 +-
samples/standalone-sample/pom.xml | 2 +-
samples/tomcat7-sample/pom.xml | 2 +-
webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +-
webbeans-arquillian/pom.xml | 2 +-
webbeans-ee-common/pom.xml | 2 +-
webbeans-ee/pom.xml | 2 +-
webbeans-ejb/pom.xml | 2 +-
webbeans-el22/pom.xml | 2 +-
webbeans-gradle/pom.xml | 2 +-
webbeans-impl/pom.xml | 2 +-
webbeans-jetty9/pom.xml | 2 +-
webbeans-jms/pom.xml | 2 +-
webbeans-jsf/pom.xml | 2 +-
webbeans-junit5/pom.xml | 2 +-
webbeans-osgi/pom.xml | 2 +-
webbeans-porting/pom.xml | 2 +-
webbeans-resource/pom.xml | 2 +-
webbeans-se/pom.xml | 2 +-
webbeans-slf4j/pom.xml | 2 +-
webbeans-spi/pom.xml | 2 +-
webbeans-tck-jakarta/pom.xml | 2 +-
webbeans-tck/pom.xml | 2 +-
webbeans-tomcat7/pom.xml | 2 +-
webbeans-web/pom.xml | 2 +-
35 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml
index 35bc036f3..2743c50d0 100644
--- a/atinject-tck/pom.xml
+++ b/atinject-tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml
index 816375a7f..edc25b6b2 100644
--- a/bom/openwebbeans-se-bom/pom.xml
+++ b/bom/openwebbeans-se-bom/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>bom</artifactId>
<groupId>org.apache.openwebbeans.bom</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml
index caa4bd113..c2536d5e3 100644
--- a/bom/openwebbeans-web-bom/pom.xml
+++ b/bom/openwebbeans-web-bom/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>bom</artifactId>
<groupId>org.apache.openwebbeans.bom</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/bom/pom.xml b/bom/pom.xml
index f37f9fe27..bf0aacc41 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>openwebbeans</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 62f735f74..c5e5d2e88 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 1f7dcc03d..beef082df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<artifactId>openwebbeans</artifactId>
<name>Apache OpenWebBeans</name>
<packaging>pom</packaging>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<url>openwebbeans.apache.org</url>
diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml
index d8d03d973..f44fe711d 100644
--- a/samples/conversation-sample/pom.xml
+++ b/samples/conversation-sample/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml
index c160edccd..1b18a22d9 100644
--- a/samples/guess/pom.xml
+++ b/samples/guess/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>samples</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml
index 8dbade093..199253f06 100644
--- a/samples/jsf2sample/pom.xml
+++ b/samples/jsf2sample/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/pom.xml b/samples/pom.xml
index 5ee1f4d4d..36abb61c3 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml
index 9d4275e20..b461fb73a 100644
--- a/samples/reservation/pom.xml
+++ b/samples/reservation/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>samples</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/standalone-sample/pom.xml b/samples/standalone-sample/pom.xml
index 1666a7fc7..895e2fda9 100644
--- a/samples/standalone-sample/pom.xml
+++ b/samples/standalone-sample/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/samples/tomcat7-sample/pom.xml b/samples/tomcat7-sample/pom.xml
index 4eef69883..a54a16a30 100644
--- a/samples/tomcat7-sample/pom.xml
+++ b/samples/tomcat7-sample/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>samples</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
index 7004fb759..82793cf0a 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml
+++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.openwebbeans.arquillian</groupId>
<artifactId>owb-arquillian-parent</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>owb-arquillian-standalone</artifactId>
<packaging>jar</packaging>
diff --git a/webbeans-arquillian/pom.xml b/webbeans-arquillian/pom.xml
index 9d0ed85a3..28616a9ce 100644
--- a/webbeans-arquillian/pom.xml
+++ b/webbeans-arquillian/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openwebbeans.arquillian</groupId>
<artifactId>owb-arquillian-parent</artifactId>
diff --git a/webbeans-ee-common/pom.xml b/webbeans-ee-common/pom.xml
index e970c0b13..270cc9434 100644
--- a/webbeans-ee-common/pom.xml
+++ b/webbeans-ee-common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webbeans-ee/pom.xml b/webbeans-ee/pom.xml
index aae54f06f..35ec99b4b 100644
--- a/webbeans-ee/pom.xml
+++ b/webbeans-ee/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-ee</artifactId>
diff --git a/webbeans-ejb/pom.xml b/webbeans-ejb/pom.xml
index 77be659be..51c99a353 100644
--- a/webbeans-ejb/pom.xml
+++ b/webbeans-ejb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-ejb</artifactId>
<name>EJB plugin</name>
diff --git a/webbeans-el22/pom.xml b/webbeans-el22/pom.xml
index 71fa8a810..e53093cad 100644
--- a/webbeans-el22/pom.xml
+++ b/webbeans-el22/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webbeans-gradle/pom.xml b/webbeans-gradle/pom.xml
index 428480832..c85942957 100644
--- a/webbeans-gradle/pom.xml
+++ b/webbeans-gradle/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>openwebbeans</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/webbeans-impl/pom.xml b/webbeans-impl/pom.xml
index 464cf24e6..2fe51b1ca 100644
--- a/webbeans-impl/pom.xml
+++ b/webbeans-impl/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-impl</artifactId>
<name>OpenWebBeans Core</name>
diff --git a/webbeans-jetty9/pom.xml b/webbeans-jetty9/pom.xml
index 2d24438fd..07eef4195 100644
--- a/webbeans-jetty9/pom.xml
+++ b/webbeans-jetty9/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-jetty9</artifactId>
diff --git a/webbeans-jms/pom.xml b/webbeans-jms/pom.xml
index 7295a1a70..2ce4f0a78 100644
--- a/webbeans-jms/pom.xml
+++ b/webbeans-jms/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-jms</artifactId>
<name>JMS plugin</name>
diff --git a/webbeans-jsf/pom.xml b/webbeans-jsf/pom.xml
index 7430b3117..78f2435bb 100644
--- a/webbeans-jsf/pom.xml
+++ b/webbeans-jsf/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-jsf</artifactId>
diff --git a/webbeans-junit5/pom.xml b/webbeans-junit5/pom.xml
index 5b0ae0b7d..6df39ecf9 100644
--- a/webbeans-junit5/pom.xml
+++ b/webbeans-junit5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-junit5</artifactId>
diff --git a/webbeans-osgi/pom.xml b/webbeans-osgi/pom.xml
index cef1e0ecb..c53e2cb10 100644
--- a/webbeans-osgi/pom.xml
+++ b/webbeans-osgi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-osgi</artifactId>
diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml
index 7f4c3e27f..d2d943d23 100644
--- a/webbeans-porting/pom.xml
+++ b/webbeans-porting/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webbeans-resource/pom.xml b/webbeans-resource/pom.xml
index 496b7787d..1c27497f8 100644
--- a/webbeans-resource/pom.xml
+++ b/webbeans-resource/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-resource</artifactId>
<name>EE Resource plugin</name>
diff --git a/webbeans-se/pom.xml b/webbeans-se/pom.xml
index f15f0ce67..319429670 100644
--- a/webbeans-se/pom.xml
+++ b/webbeans-se/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>openwebbeans</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/webbeans-slf4j/pom.xml b/webbeans-slf4j/pom.xml
index 53cdf0de9..579e9cdb5 100644
--- a/webbeans-slf4j/pom.xml
+++ b/webbeans-slf4j/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>openwebbeans</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/webbeans-spi/pom.xml b/webbeans-spi/pom.xml
index aa7c4f27f..47d515ef6 100644
--- a/webbeans-spi/pom.xml
+++ b/webbeans-spi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-spi</artifactId>
diff --git a/webbeans-tck-jakarta/pom.xml b/webbeans-tck-jakarta/pom.xml
index 34b0f0a2f..3605ad33a 100644
--- a/webbeans-tck-jakarta/pom.xml
+++ b/webbeans-tck-jakarta/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index fc6f58f91..239318668 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/webbeans-tomcat7/pom.xml b/webbeans-tomcat7/pom.xml
index b0e1e01cd..8b89c6a3c 100644
--- a/webbeans-tomcat7/pom.xml
+++ b/webbeans-tomcat7/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-tomcat7</artifactId>
diff --git a/webbeans-web/pom.xml b/webbeans-web/pom.xml
index 8728ae28c..e0ae1709d 100644
--- a/webbeans-web/pom.xml
+++ b/webbeans-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.28-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans-web</artifactId>
[openwebbeans] 03/05: OWB-1417 re-enable more owb modules
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 8eef18a9884ef1b08a32005de2f4b140bc610ef3
Author: Mark Struberg <st...@apache.org>
AuthorDate: Mon Jan 23 23:26:31 2023 +0100
OWB-1417 re-enable more owb modules
---
pom.xml | 123 ++++-----------------
.../apache/webbeans/sample/bean/LogoutBean.java | 2 +-
samples/jsf2sample/pom.xml | 2 +-
samples/reservation/pom.xml | 2 +-
.../webbeans/reservation/beans/LogoutBean.java | 2 +-
.../webbeans/reservation/util/JSFUtility.java | 2 +-
.../webbeans/samples/tomcat/InjectorServlet.java | 8 +-
.../apache/webbeans/samples/tomcat/MyFilter.java | 12 +-
.../owb-arquillian-standalone/pom.xml | 11 +-
webbeans-el22/pom.xml | 43 ++++---
.../apache/webbeans/web/jetty9/test/TestBean.java | 2 +-
.../webbeans/web/jetty9/test/TestServlet.java | 12 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 2 +-
.../webbeans/web/jetty9/test/TestServlet.java | 12 +-
.../apache/webbeans/web/jetty9/test/TestBean.java | 2 +-
.../webbeans/web/jetty9/test/TestServlet.java | 12 +-
.../webbeans/web/jetty9/JettySecurityFilter.java | 14 +--
.../apache/webbeans/web/jetty9/JettyWebPlugin.java | 20 ++--
.../webbeans/web/jetty9/OwbConfiguration.java | 4 +-
.../test/JettyNormalScopeProxyFactoryTest.java | 4 +-
webbeans-jsf/pom.xml | 2 +-
.../main/java/org/apache/webbeans/jsf/JSFUtil.java | 2 +-
webbeans-osgi/pom.xml | 2 +-
.../osgi/scanner/OsgiMetaDataScannerService.java | 2 +-
webbeans-porting/pom.xml | 6 +-
webbeans-se/pom.xml | 84 +++++++-------
.../org/apache/openwebbeans/se/OWBContainer.java | 14 +++
...ta.enterprise.inject.se.SeContainerInitializer} | 0
.../java/org/apache/openwebbeans/se/CDISETest.java | 2 +-
webbeans-tck/pom.xml | 6 +-
{webbeans-tomcat7 => webbeans-tomcat}/pom.xml | 46 ++++----
.../src/it/fatwar/pom.xml | 0
.../apache/webbeans/web/tomcat7/test/TestBean.java | 2 +-
.../webbeans/web/tomcat7/test/TestRequestBean.java | 0
.../webbeans/web/tomcat7/test/TestServlet.java | 14 +--
.../webbeans/web/tomcat7/test/TestSessionBean.java | 0
.../it/fatwar/src/main/webapp/META-INF/context.xml | 0
.../it/fatwar/src/main/webapp/WEB-INF/beans.xml | 0
.../src/it/fatwar/src/main/webapp/WEB-INF/web.xml | 0
.../web/tomcat7/test/OwbTomcatPluginIT.java | 0
.../src/it/servletinjection/pom.xml | 0
.../apache/webbeans/web/tomcat7/test/TestBean.java | 2 +-
.../webbeans/web/tomcat7/test/TestServlet.java | 12 +-
.../src/main/webapp/META-INF/context.xml | 2 +-
.../src/main/webapp/WEB-INF/beans.xml | 0
.../src/main/webapp/WEB-INF/web.xml | 0
.../web/tomcat7/test/OwbTomcatPluginIT.java | 0
.../src/it/settings.xml | 0
.../web/tomcat}/ContextLifecycleListener.java | 8 +-
.../web/tomcat}/TomcatInstanceManager.java | 2 +-
.../webbeans/web/tomcat}/TomcatSecurityFilter.java | 16 +--
.../web/tomcat}/TomcatSecurityService.java | 2 +-
.../apache/webbeans/web/tomcat}/TomcatUtil.java | 2 +-
.../webbeans/web/tomcat}/TomcatWebPlugin.java | 22 ++--
.../META-INF/openwebbeans/openwebbeans.properties | 2 +-
....apache.webbeans.spi.plugins.OpenWebBeansPlugin | 2 +-
.../src/main/resources/META-INF/web-fragment.xml | 2 +-
.../src/site/site.xml | 0
.../webbeans/web/tomcat}/test/MySessionScoped.java | 2 +-
.../webbeans/web/tomcat}/test/MyWrapper.java | 2 +-
.../test/TomcatNormalScopeProxyFactoryTest.java | 12 +-
webbeans-web/pom.xml | 80 ++++++--------
.../org/apache/openwebbeans/web/it/ForwardIT.java | 2 +-
.../src/main/java/org/superbiz/TestServlet.java | 10 +-
.../conversation/ConversationITServlet.java | 10 +-
.../openwebbeans/web/it/ConversationScopedIT.java | 2 +-
.../openwebbeans/web/it/RequestScopedIT.java | 2 +-
.../servlet/WebBeansConfigurationFilter.java | 18 +--
.../WebBeansConfigurationHttpSessionListener.java | 4 +-
.../servlet/WebBeansConfigurationListener.java | 16 +--
.../web/context/ServletRequestContext.java | 2 +-
.../webbeans/web/context/WebContextsService.java | 8 +-
.../web/context/WebConversationFilter.java | 12 +-
.../web/context/WebConversationService.java | 6 +-
.../webbeans/web/lifecycle/ServletContextBean.java | 2 +-
.../webbeans/web/lifecycle/ServletRequestBean.java | 2 +-
.../web/lifecycle/WebContainerLifecycle.java | 8 +-
.../web/lifecycle/test/MockHttpSession.java | 40 +------
.../web/lifecycle/test/MockServletContext.java | 93 ++++++++++------
.../lifecycle/test/MockServletContextEvent.java | 2 +-
.../webbeans/web/scanner/WebScannerService.java | 2 +-
.../web/util/ServletCompatibilityUtil.java | 2 +-
.../java/WebBeansConfigurationListenerTest.java | 4 +-
.../web/tests/ConversationLoggingTest.java | 2 +-
.../apache/webbeans/web/tests/MockHttpSession.java | 35 +-----
.../webbeans/web/tests/MockServletRequest.java | 76 ++++++++-----
.../apache/webbeans/web/tests/WebBeansTest.java | 6 +-
.../InitializedSessionScopedTest.java | 2 +-
.../web/tests/initialization/MySessionHandler.java | 2 +-
.../interceptor/CachedInterceptorHandlerTest.java | 2 +-
.../web/tests/interceptor/SerializationTest.java | 2 +-
91 files changed, 466 insertions(+), 551 deletions(-)
diff --git a/pom.xml b/pom.xml
index bf25af695..c98012a4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,14 @@
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
+ <tomcat.version>10.1.5</tomcat.version>
+
+ <httpclient.version>4.5.14</httpclient.version>
+ <xbean.version>4.22</xbean.version>
+ <arquillian.version>1.7.0.Alpha10</arquillian.version>
+
+<!-- OLD remove: -->
<geronimo_jaxws.version>1.2</geronimo_jaxws.version>
<geronimo_servlet.version>1.0</geronimo_servlet.version>
<geronimo_ejb.version>1.0.2</geronimo_ejb.version>
@@ -92,14 +99,10 @@
<geronimo_jta.version>1.1.1</geronimo_jta.version>
<geronimo_jsp.version>1.0.1</geronimo_jsp.version>
<geronimo_validation.version>1.1</geronimo_validation.version>
- <tomcat7.version>7.0.109</tomcat7.version>
<!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 -->
<jetty.version>9.4.12.v20180830</jetty.version>
<myfaces.version>2.3.6</myfaces.version>
- <xbean.version>4.22</xbean.version>
- <arquillian.version>1.7.0.Alpha10</arquillian.version>
<cdi.tck.version>2.0.5.Final</cdi.tck.version>
- <httpclient.version>4.5.13</httpclient.version>
<osgi.servlet.range>2.4</osgi.servlet.range>
<osgi.el.range>2.2</osgi.el.range>
@@ -375,96 +378,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${maven-shade-plugin.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>jakarta</shadedClassifierName>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <artifactSet> <!-- don't include transitive deps -->
- <includes>
- <include>${project.groupId}:${project.artifactId}</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>jakarta.annotation.</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>jakarta.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>jakarta.el</pattern>
- <shadedPattern>jakarta.el</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>jakarta.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.decorator</pattern>
- <shadedPattern>jakarta.decorator</shadedPattern>
- </relocation>
- <relocation>
- <pattern>jakarta.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>jakarta.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.transaction</pattern>
- <shadedPattern>jakarta.transaction</shadedPattern>
- <excludes>
- <exclude>javax.transaction.xa.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.persistence</pattern>
- <shadedPattern>jakarta.persistence</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.faces</pattern>
- <shadedPattern>jakarta.faces</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.ejb</pattern>
- <shadedPattern>jakarta.ejb</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -665,27 +578,27 @@
<modules>
<module>webbeans-spi</module>
<module>webbeans-impl</module>
+ <module>webbeans-el22</module>
+ <module>webbeans-se</module>
+ <module>webbeans-web</module>
+ <module>webbeans-tomcat</module>
+ <module>webbeans-arquillian</module>
<!--X TODO re-enable
<module>webbeans-ee-common</module>
- <module>webbeans-web</module>
<module>webbeans-ejb</module>
<module>webbeans-ee</module>
- <module>webbeans-tomcat7</module>
<module>webbeans-jetty9</module>
<module>webbeans-jms</module>
<module>webbeans-jsf</module>
- <module>webbeans-el22</module>
<module>webbeans-resource</module>
<module>webbeans-osgi</module>
<module>webbeans-porting</module>
- <module>webbeans-arquillian</module>
<module>samples</module>
<module>atinject-tck</module>
<module>webbeans-tck</module>
<module>webbeans-tck-jakarta</module>
<module>distribution</module>
<module>webbeans-gradle</module>
- <module>webbeans-se</module>
<module>webbeans-junit5</module>
<module>webbeans-slf4j</module>
<module>bom</module>
@@ -743,7 +656,19 @@
<version>${jakarta.validation-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>${tomcat.version}</version>
+ </dependency>
+
+<!-- OLD REMOVE -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
diff --git a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
index 2a00f83de..cc1321abe 100644
--- a/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
+++ b/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
@@ -21,7 +21,7 @@ package org.apache.webbeans.sample.bean;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.apache.webbeans.sample.bindings.LoggedInUser;
import org.apache.webbeans.sample.model.User;
diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml
index 9c7943069..1140707c5 100644
--- a/samples/jsf2sample/pom.xml
+++ b/samples/jsf2sample/pom.xml
@@ -111,7 +111,7 @@ under the License.
<!-- JSTL -->
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>jakarta.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml
index 934c3ab9b..35c5aa0ab 100644
--- a/samples/reservation/pom.xml
+++ b/samples/reservation/pom.xml
@@ -58,7 +58,7 @@ under the License.
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>jakarta.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java
index 07e63bfdf..82a285a4e 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LogoutBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.reservation.beans;
import jakarta.enterprise.context.RequestScoped;
import jakarta.inject.Named;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.apache.webbeans.reservation.util.JSFUtility;
diff --git a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
index 07fb8516f..e5430ec73 100644
--- a/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
+++ b/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/JSFUtility.java
@@ -21,7 +21,7 @@ package org.apache.webbeans.reservation.util;
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
/**
* Simple JSF Utility methods.
diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
index e5f43aeb2..2d7418b61 100644
--- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
+++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
@@ -24,10 +24,10 @@ import java.io.PrintWriter;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.CDI;
import jakarta.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class InjectorServlet extends HttpServlet
{
diff --git a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
index 36c52f19a..d60ee87a2 100644
--- a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
+++ b/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.inject.Inject;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
public class MyFilter implements Filter
diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
index 72ea89731..9d60d00aa 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml
+++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
@@ -25,6 +25,7 @@
<artifactId>owb-arquillian-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
+
<artifactId>owb-arquillian-standalone</artifactId>
<packaging>jar</packaging>
@@ -58,8 +59,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -91,6 +92,12 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
</dependencies>
diff --git a/webbeans-el22/pom.xml b/webbeans-el22/pom.xml
index 1eadba9d9..289620ef0 100644
--- a/webbeans-el22/pom.xml
+++ b/webbeans-el22/pom.xml
@@ -31,11 +31,28 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -51,26 +68,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
diff --git a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
index eb921b184..446aea6d4 100644
--- a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
+++ b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.web.jetty9.test;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Test bean which gets used in the TestServlet.
diff --git a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
index 4eec945a3..b1f2344c8 100644
--- a/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
+++ b/webbeans-jetty9/src/it/fatwar/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
@@ -19,12 +19,12 @@
package org.apache.webbeans.web.jetty9.test;
import jakarta.inject.Inject;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
/**
diff --git a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
index eb921b184..446aea6d4 100644
--- a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
+++ b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.web.jetty9.test;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Test bean which gets used in the TestServlet.
diff --git a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
index 8052a560a..305a9ad9d 100644
--- a/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
+++ b/webbeans-jetty9/src/it/module/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
@@ -19,12 +19,12 @@
package org.apache.webbeans.web.jetty9.test;
import jakarta.inject.Inject;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
/**
diff --git a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
index eb921b184..446aea6d4 100644
--- a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
+++ b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.web.jetty9.test;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Test bean which gets used in the TestServlet.
diff --git a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
index 8052a560a..305a9ad9d 100644
--- a/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
+++ b/webbeans-jetty9/src/it/servletinjection/src/main/java/org/apache/webbeans/web/jetty9/test/TestServlet.java
@@ -19,12 +19,12 @@
package org.apache.webbeans.web.jetty9.test;
import jakarta.inject.Inject;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
/**
diff --git a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java
index 359294f41..090e9769b 100644
--- a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java
+++ b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettySecurityFilter.java
@@ -21,13 +21,13 @@ package org.apache.webbeans.web.jetty9;
import java.io.IOException;
import java.security.Principal;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
public class JettySecurityFilter implements Filter
{
diff --git a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
index b506480a8..86533207e 100644
--- a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
+++ b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
@@ -20,16 +20,16 @@ package org.apache.webbeans.web.jetty9;
import java.util.EventListener;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContextAttributeListener;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRequestAttributeListener;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpSessionActivationListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.Filter;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContextAttributeListener;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRequestAttributeListener;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.HttpSessionActivationListener;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.http.HttpSessionListener;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.spi.SecurityService;
diff --git a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java
index 2ae934205..1f21beb81 100644
--- a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java
+++ b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/OwbConfiguration.java
@@ -22,8 +22,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.EventListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
diff --git a/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java b/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java
index e99f89729..faea8392d 100644
--- a/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java
+++ b/webbeans-jetty9/src/test/java/org/apache/webbeans/web/jetty9/test/JettyNormalScopeProxyFactoryTest.java
@@ -27,8 +27,8 @@ import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.CDI;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.http.HttpSession;
import org.apache.commons.io.IOUtils;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-jsf/pom.xml b/webbeans-jsf/pom.xml
index 697a00854..92117752d 100644
--- a/webbeans-jsf/pom.xml
+++ b/webbeans-jsf/pom.xml
@@ -86,7 +86,7 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.*;version="[${osgi.servlet.range},5)",
+ jakarta.servlet.*;version="[${osgi.servlet.range},5)",
jakarta.el.*;version="[${osgi.el.range},3)",
javax.faces.*;version="[${osgi.faces.range},3)",
*
diff --git a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
index f7d8687ba..555265cee 100644
--- a/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
+++ b/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
@@ -21,7 +21,7 @@ package org.apache.webbeans.jsf;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.apache.webbeans.util.Asserts;
diff --git a/webbeans-osgi/pom.xml b/webbeans-osgi/pom.xml
index c61b0c9f8..cf06ac11f 100644
--- a/webbeans-osgi/pom.xml
+++ b/webbeans-osgi/pom.xml
@@ -79,7 +79,7 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.*;version="[${osgi.servlet.range},5)",
+ jakarta.servlet.*;version="[${osgi.servlet.range},5)",
*
</Import-Package>
</instructions>
diff --git a/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java b/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
index accb5f84a..131633c88 100644
--- a/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
+++ b/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
@@ -34,7 +34,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
diff --git a/webbeans-porting/pom.xml b/webbeans-porting/pom.xml
index 77fed21c1..5f5f4acdb 100644
--- a/webbeans-porting/pom.xml
+++ b/webbeans-porting/pom.xml
@@ -47,11 +47,11 @@
<artifactId>jsf-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet.jsp</groupId>
+ <groupId>jakarta.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
diff --git a/webbeans-se/pom.xml b/webbeans-se/pom.xml
index 319429670..f23aad4a3 100644
--- a/webbeans-se/pom.xml
+++ b/webbeans-se/pom.xml
@@ -16,52 +16,46 @@
License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>openwebbeans</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>openwebbeans</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>openwebbeans-se</artifactId>
- <name>Apache OpenWebBeans CDI Java SE Implementation</name>
+ <artifactId>openwebbeans-se</artifactId>
+ <name>Apache OpenWebBeans CDI Java SE Implementation</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java b/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java
index 36371f3c5..c1fe34667 100644
--- a/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java
+++ b/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBContainer.java
@@ -92,6 +92,20 @@ public class OWBContainer implements SeContainer
return instance().isAmbiguous();
}
+ @Override
+ public Handle<Object> getHandle()
+ {
+ //X TODO implement, new in CDI-4.0
+ return null;
+ }
+
+ @Override
+ public Iterable<? extends Handle<Object>> handles()
+ {
+ //X TODO implement, new in CDI-4.0
+ return null;
+ }
+
@Override
public void destroy(Object instance) // not sure it is the right impl
{
diff --git a/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer b/webbeans-se/src/main/resources/META-INF/services/jakarta.enterprise.inject.se.SeContainerInitializer
similarity index 100%
rename from webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
rename to webbeans-se/src/main/resources/META-INF/services/jakarta.enterprise.inject.se.SeContainerInitializer
diff --git a/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java b/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java
index 1f22e315f..323f069d3 100644
--- a/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java
+++ b/webbeans-se/src/test/java/org/apache/openwebbeans/se/CDISETest.java
@@ -79,7 +79,7 @@ public class CDISETest
try (final SeContainer container = SeContainerInitializer.newInstance()
.disableDiscovery()
.initialize()) {
- container.getBeanManager().fireEvent(new Object());
+ container.getBeanManager().getEvent().fire(new Object());
}
}
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index 6b29e4424..02749de6d 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -100,11 +100,11 @@
<artifactId>jsf-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet.jsp</groupId>
+ <groupId>jakarta.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
diff --git a/webbeans-tomcat7/pom.xml b/webbeans-tomcat/pom.xml
similarity index 92%
rename from webbeans-tomcat7/pom.xml
rename to webbeans-tomcat/pom.xml
index faa2992fd..e3b0e3623 100644
--- a/webbeans-tomcat7/pom.xml
+++ b/webbeans-tomcat/pom.xml
@@ -23,18 +23,10 @@
<version>4.0.0-SNAPSHOT</version>
</parent>
- <artifactId>openwebbeans-tomcat7</artifactId>
- <name>Tomcat 7 plugin</name>
- <description>Apache OpenWebBeans Tomcat 7 Web Profile</description>
+ <artifactId>openwebbeans-tomcat</artifactId>
+ <name>Tomcat plugin</name>
<dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -43,6 +35,11 @@
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -60,44 +57,51 @@
<artifactId>openwebbeans-web</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ <optional> true</optional>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat7.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat7.version}</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
- <version>${tomcat7.version}</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
- <version>${tomcat7.version}</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>${tomcat7.version}</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/webbeans-tomcat7/src/it/fatwar/pom.xml b/webbeans-tomcat/src/it/fatwar/pom.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/pom.xml
rename to webbeans-tomcat/src/it/fatwar/pom.xml
diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
similarity index 96%
rename from webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
index 5e1181734..6081ccbac 100644
--- a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
+++ b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.web.tomcat7.test;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Test bean which gets used in the TestServlet.
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java
rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
similarity index 92%
rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
index 60c075d4f..f541fd912 100644
--- a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
+++ b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
@@ -20,13 +20,13 @@ package org.apache.webbeans.web.tomcat7.test;
import jakarta.enterprise.inject.spi.CDI;
import jakarta.inject.Inject;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
/**
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java b/webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java
rename to webbeans-tomcat/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/webapp/META-INF/context.xml b/webbeans-tomcat/src/it/fatwar/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/src/main/webapp/META-INF/context.xml
rename to webbeans-tomcat/src/it/fatwar/src/main/webapp/META-INF/context.xml
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml b/webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml
rename to webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/web.xml b/webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/src/main/webapp/WEB-INF/web.xml
rename to webbeans-tomcat/src/it/fatwar/src/main/webapp/WEB-INF/web.xml
diff --git a/webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java b/webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
similarity index 100%
rename from webbeans-tomcat7/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
rename to webbeans-tomcat/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
diff --git a/webbeans-tomcat7/src/it/servletinjection/pom.xml b/webbeans-tomcat/src/it/servletinjection/pom.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/servletinjection/pom.xml
rename to webbeans-tomcat/src/it/servletinjection/pom.xml
diff --git a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
similarity index 96%
rename from webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
rename to webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
index 5e1181734..6081ccbac 100644
--- a/webbeans-tomcat7/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
+++ b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java
@@ -20,7 +20,7 @@ package org.apache.webbeans.web.tomcat7.test;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Test bean which gets used in the TestServlet.
diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
similarity index 89%
rename from webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
rename to webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
index 178784ce3..363063b79 100644
--- a/webbeans-tomcat7/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
+++ b/webbeans-tomcat/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java
@@ -19,12 +19,12 @@
package org.apache.webbeans.web.tomcat7.test;
import jakarta.inject.Inject;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
/**
diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/META-INF/context.xml
similarity index 91%
rename from webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
rename to webbeans-tomcat/src/it/servletinjection/src/main/webapp/META-INF/context.xml
index cfeb3eebc..1de779675 100644
--- a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
+++ b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/META-INF/context.xml
@@ -16,5 +16,5 @@
License.
-->
<Context>
- <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" />
+ <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" />
</Context>
diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml
rename to webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml
diff --git a/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml b/webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml
rename to webbeans-tomcat/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml
diff --git a/webbeans-tomcat7/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java b/webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
similarity index 100%
rename from webbeans-tomcat7/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
rename to webbeans-tomcat/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java
diff --git a/webbeans-tomcat7/src/it/settings.xml b/webbeans-tomcat/src/it/settings.xml
similarity index 100%
rename from webbeans-tomcat7/src/it/settings.xml
rename to webbeans-tomcat/src/it/settings.xml
diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
similarity index 96%
rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java
rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
index 4511b897c..a4adaa34d 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java
+++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7;
+package org.apache.webbeans.web.tomcat;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
@@ -26,9 +26,9 @@ import org.apache.tomcat.InstanceManager;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributeListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextAttributeEvent;
+import jakarta.servlet.ServletContextAttributeListener;
import java.lang.reflect.Field;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
similarity index 99%
rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java
rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
index 5d2551f06..19f8c4ccc 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatInstanceManager.java
+++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7;
+package org.apache.webbeans.web.tomcat;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityFilter.java
similarity index 86%
rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java
rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityFilter.java
index c2972fb1a..c090c8bb2 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityFilter.java
+++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityFilter.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7;
+package org.apache.webbeans.web.tomcat;
import java.io.IOException;
import java.security.Principal;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
/**
diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityService.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
similarity index 98%
rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityService.java
rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
index 4e4313a51..67be9580f 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatSecurityService.java
+++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7;
+package org.apache.webbeans.web.tomcat;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Proxy;
diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
similarity index 98%
rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java
rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
index 4d37339a9..aa5b35e32 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java
+++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7;
+package org.apache.webbeans.web.tomcat;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
diff --git a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java
similarity index 86%
rename from webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
rename to webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java
index ba00ef427..0ce1e98d1 100644
--- a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
+++ b/webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7;
+package org.apache.webbeans.web.tomcat;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContextAttributeListener;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRequestAttributeListener;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpSessionActivationListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.Filter;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContextAttributeListener;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRequestAttributeListener;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.HttpSessionActivationListener;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.http.HttpSessionListener;
import java.util.EventListener;
diff --git a/webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-tomcat/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
similarity index 97%
rename from webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
rename to webbeans-tomcat/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
index 75e5aa5b4..3220be0c6 100644
--- a/webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
+++ b/webbeans-tomcat/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
@@ -21,4 +21,4 @@
# use a special securityService for Principal injection
-org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat7.TomcatSecurityService
\ No newline at end of file
+org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat.TomcatSecurityService
\ No newline at end of file
diff --git a/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin b/webbeans-tomcat/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
similarity index 94%
rename from webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
rename to webbeans-tomcat/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
index 3fab96735..f5b90c117 100644
--- a/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
+++ b/webbeans-tomcat/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.webbeans.web.tomcat7.TomcatWebPlugin
\ No newline at end of file
+org.apache.webbeans.web.tomcat.TomcatWebPlugin
\ No newline at end of file
diff --git a/webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml b/webbeans-tomcat/src/main/resources/META-INF/web-fragment.xml
similarity index 93%
rename from webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml
rename to webbeans-tomcat/src/main/resources/META-INF/web-fragment.xml
index 0e01ae4e5..69619143f 100644
--- a/webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml
+++ b/webbeans-tomcat/src/main/resources/META-INF/web-fragment.xml
@@ -26,7 +26,7 @@
<filter>
<icon/>
<filter-name>OwbSecurityFilter</filter-name>
- <filter-class>org.apache.webbeans.web.tomcat7.TomcatSecurityFilter</filter-class>
+ <filter-class>org.apache.webbeans.web.tomcat.TomcatSecurityFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>OwbSecurityFilter</filter-name>
diff --git a/webbeans-tomcat7/src/site/site.xml b/webbeans-tomcat/src/site/site.xml
similarity index 100%
rename from webbeans-tomcat7/src/site/site.xml
rename to webbeans-tomcat/src/site/site.xml
diff --git a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MySessionScoped.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MySessionScoped.java
similarity index 96%
rename from webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MySessionScoped.java
rename to webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MySessionScoped.java
index 3d14ec139..e9b487520 100644
--- a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MySessionScoped.java
+++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MySessionScoped.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7.test;
+package org.apache.webbeans.web.tomcat.test;
import jakarta.enterprise.context.SessionScoped;
import java.io.Serializable;
diff --git a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MyWrapper.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MyWrapper.java
similarity index 95%
rename from webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MyWrapper.java
rename to webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MyWrapper.java
index 692e2a669..0e20e7805 100644
--- a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/MyWrapper.java
+++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/MyWrapper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7.test;
+package org.apache.webbeans.web.tomcat.test;
import jakarta.enterprise.context.SessionScoped;
import jakarta.inject.Inject;
diff --git a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/TomcatNormalScopeProxyFactoryTest.java b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
similarity index 95%
rename from webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/TomcatNormalScopeProxyFactoryTest.java
rename to webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
index 315a35782..c53c33ce8 100644
--- a/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/test/TomcatNormalScopeProxyFactoryTest.java
+++ b/webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat/test/TomcatNormalScopeProxyFactoryTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7.test;
+package org.apache.webbeans.web.tomcat.test;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Request;
@@ -26,14 +26,14 @@ import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.ContextsService;
-import org.apache.webbeans.web.tomcat7.ContextLifecycleListener;
+import org.apache.webbeans.web.tomcat.ContextLifecycleListener;
import org.junit.Test;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.CDI;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestEvent;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
@@ -94,11 +94,11 @@ public class TomcatNormalScopeProxyFactoryTest
final BeanManager bm = CDI.current().getBeanManager();
final Response response = new Response();
- response.setConnector(tomcat.getConnector());
+ //Xresponse.setConnector(tomcat.getConnector());
response.setCoyoteResponse(new org.apache.coyote.Response());
- final Request request = new Request();
- request.setContext(ctx);
+ final Request request = new Request(tomcat.getConnector());
+ //X request.setContext(ctx);
request.setResponse(response);
request.setRequestedSessionId(sessionId);
diff --git a/webbeans-web/pom.xml b/webbeans-web/pom.xml
index 2997ffc8b..efc5cdaaf 100644
--- a/webbeans-web/pom.xml
+++ b/webbeans-web/pom.xml
@@ -28,84 +28,74 @@
<description>Apache OpenWebBeans Java EE Web and Serlvet plugin</description>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <!-- we actually only need that in the ITs, but that way it's easier for the IDE -->
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- <scope>test</scope>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <artifactId>openwebbeans-spi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el22</artifactId>
- <version>${project.version}</version>
+ <artifactId>openwebbeans-impl</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <artifactId>openwebbeans-el22</artifactId>
+ <optional>true</optional>
<version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
</dependency>
+ <!-- test dependencies -->
<dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <optional>true</optional>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
- <scope>provided</scope>
+ <!-- we actually only need that in the ITs, but that way it's easier for the IDE -->
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -118,8 +108,8 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.jsp*;version="[2.1,3)",
- javax.servlet.*;version="[${osgi.servlet.range},5)",
+ jakarta.servlet.jsp*;version="[2.1,3)",
+ jakarta.servlet.*;version="[${osgi.servlet.range},5)",
jakarta.el.*;version="[${osgi.el.range},3)";resolution:="optional",
*
</Import-Package>
diff --git a/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java b/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java
index e6be5362a..f1c0b2dc3 100644
--- a/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java
+++ b/webbeans-web/src/it/forward/b/src/test/java/org/apache/openwebbeans/web/it/ForwardIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.openwebbeans.web.it;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java
index 3a4d1492b..1462b00ba 100644
--- a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java
+++ b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java
@@ -21,11 +21,11 @@ package org.superbiz;
import org.superbiz.beans.ContextEventCounter;
import org.superbiz.beans.RequestScopedBean;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
@WebServlet(urlPatterns = "/check/*")
diff --git a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java
index 4be3b090e..730573804 100644
--- a/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java
+++ b/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java
@@ -19,11 +19,11 @@
package org.superbiz.conversation;
import jakarta.enterprise.inject.spi.CDI;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.logging.Logger;
diff --git a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java
index 3a4d5c22a..8e15fd0f6 100644
--- a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java
+++ b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/ConversationScopedIT.java
@@ -19,7 +19,7 @@
package org.apache.openwebbeans.web.it;
import jakarta.enterprise.context.NonexistentConversationException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.http.impl.client.DefaultHttpClient;
import org.junit.Assert;
diff --git a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java
index cedba7dce..81b7ac297 100644
--- a/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java
+++ b/webbeans-web/src/it/webcdiapp/src/test/java/org/apache/openwebbeans/web/it/RequestScopedIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.openwebbeans.web.it;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.http.impl.client.DefaultHttpClient;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java
index 2e981b5f3..d1b377ab1 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java
@@ -29,15 +29,15 @@ import org.apache.webbeans.web.context.WebContextsService;
import org.apache.webbeans.web.util.ServletCompatibilityUtil;
import jakarta.enterprise.context.RequestScoped;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java
index 3f9632511..3a7b561b6 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationHttpSessionListener.java
@@ -26,8 +26,8 @@ import org.apache.webbeans.util.WebBeansUtil;
import jakarta.enterprise.context.ConversationScoped;
import jakarta.enterprise.context.SessionScoped;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
index 2e21b5cb5..71aae2922 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
@@ -30,14 +30,14 @@ import org.apache.webbeans.web.util.ServletCompatibilityUtil;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.context.spi.Context;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
import java.util.Set;
import java.util.logging.Level;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java
index 5a6fdad8d..92092b124 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/ServletRequestContext.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.web.context;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.webbeans.context.RequestContext;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
index 917947996..a70ead14f 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
@@ -45,10 +45,10 @@ import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.context.spi.Context;
import jakarta.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.lang.annotation.Annotation;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java
index 5c4fa4a7f..b760a4739 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationFilter.java
@@ -19,12 +19,12 @@
package org.apache.webbeans.web.context;
import jakarta.enterprise.context.ConversationScoped;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java
index feb190325..820472b11 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java
@@ -18,9 +18,9 @@
*/
package org.apache.webbeans.web.context;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.webbeans.config.WebBeansContext;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java
index fb24647bc..7eb0d2eaf 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletContextBean.java
@@ -25,7 +25,7 @@ import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.portable.ProviderBasedProducer;
import jakarta.inject.Provider;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
class ServletContextBean extends BuiltInOwbBean<ServletContext>
{
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java
index 15cee41a0..4ee46dbab 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ServletRequestBean.java
@@ -27,7 +27,7 @@ import org.apache.webbeans.web.context.ServletRequestContext;
import org.apache.webbeans.web.context.WebContextsService;
import jakarta.inject.Provider;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
class ServletRequestBean extends BuiltInOwbBean<HttpServletRequest>
{
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
index e3ba82065..45fd63521 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
@@ -38,10 +38,10 @@ import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.jsp.JspApplicationContext;
-import javax.servlet.jsp.JspFactory;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.jsp.JspApplicationContext;
+import jakarta.servlet.jsp.JspFactory;
import java.util.logging.Level;
/**
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java
index d8ff5f2b0..46f35eb9b 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockHttpSession.java
@@ -18,9 +18,8 @@
*/
package org.apache.webbeans.web.lifecycle.test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
import java.util.Enumeration;
import java.util.concurrent.atomic.AtomicInteger;
@@ -84,27 +83,6 @@ public class MockHttpSession implements HttpSession
return null;
}
- @Override
- public HttpSessionContext getSessionContext()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Object getValue(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String[] getValueNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
@Override
public void invalidate()
{
@@ -119,13 +97,6 @@ public class MockHttpSession implements HttpSession
return false;
}
- @Override
- public void putValue(String arg0, Object arg1)
- {
- // TODO Auto-generated method stub
-
- }
-
@Override
public void removeAttribute(String arg0)
{
@@ -133,13 +104,6 @@ public class MockHttpSession implements HttpSession
}
- @Override
- public void removeValue(String arg0)
- {
- // TODO Auto-generated method stub
-
- }
-
@Override
public void setAttribute(String arg0, Object arg1)
{
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
index 164eeac93..600ac30fe 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
@@ -28,16 +28,16 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
import static java.util.Collections.enumeration;
@@ -81,6 +81,7 @@ public class MockServletContext implements ServletContext
return null;
}
+
@Override
public Set<String> getResourcePaths(String path)
{
@@ -111,36 +112,12 @@ public class MockServletContext implements ServletContext
return null;
}
- @Override
- public Servlet getServlet(String name) throws ServletException
- {
- return null;
- }
-
- @Override
- public Enumeration<Servlet> getServlets()
- {
- return null;
- }
-
- @Override
- public Enumeration<String> getServletNames()
- {
- return null;
- }
-
@Override
public void log(String msg)
{
}
- @Override
- public void log(Exception exception, String msg)
- {
-
- }
-
@Override
public void log(String message, Throwable throwable)
{
@@ -372,4 +349,52 @@ public class MockServletContext implements ServletContext
{
return null;
}
+
+ @Override
+ public ServletRegistration.Dynamic addJspFile(String s, String s1)
+ {
+ return null;
+ }
+
+ @Override
+ public String getVirtualServerName()
+ {
+ return null;
+ }
+
+ @Override
+ public int getSessionTimeout()
+ {
+ return 120;
+ }
+
+ @Override
+ public void setSessionTimeout(int i)
+ {
+
+ }
+
+ @Override
+ public String getRequestCharacterEncoding()
+ {
+ return null;
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String s)
+ {
+
+ }
+
+ @Override
+ public String getResponseCharacterEncoding()
+ {
+ return null;
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String s)
+ {
+
+ }
}
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java
index 6ada40591..f1285dade 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContextEvent.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.web.lifecycle.test;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
public class MockServletContextEvent extends ServletContextEvent
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java b/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
index d92201ba7..bf5b67d5d 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
@@ -24,7 +24,7 @@ import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.util.ExceptionUtil;
import org.apache.webbeans.util.WebBeansUtil;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.logging.Logger;
diff --git a/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java b/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java
index 9a1e3df44..611700690 100644
--- a/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java
+++ b/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java
@@ -18,7 +18,7 @@
*/
package org.apache.webbeans.web.util;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* This utility helps to be compatible with Servlet API 2.4
diff --git a/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java b/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java
index d4c2440fb..c8c7c5eae 100644
--- a/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java
+++ b/webbeans-web/src/test/java/WebBeansConfigurationListenerTest.java
@@ -23,8 +23,8 @@ import static org.apache.webbeans.util.Asserts.assertNotNull;
import java.util.EventListener;
import java.util.concurrent.atomic.AtomicReference;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
import org.apache.webbeans.spi.ContainerLifecycle;
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java
index 04a263c57..c33a2f175 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java
@@ -32,7 +32,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import jakarta.enterprise.context.ConversationScoped;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java
index 31abf9fbb..11952029f 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockHttpSession.java
@@ -20,9 +20,8 @@ package org.apache.webbeans.web.tests;
import java.util.Enumeration;
import java.util.HashMap;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
public class MockHttpSession implements HttpSession
{
@@ -64,60 +63,30 @@ public class MockHttpSession implements HttpSession
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
- @Override
- public HttpSessionContext getSessionContext()
- {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
@Override
public Object getAttribute(String string)
{
return attributes.get(string);
}
- @Override
- public Object getValue(String string)
- {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
@Override
public Enumeration<String> getAttributeNames()
{
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
- @Override
- public String[] getValueNames()
- {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
@Override
public void setAttribute(String string, Object o)
{
attributes.put(string, o);
}
- @Override
- public void putValue(String string, Object o)
- {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
@Override
public void removeAttribute(String string)
{
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
- @Override
- public void removeValue(String string)
- {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
@Override
public void invalidate()
{
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java
index 0c44dbc44..991b32fb0 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/MockServletRequest.java
@@ -18,19 +18,21 @@
*/
package org.apache.webbeans.web.tests;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -190,12 +192,6 @@ public class MockServletRequest implements HttpServletRequest
return false;
}
- @Override
- public boolean isRequestedSessionIdFromUrl()
- {
- return false;
- }
-
@Override
public boolean isRequestedSessionIdFromURL()
{
@@ -340,12 +336,6 @@ public class MockServletRequest implements HttpServletRequest
return null;
}
- @Override
- public String getRealPath(String path)
- {
- return null;
- }
-
@Override
public String getRemoteAddr()
{
@@ -441,4 +431,40 @@ public class MockServletRequest implements HttpServletRequest
{
return null;
}
+
+ @Override
+ public String changeSessionId()
+ {
+ return null;
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException
+ {
+ return null;
+ }
+
+ @Override
+ public long getContentLengthLong()
+ {
+ return 0;
+ }
+
+ @Override
+ public String getRequestId()
+ {
+ return null;
+ }
+
+ @Override
+ public String getProtocolRequestId()
+ {
+ return null;
+ }
+
+ @Override
+ public ServletConnection getServletConnection()
+ {
+ return null;
+ }
}
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java
index bcad78dda..cfc14e77b 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/WebBeansTest.java
@@ -33,9 +33,9 @@ import org.junit.Test;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.http.HttpServletRequest;
import java.net.URL;
import java.util.HashMap;
import java.util.Properties;
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java
index 79e659824..19b275281 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Collection;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestEvent;
import org.junit.Assert;
import org.apache.webbeans.test.AbstractUnitTest;
import org.apache.webbeans.web.lifecycle.test.MockServletContext;
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java
index 1e170f540..8f1042e3b 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/MySessionHandler.java
@@ -25,7 +25,7 @@ import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
@RequestScoped
public class MySessionHandler
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java
index 6e3794b21..93f738751 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.Bean;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java
index 41c8ba1e6..9a294c63d 100644
--- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java
+++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestEvent;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
[openwebbeans] 05/05: OWB-1417 use arquillian enricher for jakarta
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 3002d08b7559f6af2f6ec0e3d775bd54c1a328a4
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Jan 24 09:57:50 2023 +0100
OWB-1417 use arquillian enricher for jakarta
---
pom.xml | 2 +-
webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c98012a4d..320534e2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<httpclient.version>4.5.14</httpclient.version>
<xbean.version>4.22</xbean.version>
- <arquillian.version>1.7.0.Alpha10</arquillian.version>
+ <arquillian.version>1.7.0.Alpha13</arquillian.version>
<!-- OLD remove: -->
<geronimo_jaxws.version>1.2</geronimo_jaxws.version>
diff --git a/webbeans-arquillian/owb-arquillian-standalone/pom.xml b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
index 9d60d00aa..3fe8f61fc 100644
--- a/webbeans-arquillian/owb-arquillian-standalone/pom.xml
+++ b/webbeans-arquillian/owb-arquillian-standalone/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-cdi</artifactId>
+ <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
<version>${arquillian.version}</version>
</dependency>