You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2023/01/30 19:04:28 UTC
[deltaspike] 02/06: DELTASPIKE-1437 first steps towards DeltaSpike 2.0
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 71a68b8d0487a9a4d5315988025f3e3f3e401831
Author: Mark Struberg <st...@apache.org>
AuthorDate: Thu Sep 23 20:02:46 2021 +0200
DELTASPIKE-1437 first steps towards DeltaSpike 2.0
---
deltaspike/cdictrl/api/pom.xml | 2 +-
.../apache/deltaspike/cdise/api/CdiContainer.java | 2 +-
deltaspike/cdictrl/impl-openejb/pom.xml | 2 +-
.../cdise/openejb/OpenEjbContainerControl.java | 6 +-
.../OpenEJbContainerControlConfigurationTest.java | 4 +-
deltaspike/cdictrl/impl-owb/pom.xml | 2 +-
.../deltaspike/cdise/owb/MockHttpSession.java | 8 +-
.../deltaspike/cdise/owb/MockServletContext.java | 24 +-
.../cdise/owb/OpenWebBeansContainerControl.java | 6 +-
.../cdise/owb/OpenWebBeansContextControl.java | 12 +-
.../org/apache/deltaspike/cdise/owb/OwbHelper.java | 2 +-
deltaspike/cdictrl/impl-weld/pom.xml | 2 +-
.../cdise/weld/WeldContainerControl.java | 12 +-
.../deltaspike/cdise/weld/WeldContextControl.java | 14 +-
deltaspike/cdictrl/pom.xml | 2 +-
deltaspike/cdictrl/servlet/pom.xml | 2 +-
.../cdise/servlet/CdiServletContextListener.java | 4 +-
.../cdise/servlet/CdiServletRequestListener.java | 6 +-
.../servlet/test/content/RequestScopedBean.java | 2 +-
.../cdise/servlet/test/content/RequestServlet.java | 14 +-
deltaspike/cdictrl/tck/pom.xml | 2 +-
.../deltaspike/cdise/tck/ContainerCtrlTckTest.java | 10 +-
.../org/apache/deltaspike/cdise/tck/beans/Car.java | 8 +-
.../deltaspike/cdise/tck/beans/CarRepair.java | 8 +-
.../deltaspike/cdise/tck/beans/TestUser.java | 6 +-
deltaspike/checkstyle-rules/pom.xml | 2 +-
.../main/resources/deltaspike/default-checks.xml | 2 +-
.../core/api}/control/BeforeHandles.java | 0
.../core/api}/control/ExceptionHandler.java | 2 +-
.../core/api}/control/ExceptionHandlingFlow.java | 0
.../core/api}/control/ExceptionStackItem.java | 2 +-
.../core/api}/control/HandlerMethod.java | 2 +-
.../deltaspike/core/api}/control/Handles.java | 0
.../core/api}/control/event/ExceptionEvent.java | 0
.../api}/control/event/ExceptionStackEvent.java | 2 +-
.../api}/control/event/ExceptionToCatchEvent.java | 2 +-
.../core/api/literal/AlternativeLiteral.java | 4 +-
.../deltaspike/core/api/literal/AnyLiteral.java | 4 +-
.../core/api/literal/ApplicationScopedLiteral.java | 4 +-
.../api/literal/ConversationScopedLiteral.java | 4 +-
.../core/api/literal/DefaultLiteral.java | 4 +-
.../core/api/literal/DeltaSpikeLiteral.java | 2 +-
.../core/api/literal/DependentScopeLiteral.java | 4 +-
.../core/api/literal/DestroyedLiteral.java | 2 +-
.../core/api/literal/InitializedLiteral.java | 2 +-
.../api/literal/InjectableResourceLiteral.java | 2 +-
.../deltaspike/core/api/literal/ModelLiteral.java | 4 +-
.../deltaspike/core/api/literal/NamedLiteral.java | 4 +-
.../deltaspike/core/api/literal/NewLiteral.java | 4 +-
.../core/api/literal/RequestScopedLiteral.java | 4 +-
.../core/api/literal/SessionScopeLiteral.java | 4 +-
.../core/api/literal/SingletonLiteral.java | 4 +-
.../core/api/literal/SpecializesLiteral.java | 4 +-
.../deltaspike/core/api/literal/TypedLiteral.java | 4 +-
.../resourceloader/AbstractResourceProvider.java | 8 +-
.../resourceloader/ClasspathResourceProvider.java | 2 +-
.../api/resourceloader/FileResourceProvider.java | 2 +-
.../api/resourceloader/InjectableResource.java | 4 +-
.../resourceloader/InjectableResourceProvider.java | 0
.../spi}/event/IntrospectiveExceptionEvent.java | 0
.../core/util/bean/BaseImmutableBean.java | 6 +-
.../deltaspike/core/util/bean/BeanBuilder.java | 18 +-
.../deltaspike/core/util/bean/ImmutableBean.java | 4 +-
.../core/util/bean/ImmutableBeanWrapper.java | 4 +-
.../util/bean/ImmutablePassivationCapableBean.java | 4 +-
.../ImmutablePassivationCapableBeanWrapper.java | 4 +-
.../core/util/bean/WrappingBeanBuilder.java | 6 +-
.../metadata/builder/AnnotatedCallableImpl.java | 6 +-
.../metadata/builder/AnnotatedConstructorImpl.java | 2 +-
.../util/metadata/builder/AnnotatedFieldImpl.java | 4 +-
.../core/util/metadata/builder/AnnotatedImpl.java | 2 +-
.../util/metadata/builder/AnnotatedMemberImpl.java | 4 +-
.../util/metadata/builder/AnnotatedMethodImpl.java | 4 +-
.../metadata/builder/AnnotatedParameterImpl.java | 4 +-
.../metadata/builder/AnnotatedTypeBuilder.java | 12 +-
.../util/metadata/builder/AnnotatedTypeImpl.java | 8 +-
.../util/metadata/builder/AnnotationBuilder.java | 0
.../util/metadata/builder/AnnotationStore.java | 0
.../util/metadata/builder/ContextualLifecycle.java | 4 +-
.../builder/DelegatingContextualLifecycle.java | 6 +-
.../metadata/builder/DummyInjectionTarget.java | 6 +-
.../metadata/builder/ImmutableInjectionPoint.java | 12 +-
.../util/metadata/builder/InjectableMethod.java | 10 +-
.../metadata/builder/ParameterValueRedefiner.java | 6 +-
.../api/metadata/AnnotatedTypeBuilderTest.java | 22 +-
.../apache/deltaspike/test/api/metadata/Cat.java | 10 +-
.../apache/deltaspike/test/api/metadata/Small.java | 2 +-
deltaspike/core/api/pom.xml | 2 +-
.../deltaspike/core/api/common/DeltaSpike.java | 2 +-
.../deltaspike/core/api/config/ConfigProperty.java | 4 +-
.../deltaspike/core/api/config/ConfigResolver.java | 2 +-
.../deltaspike/core/api/config/view/ViewRef.java | 4 +-
.../config/view/metadata/CallbackDescriptor.java | 2 +-
.../view/navigation/NavigationParameter.java | 4 +-
.../deltaspike/core/api/future/Futureable.java | 4 +-
.../org/apache/deltaspike/core/api/jmx/MBean.java | 2 +-
.../deltaspike/core/api/lifecycle/Destroyed.java | 2 +-
.../deltaspike/core/api/lifecycle/Initialized.java | 2 +-
.../core/api/literal/MessageBundleLiteral.java | 2 +-
.../api/literal/MessageContextConfigLiteral.java | 2 +-
.../core/api/literal/ViewControllerRefLiteral.java | 2 +-
.../apache/deltaspike/core/api/lock/Locked.java | 6 +-
.../deltaspike/core/api/message/MessageBundle.java | 2 +-
.../core/api/monitoring/InvocationMonitored.java | 2 +-
.../core/api/monitoring/MonitorResultEvent.java | 2 +-
.../core/api/projectstage/ProjectStage.java | 2 +-
.../core/api/provider/BeanManagerProvider.java | 23 +-
.../deltaspike/core/api/provider/BeanProvider.java | 18 +-
.../core/api/provider/DependentProvider.java | 8 +-
.../core/api/scope/ConversationGroup.java | 2 +-
.../core/api/scope/GroupedConversationScoped.java | 2 +-
.../core/api/scope/ViewAccessScoped.java | 2 +-
.../deltaspike/core/api/scope/WindowScoped.java | 2 +-
.../deltaspike/core/api/throttling/Throttled.java | 4 +-
.../deltaspike/core/api/throttling/Throttling.java | 4 +-
.../deltaspike/core/spi/InterceptorStrategy.java | 2 +-
.../alternative/AlternativeBeanClassProvider.java | 32 -
.../spi/config/BaseConfigPropertyProducer.java | 2 +-
.../apache/deltaspike/core/util/Annotateds.java | 16 +-
.../deltaspike/core/util/AnnotationUtils.java | 6 +-
.../apache/deltaspike/core/util/ArraysUtils.java | 2 +-
.../org/apache/deltaspike/core/util/BeanUtils.java | 37 +-
.../core/util/ClassDeactivationUtils.java | 2 +-
.../apache/deltaspike/core/util/ClassUtils.java | 2 +-
.../deltaspike/core/util/CollectionUtils.java | 2 +-
.../apache/deltaspike/core/util/ContextUtils.java | 6 +-
.../deltaspike/core/util/ExceptionUtils.java | 2 +-
.../deltaspike/core/util/HierarchyDiscovery.java | 2 +-
.../apache/deltaspike/core/util/ParameterUtil.java | 2 +-
.../core/util/ParameterizedTypeImpl.java | 2 +-
.../core/util/ParentExtensionStorage.java | 2 +-
.../deltaspike/core/util/ProjectStageProducer.java | 8 +-
.../deltaspike/core/util/PropertyFileUtils.java | 2 +-
.../apache/deltaspike/core/util/ProxyUtils.java | 2 +-
.../deltaspike/core/util/ReflectionUtils.java | 4 +-
.../apache/deltaspike/core/util/ServiceUtils.java | 2 +-
.../apache/deltaspike/core/util/StringUtils.java | 2 +-
.../core/util/context/AbstractContext.java | 12 +-
.../core/util/context/ContextualInstanceInfo.java | 2 +-
.../core/util/context/ContextualStorage.java | 8 +-
.../interceptor/AbstractInvocationContext.java | 4 +-
.../core/util/metadata/InjectionPointWrapper.java | 6 +-
.../SetAccessiblePrivilegedAction.java | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../metadata/AnnotationInstanceProviderTest.java | 14 +-
.../core/impl}/control/DefaultExceptionEvent.java | 2 +-
.../impl}/control/ExceptionHandlerBroadcaster.java | 10 +-
.../impl}/control/ExceptionHandlerComparator.java | 2 +-
.../core/impl}/control/HandlerMethodImpl.java | 14 +-
.../core/impl}/control/HandlerMethodStorage.java | 2 +-
.../impl}/control/HandlerMethodStorageImpl.java | 4 +-
.../control/HandlerMethodStorageProducer.java | 6 +-
.../control/OutboundParameterValueRedefiner.java | 4 +-
.../extension/ExceptionControlExtension.java | 24 +-
.../resourceloader/InjectableResourceProducer.java | 14 +-
.../resourceloader/ResourceLoaderExtension.java | 8 +-
.../test/core/api/util/bean/BeanBuilderTest.java | 12 +-
.../test/core/api/util/bean/SimpleClass.java | 0
.../core/api/util/bean/WithInjectionPoint.java | 6 +-
.../exception/control/event/EventQualifier.java | 2 +-
.../impl/exception/control/event/EventTest.java | 4 +-
.../event/literal/EventQualifierLiteral.java | 2 +-
.../impl/exception/control/extension/Account.java | 0
.../exception/control/extension/Arquillian.java | 2 +-
.../control/extension/CatchQualifier.java | 2 +-
.../extension/literal/CatchQualifierLiteral.java | 2 +-
.../control/flow/AbortingBreadthFirstHandler.java | 2 +-
.../control/flow/AbortingDepthHandler.java | 2 +-
.../control/flow/BreadthFirstAbortControlTest.java | 4 +-
.../control/flow/DepthAbortControlTest.java | 4 +-
.../control/flow/ExceptionHandledHandler.java | 2 +-
.../control/flow/HandledExceptionHandlerTest.java | 4 +-
.../control/flow/ProceedCauseHandler.java | 2 +-
.../control/flow/ProceedCauseHandlerTest.java | 4 +-
.../exception/control/flow/RethrowHandler.java | 0
.../impl/exception/control/flow/RethrowTest.java | 4 +-
.../control/flow/ThrowingNewExceptionTest.java | 4 +-
.../exception/control/flow/ThrowingNewHandler.java | 0
.../control/handler/BadInjectionPointHandler.java | 0
.../control/handler/CalledExceptionHandler.java | 4 +-
.../control/handler/CallingHandlersTest.java | 4 +-
.../control/handler/ExtensionExceptionHandler.java | 2 +-
.../control/handler/HandlerComparatorTest.java | 4 +-
.../handler/HandlerWhichThrowsExceptions.java | 0
.../exception/control/handler/UnMuteHandler.java | 2 +-
.../control/handler/UnMuteHandlerTest.java | 4 +-
.../control/traversal/ExceptionHandlerMethods.java | 0
.../exception/control/traversal/Exceptions.java | 0
.../control/traversal/TraversalPathTest.java | 4 +-
.../impl/resourceloader/ClasspathResourceTest.java | 2 +-
.../resourceloader/ClasspathWebProfileTest.java | 2 +-
.../core/impl/resourceloader/FileResourceTest.java | 0
deltaspike/core/impl/pom.xml | 9 +-
.../core/impl/config/ConfigurationExtension.java | 69 +-
.../impl/config/DefaultConfigPropertyProducer.java | 8 +-
.../core/impl/config/LocalJndiConfigSource.java | 2 +-
.../impl/config/ProxyConfigurationLifecycle.java | 39 +-
.../core/impl/crypto/CdiCipherService.java | 2 +-
.../core/impl/exclude/GlobalAlternative.java | 28 -
.../impl/exclude/extension/ExcludeExtension.java | 280 +---
...belAwareGlobalAlternativeBeanClassProvider.java | 82 -
.../impl/future/DefaultFutureableStrategy.java | 12 +-
.../core/impl/future/FutureableInterceptor.java | 8 +-
.../core/impl/future/ThreadPoolManager.java | 12 +-
.../interceptor/GlobalInterceptorExtension.java | 12 +-
.../impl/interceptor/GlobalInterceptorWrapper.java | 2 +-
.../interceptor/interdyn/InterDynExtension.java | 30 +-
.../core/impl/jmx/BroadcasterProducer.java | 10 +-
.../core/impl/jmx/DynamicMBeanWrapper.java | 6 +-
.../core/impl/jmx/JmxBroadcasterLifecycle.java | 49 -
.../deltaspike/core/impl/jmx/MBeanExtension.java | 14 +-
.../core/impl/lock/DefaultLockedStrategy.java | 6 +-
.../core/impl/lock/LockSupplierStorage.java | 14 +-
.../core/impl/lock/LockedInterceptor.java | 8 +-
.../core/impl/message/DefaultLocaleResolver.java | 2 +-
.../core/impl/message/DefaultMessage.java | 2 +-
.../core/impl/message/DefaultMessageContext.java | 6 +-
.../impl/message/DefaultMessageInterpolator.java | 2 +-
.../core/impl/message/DefaultMessageResolver.java | 2 +-
.../core/impl/message/MessageBundleContext.java | 4 +-
.../core/impl/message/MessageBundleExtension.java | 98 +-
.../message/MessageBundleInvocationHandler.java | 14 +-
.../message/MessageFormatMessageInterpolator.java | 4 +-
.../monitoring/InvocationMonitorInterceptor.java | 10 +-
.../impl/monitoring/InvocationResultLogger.java | 6 +-
.../impl/monitoring/RequestInvocationCounter.java | 8 +-
.../core/impl/scope/AbstractBeanHolder.java | 4 +-
.../impl/scope/DeltaSpikeContextExtension.java | 12 +-
.../impl/scope/conversation/ConversationKey.java | 6 +-
.../GroupedConversationArtifactProducer.java | 12 +-
.../conversation/GroupedConversationContext.java | 6 +-
.../InjectableGroupedConversation.java | 2 +-
.../InjectableGroupedConversationManager.java | 2 +-
.../InjectableViewAccessContextManager.java | 2 +-
.../viewaccess/ViewAccessBeanAccessHistory.java | 2 +-
.../impl/scope/viewaccess/ViewAccessContext.java | 10 +-
.../ViewAccessContextArtifactProducer.java | 8 +-
.../window/DefaultWindowContextQuotaHandler.java | 6 +-
.../impl/scope/window/InjectableWindowContext.java | 2 +-
.../core/impl/scope/window/WindowBeanHolder.java | 8 +-
.../core/impl/scope/window/WindowContextImpl.java | 8 +-
.../impl/scope/window/WindowContextProducer.java | 10 +-
.../window/WindowContextQuotaHandlerCache.java | 6 +-
.../core/impl/scope/window/WindowIdHolder.java | 2 +-
.../impl/throttling/DefaultThrottledStrategy.java | 6 +-
.../deltaspike/core/impl/throttling/Invoker.java | 2 +-
.../core/impl/throttling/InvokerStorage.java | 14 +-
.../core/impl/throttling/ThrottledInterceptor.java | 8 +-
.../core/impl/util/AnnotatedMethods.java | 4 +-
.../core/impl/util/AnnotationInstanceUtils.java | 2 +-
.../core/impl/util/ConversationUtils.java | 10 +-
.../deltaspike/core/impl/util/JndiUtils.java | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 1 -
.../core/api/alternative/global/BaseBean1.java | 2 +-
.../BaseInterface1AlternativeImplementation.java | 4 +-
.../BaseInterface1DefaultImplementation.java | 2 +-
.../alternative/global/GlobalAlternativeTest.java | 134 --
.../core/api/alternative/global/SubBaseBean1.java | 4 +-
.../core/api/alternative/global/SubBaseBean2.java | 4 +-
.../global/qualifier/AlternativeBaseBeanB.java | 4 +-
.../alternative/global/qualifier/BaseBeanA.java | 2 +-
.../alternative/global/qualifier/BaseBeanB.java | 2 +-
.../alternative/global/qualifier/BaseBeanB2.java | 2 +-
.../alternative/global/qualifier/QualifierA.java | 2 +-
.../alternative/global/qualifier/QualifierB.java | 4 +-
.../test/core/api/alternative/local/BaseBean2.java | 2 +-
.../BaseInterface2AlternativeImplementation.java | 4 +-
.../local/BaseInterface2DefaultImplementation.java | 2 +-
.../local/BdaAlternativeEarFileTest.java | 56 -
.../api/alternative/local/BdaAlternativeTest.java | 2 +-
.../local/BdaAlternativeWarFileTest.java | 57 -
.../core/api/alternative/local/SubBaseBean2.java | 4 +-
.../test/core/api/config/injectable/CdiFilter.java | 2 +-
.../test/core/api/config/injectable/CdiSource.java | 2 +-
.../CustomConfigAnnotationWithMetaData.java | 4 +-
...CustomConfigAnnotationWithMetaDataProducer.java | 8 +-
.../core/api/config/injectable/SettingsBean.java | 4 +-
.../injectable/numberconfig/NumberConfig.java | 4 +-
.../numberconfig/NumberConfigPropertyProducer.java | 8 +-
.../numberconfig/NumberConfiguredBean.java | 4 +-
.../BaseTestConfigProperty.java | 20 -
.../ConfigPropertyEARTest.java | 72 -
.../api/config/propertyconfigsource/MyBean.java | 120 --
.../test/core/api/exclude/AlwaysActiveBean.java | 2 +-
.../test/core/api/exclude/ExcludeWarFileTest.java | 2 +-
.../test/core/api/message/ElPickedUpMessages.java | 2 +-
.../api/message/FixedEnglishLocalResolver.java | 2 +-
.../api/message/FixedGermanLocaleResolver.java | 2 +-
.../deltaspike/test/core/api/message/Jay.java | 2 +-
.../test/core/api/message/MessageContextTest.java | 4 +-
.../api/message/MessageFormattedMessageTest.java | 4 +-
.../test/core/api/message/MessageTest.java | 4 +-
.../test/core/api/message/MessageUser.java | 4 +-
.../test/core/api/message/MinimalMessagesTest.java | 4 +-
.../test/core/api/message/SimpleMessageTest.java | 4 +-
.../test/core/api/message/TestConfiguration.java | 2 +-
.../test/core/api/message/TestLocalResolver.java | 4 +-
.../core/api/message/TestMessageInterpolator.java | 2 +-
.../test/core/api/message/TestMessageResolver.java | 2 +-
.../api/message/TypedMessageWithCustomName.java | 2 +-
.../broken/BrokenMessageBundleOnClassTest.java | 4 +-
.../locale/ConfigurableLocaleMessageTest.java | 4 +-
.../message/locale/ConfigurableLocaleResolver.java | 6 +-
.../core/api/provider/BeanManagerProviderTest.java | 2 +-
.../test/core/api/provider/DependentTestBean.java | 6 +-
.../deltaspike/test/core/api/provider/MBean01.java | 2 +-
.../deltaspike/test/core/api/provider/MBean02.java | 2 +-
.../test/core/api/provider/ManualBean.java | 4 +-
.../test/core/api/provider/TestBean.java | 4 +-
.../grouped/explicit/ExplicitlyGroupedBeanX.java | 2 +-
.../grouped/explicit/ExplicitlyGroupedBeanY.java | 2 +-
.../ExplicitlyGroupedConversationsTest.java | 4 +-
.../grouped/implicit/ImplicitlyGroupedBean.java | 2 +-
.../ImplicitlyGroupedConversationsTest.java | 4 +-
.../conversation/subgroup/shared/TestBaseBean.java | 2 +-
.../uc001/GroupedConversationSubGroupTest.java | 2 +-
.../uc002/GroupedConversationSubGroupTest.java | 2 +-
.../uc003/GroupedConversationSubGroupTest.java | 2 +-
.../api/scope/viewaccess/ViewAccessScopedTest.java | 2 +-
.../test/core/api/util/MyInterfaceImpl.java | 2 +-
.../test/core/api/util/ProxyUtilsTest.java | 2 +-
.../core/api/util/context/AbstractContextTest.java | 2 +-
.../test/core/api/util/context/DummyContext.java | 4 +-
.../core/api/util/context/DummyScopeExtension.java | 8 +-
.../test/core/api/util/context/DummyScoped.java | 2 +-
.../test/core/impl/future/FutureableTest.java | 2 +-
.../deltaspike/test/core/impl/future/Service.java | 2 +-
.../core/impl/future/ThreadPoolManagerTest.java | 2 +-
.../test/core/impl/interdyn/InterDynTest.java | 2 +-
.../test/core/impl/interdyn/SomeTestService.java | 4 +-
.../test/core/impl/jmx/CustomProperties.java | 2 +-
.../test/core/impl/jmx/CustomProperties2.java | 2 +-
.../test/core/impl/jmx/CustomPropertiesTest.java | 2 +-
.../deltaspike/test/core/impl/jmx/CustomType.java | 2 +-
.../test/core/impl/jmx/CustomTypeTest.java | 2 +-
.../deltaspike/test/core/impl/jmx/MyMBean.java | 4 +-
.../test/core/impl/jmx/SimpleRegistrationTest.java | 2 +-
.../deltaspike/test/core/impl/lock/LockedTest.java | 2 +-
.../deltaspike/test/core/impl/lock/Service.java | 2 +-
.../scope/window/DefaultWindowContextTest.java | 2 +-
.../test/core/impl/throttling/Service.java | 2 +-
.../test/core/impl/throttling/Service2.java | 2 +-
.../test/core/impl/throttling/ThrottledTest.java | 2 +-
.../test/core/impl/util/JndiUtilsTest.java | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
deltaspike/core/pom.xml | 2 +-
deltaspike/dist/bom/pom.xml | 4 +-
deltaspike/dist/full/pom.xml | 37 +-
deltaspike/dist/pom.xml | 4 +-
deltaspike/examples/data-examples/pom.xml | 2 +-
.../org/apache/deltaspike/example/Article.java | 14 +-
.../deltaspike/example/ArticleController.java | 12 +-
.../org/apache/deltaspike/example/HttpParam.java | 4 +-
.../org/apache/deltaspike/example/HttpParams.java | 8 +-
.../org/apache/deltaspike/example/LogProducer.java | 4 +-
.../org/apache/deltaspike/example/Resources.java | 20 +-
deltaspike/examples/jpa-examples/pom.xml | 2 +-
.../org/apache/deltaspike/example/Article.java | 14 +-
.../deltaspike/example/ArticleController.java | 14 +-
.../org/apache/deltaspike/example/HttpParam.java | 4 +-
.../org/apache/deltaspike/example/HttpParams.java | 8 +-
.../org/apache/deltaspike/example/LogProducer.java | 4 +-
.../org/apache/deltaspike/example/Resources.java | 20 +-
deltaspike/examples/jse-examples/pom.xml | 2 +-
.../beanmanagement/SimpleBeanLookupExample.java | 2 +-
.../deltaspike/example/config/ConfigExample.java | 2 +-
.../config/CustomConfigPropertyProducer.java | 8 +-
.../example/config/CustomPropertyFileConfig.java | 2 +-
.../apache/deltaspike/example/config/Location.java | 2 +-
.../deltaspike/example/config/Property2.java | 4 +-
.../config/Property2WithInverseSupport.java | 4 +-
.../deltaspike/example/config/SettingsBean.java | 4 +-
.../example/echo/DefaultEchoService.java | 4 +-
.../example/echo/ToLowerCaseEchoService.java | 2 +-
.../example/echo/ToUpperCaseEchoService.java | 2 +-
.../NamingConventionAwareMetadataFilter.java | 8 +-
deltaspike/examples/jsf-examples/pom.xml | 2 +-
.../deltaspike/example/message/ControllerView.java | 6 +-
.../apache/deltaspike/example/message/Custom.java | 2 +-
.../example/message/CustomMessageResolver.java | 4 +-
.../deltaspike/example/message/LanguageView.java | 4 +-
.../example/scope/ApplicationScopedBean.java | 6 +-
.../example/scope/RequestScopedBean.java | 6 +-
.../example/scope/SessionScopedBean.java | 6 +-
.../example/scope/ViewAccessScopedBean.java | 4 +-
.../deltaspike/example/scope/ViewScopedBean.java | 6 +-
.../deltaspike/example/scope/WindowScopedBean.java | 4 +-
.../deltaspike/example/viewconfig/MyBean.java | 2 +-
.../example/viewconfig/PageController.java | 4 +-
.../example/window/SampleClientWindowConfig.java | 4 +-
deltaspike/examples/jsf-playground/pom.xml | 2 +-
.../playground/PlaygroundClientWindowConfig.java | 4 +-
.../playground/PlaygroundJsfModuleConfig.java | 2 +-
.../deltaspike/playground/exception/Jsf.java | 2 +-
.../exception/TestExceptionController.java | 4 +-
.../scope/viewaccess/ViewAccessScopedBean.java | 6 +-
.../windowhandling/ViewActionController.java | 10 +-
deltaspike/examples/pom.xml | 2 +-
deltaspike/examples/scheduler-playground/pom.xml | 2 +-
.../example/scheduler/GlobalResultHolder.java | 6 +-
.../scheduler/RequestScopedNumberProvider.java | 2 +-
.../example/scheduler/SimpleSchedulerExample.java | 2 +-
.../example/scheduler/SimpleSchedulerJob1.java | 2 +-
.../example/scheduler/SimpleSchedulerJob2.java | 2 +-
.../pom.xml | 2 +-
.../requestedpage/cdi/AuthenticationListener.java | 4 +-
.../cdi/LoggedInAccessDecisionVoter.java | 6 +-
.../requestedpage/cdi/LoginController.java | 8 +-
.../pom.xml | 2 +-
.../picketlink/AuthenticationListener.java | 4 +-
.../requestedpage/picketlink/Initializer.java | 8 +-
.../picketlink/LoggedInAccessDecisionVoter.java | 6 +-
deltaspike/modules/data/api/pom.xml | 2 +-
.../data/api/AbstractEntityRepository.java | 6 +-
.../deltaspike/data/api/EntityCountRepository.java | 2 +-
.../deltaspike/data/api/EntityManagerConfig.java | 2 +-
.../deltaspike/data/api/EntityManagerDelegate.java | 12 +-
.../deltaspike/data/api/EntityRepository.java | 2 +-
.../java/org/apache/deltaspike/data/api/Query.java | 4 +-
.../apache/deltaspike/data/api/QueryResult.java | 6 +-
.../org/apache/deltaspike/data/api/Repository.java | 2 +-
.../deltaspike/data/api/audit/CurrentUser.java | 2 +-
.../deltaspike/data/api/criteria/Criteria.java | 22 +-
.../data/api/criteria/CriteriaSupport.java | 6 +-
.../data/api/criteria/QuerySelection.java | 8 +-
.../api/mapping/SimpleQueryInOutMapperBase.java | 2 +-
.../data/spi/QueryInvocationContext.java | 2 +-
deltaspike/modules/data/impl/pom.xml | 2 +-
.../deltaspike/data/impl/RepositoryExtension.java | 12 +-
.../data/impl/audit/AuditEntityListener.java | 8 +-
.../data/impl/audit/PrincipalProvider.java | 6 +-
.../data/impl/builder/AnnotatedQueryBuilder.java | 6 +-
.../data/impl/builder/DelegateQueryBuilder.java | 14 +-
.../data/impl/builder/MethodQueryBuilder.java | 4 +-
.../deltaspike/data/impl/builder/QueryBuilder.java | 2 +-
.../data/impl/builder/QueryBuilderFactory.java | 4 +-
.../postprocessor/CountQueryPostProcessor.java | 2 +-
.../postprocessor/FirstResultPostProcessor.java | 2 +-
.../postprocessor/FlushModePostProcessor.java | 4 +-
.../builder/postprocessor/HintPostProcessor.java | 2 +-
.../postprocessor/LockModePostProcessor.java | 4 +-
.../postprocessor/MaxResultPostProcessor.java | 2 +-
.../OrderByQueryStringPostProcessor.java | 2 +-
.../impl/builder/result/DefaultQueryResult.java | 10 +-
.../data/impl/builder/result/QueryProcessor.java | 2 +-
.../impl/builder/result/QueryProcessorFactory.java | 8 +-
.../data/impl/criteria/QueryCriteria.java | 32 +-
.../data/impl/criteria/predicate/Between.java | 8 +-
.../data/impl/criteria/predicate/Eq.java | 8 +-
.../data/impl/criteria/predicate/EqIgnoreCase.java | 8 +-
.../data/impl/criteria/predicate/FetchBuilder.java | 14 +-
.../data/impl/criteria/predicate/GreaterThan.java | 8 +-
.../criteria/predicate/GreaterThanOrEqual.java | 8 +-
.../data/impl/criteria/predicate/In.java | 8 +-
.../data/impl/criteria/predicate/IsEmpty.java | 8 +-
.../data/impl/criteria/predicate/IsNotEmpty.java | 8 +-
.../data/impl/criteria/predicate/IsNotNull.java | 8 +-
.../data/impl/criteria/predicate/IsNull.java | 8 +-
.../data/impl/criteria/predicate/JoinBuilder.java | 22 +-
.../data/impl/criteria/predicate/LessThan.java | 8 +-
.../impl/criteria/predicate/LessThanOrEqual.java | 8 +-
.../data/impl/criteria/predicate/Like.java | 8 +-
.../impl/criteria/predicate/NoValueBuilder.java | 2 +-
.../data/impl/criteria/predicate/NotEq.java | 8 +-
.../impl/criteria/predicate/NotEqIgnoreCase.java | 8 +-
.../data/impl/criteria/predicate/NotLike.java | 8 +-
.../data/impl/criteria/predicate/OrBuilder.java | 6 +-
.../impl/criteria/predicate/PredicateBuilder.java | 6 +-
.../criteria/predicate/SingleValueBuilder.java | 2 +-
.../data/impl/criteria/processor/OrderBy.java | 10 +-
.../impl/criteria/processor/QueryProcessor.java | 6 +-
.../selection/AttributeQuerySelection.java | 10 +-
.../selection/SingularAttributeSelection.java | 2 +-
.../data/impl/criteria/selection/numeric/Abs.java | 10 +-
.../data/impl/criteria/selection/numeric/Avg.java | 10 +-
.../impl/criteria/selection/numeric/Count.java | 10 +-
.../criteria/selection/numeric/CountDistinct.java | 10 +-
.../data/impl/criteria/selection/numeric/Max.java | 10 +-
.../data/impl/criteria/selection/numeric/Min.java | 10 +-
.../impl/criteria/selection/numeric/Modulo.java | 10 +-
.../data/impl/criteria/selection/numeric/Neg.java | 10 +-
.../data/impl/criteria/selection/numeric/Sum.java | 10 +-
.../impl/criteria/selection/strings/Lower.java | 10 +-
.../criteria/selection/strings/SubstringFrom.java | 10 +-
.../selection/strings/SubstringFromTo.java | 10 +-
.../data/impl/criteria/selection/strings/Trim.java | 10 +-
.../impl/criteria/selection/strings/Upper.java | 10 +-
.../criteria/selection/temporal/CurrentDate.java | 8 +-
.../criteria/selection/temporal/CurrentTime.java | 8 +-
.../selection/temporal/CurrentTimestamp.java | 8 +-
.../data/impl/graph/EntityGraphHelper.java | 2 +-
.../impl/handler/AbstractDelegateQueryHandler.java | 4 +-
.../data/impl/handler/CdiQueryContextHolder.java | 4 +-
.../impl/handler/CdiQueryInvocationContext.java | 8 +-
.../data/impl/handler/CriteriaSupportHandler.java | 8 +-
.../impl/handler/EntityManagerDelegateHandler.java | 16 +-
.../data/impl/handler/EntityRepositoryHandler.java | 14 +-
.../data/impl/handler/JpaQueryPostProcessor.java | 2 +-
.../deltaspike/data/impl/handler/QueryHandler.java | 12 +-
.../data/impl/meta/EntityMetadataInitializer.java | 2 +-
.../data/impl/meta/RepositoryMetadataHandler.java | 8 +-
.../impl/meta/RepositoryMetadataInitializer.java | 12 +-
.../meta/RepositoryMethodMetadataInitializer.java | 10 +-
.../data/impl/param/IndexedParameter.java | 2 +-
.../deltaspike/data/impl/param/NamedParameter.java | 2 +-
.../deltaspike/data/impl/param/Parameter.java | 2 +-
.../deltaspike/data/impl/param/Parameters.java | 2 +-
.../impl/tx/ThreadLocalEntityManagerHolder.java | 6 +-
.../data/impl/tx/TransactionalQueryRunner.java | 4 +-
.../deltaspike/data/impl/util/EntityUtils.java | 16 +-
.../data/impl/util/bean/BeanDestroyable.java | 4 +-
.../jpa/OpenJpaPersistenceUnitUtilDelegate.java | 4 +-
.../jpa/PersistenceUnitUtilDelegateFactory.java | 6 +-
.../impl/util/jpa/QueryStringExtractorFactory.java | 2 +-
.../data/impl/DisabledRepositoryTest.java | 2 +-
.../deltaspike/data/impl/QueryResultTest.java | 8 +-
.../data/impl/RepositoryExtensionTest.java | 4 +-
.../data/impl/audit/AuditEntityListenerTest.java | 2 +-
.../data/impl/criteria/CriteriaTest.java | 4 +-
.../handler/EntityManagerDelegateHandlerTest.java | 2 +-
.../data/impl/handler/EntityManagerTest.java | 2 +-
.../impl/handler/EntityRepositoryHandlerTest.java | 4 +-
.../impl/handler/FullEntityRepositoryTest.java | 2 +-
.../NonQualifiedEntityManagerTestProducer.java | 6 +-
.../QualifiedEntityManagerTestProducer.java | 22 +-
.../data/impl/handler/QueryHandlerTest.java | 4 +-
.../data/impl/mapping/MappedRepositoryTest.java | 2 +-
.../impl/meta/unit/OrmXmlBasedRepositoryTest.java | 2 +-
.../deltaspike/data/impl/spi/CdiQuerySpiTest.java | 2 +-
.../data/impl/tx/TransactionalQueryRunnerTest.java | 2 +-
.../impl/tx/TransactionalQueryRunnerWrapper.java | 4 +-
.../util/jpa/QueryStringExtractorFactoryTest.java | 6 +-
.../data/test/TransactionalTestCase.java | 8 +-
.../deltaspike/data/test/domain/AuditedEntity.java | 16 +-
.../data/test/domain/EmbeddedSimple.java | 2 +-
.../apache/deltaspike/data/test/domain/Home.java | 6 +-
.../deltaspike/data/test/domain/NamedEntity.java | 6 +-
.../deltaspike/data/test/domain/OneToMany.java | 2 +-
.../deltaspike/data/test/domain/OneToOne.java | 2 +-
.../apache/deltaspike/data/test/domain/Parent.java | 4 +-
.../deltaspike/data/test/domain/Principal.java | 6 +-
.../apache/deltaspike/data/test/domain/Simple.java | 16 +-
.../deltaspike/data/test/domain/Simple2.java | 6 +-
.../deltaspike/data/test/domain/Simple3.java | 6 +-
.../deltaspike/data/test/domain/Simple4.java | 6 +-
.../deltaspike/data/test/domain/SimpleBuilder.java | 2 +-
.../data/test/domain/SimpleStringId.java | 2 +-
.../data/test/domain/SimpleStringIdBuilder.java | 2 +-
.../deltaspike/data/test/domain/SuperSimple.java | 2 +-
.../apache/deltaspike/data/test/domain/Tee.java | 4 +-
.../apache/deltaspike/data/test/domain/Tee2.java | 8 +-
.../apache/deltaspike/data/test/domain/TeeId.java | 4 +-
.../deltaspike/data/test/java8/entity/Simple.java | 16 +-
.../deltaspike/data/test/java8/test/Java8Test.java | 10 +-
.../test/java8/util/EntityManagerProducer.java | 6 +-
.../test/service/BasicEntityManagerResolver.java | 4 +-
.../test/service/MyEntityRepositoryDelegate.java | 4 +-
.../data/test/service/ParentRepository.java | 2 +-
.../test/service/SimpleCriteriaRepository.java | 2 +-
.../test/service/SimpleIntermediateRepository.java | 2 +-
.../data/test/service/SimpleRepository.java | 2 +-
.../deltaspike/data/test/service/Simplistic.java | 2 +-
.../service/SimplisticEntityManagerResolver.java | 4 +-
.../data/test/util/EntityManagerProducer.java | 6 +-
.../apache/deltaspike/data/test/util/TestData.java | 2 +-
deltaspike/modules/data/pom.xml | 2 +-
deltaspike/modules/data/test-ee7/pom.xml | 2 +-
.../data/test/ee7/domain/EmbeddedSimple.java | 2 +-
.../deltaspike/data/test/ee7/domain/Flat.java | 16 +-
.../deltaspike/data/test/ee7/domain/Garage.java | 12 +-
.../deltaspike/data/test/ee7/domain/House.java | 20 +-
.../deltaspike/data/test/ee7/domain/Simple.java | 16 +-
.../data/test/ee7/domain/SuperSimple.java | 2 +-
.../deltaspike/data/test/ee7/domain/Tenant.java | 10 +-
.../data/test/ee7/graph/HouseRepositoryTest.java | 12 +-
.../JtaTransactionalRepositoryAbstract.java | 2 +-
.../data/test/ee7/service/SimpleClientApp.java | 4 +-
.../data/test/ee7/service/SimpleClientDep.java | 4 +-
.../data/test/ee7/service/SimpleClientTx.java | 4 +-
.../data/test/ee7/service/SimpleHolderApp.java | 2 +-
.../data/test/ee7/service/SimpleHolderDep.java | 2 +-
...taSpikeTransactionalRepositoryAbstractTest.java | 8 +-
...aSpikeTransactionalRepositoryInterfaceTest.java | 8 +-
.../tx/JtaTransactionalRepositoryAbstractTest.java | 8 +-
.../JtaTransactionalRepositoryInterfaceTest.java | 8 +-
.../ee7/tx/TransactionalQueryRunnerWrapper.java | 4 +-
deltaspike/modules/jpa/api/pom.xml | 2 +-
.../jpa/api/entitymanager/EntityManagerConfig.java | 4 +-
.../api/entitymanager/EntityManagerResolver.java | 2 +-
.../jpa/api/entitymanager/PersistenceUnitName.java | 4 +-
.../jpa/api/transaction/TransactionHelper.java | 2 +-
.../jpa/api/transaction/TransactionScoped.java | 2 +-
.../jpa/api/transaction/Transactional.java | 6 +-
.../jpa/spi/descriptor/xml/DescriptorReader.java | 6 +-
.../xml/EntityMappingsDescriptorParser.java | 2 +-
.../xml/PersistenceUnitDescriptorParser.java | 2 +-
.../xml/PersistenceUnitDescriptorProvider.java | 2 +-
.../entitymanager/ActiveEntityManagerHolder.java | 2 +-
.../QualifierBackedEntityManagerResolver.java | 6 +-
deltaspike/modules/jpa/impl/pom.xml | 2 +-
.../PersistenceUnitDescriptorInitExtension.java | 6 +-
.../entitymanager/DefaultEntityManagerHolder.java | 4 +-
.../EntityManagerFactoryProducer.java | 12 +-
.../impl/entitymanager/EntityManagerMetadata.java | 6 +-
.../jpa/impl/entitymanager/EntityManagerRef.java | 2 +-
.../impl/entitymanager/EntityManagerRefLookup.java | 10 +-
.../PersistenceConfigurationProviderImpl.java | 2 +-
.../BeanManagedUserTransactionStrategy.java | 22 +-
.../ContainerManagedTransactionStrategy.java | 6 +-
.../EnvironmentAwareTransactionStrategy.java | 10 +-
.../ManagedUserTransactionResolver.java | 6 +-
.../ResourceLocalTransactionStrategy.java | 14 +-
.../transaction/TransactionStrategyHelper.java | 14 +-
.../impl/transaction/TransactionalInterceptor.java | 8 +-
.../impl/transaction/UserTransactionResolver.java | 8 +-
.../transaction/context/EntityManagerEntry.java | 4 +-
.../transaction/context/TransactionBeanEntry.java | 6 +-
.../context/TransactionBeanStorage.java | 2 +-
.../transaction/context/TransactionContext.java | 8 +-
.../context/TransactionContextExtension.java | 8 +-
.../EntityManagerFactoryProducerTest.java | 6 +-
.../PersistenceConfigurationProviderTest.java | 4 +-
.../test/jpa/api/entitymanager/SampleDb.java | 2 +-
.../entitymanager/SampleEntityManagerProducer.java | 12 +-
.../TestPersistenceProviderResolver.java | 22 +-
.../deltaspike/test/jpa/api/shared/First.java | 2 +-
.../deltaspike/test/jpa/api/shared/Second.java | 2 +-
.../test/jpa/api/shared/TestEntityManager.java | 22 +-
.../test/jpa/api/shared/TestEntityTransaction.java | 2 +-
...ggregatedDefaultEntityManagerInjectionTest.java | 6 +-
.../jpa/api/transactional/aggregation/BeanA.java | 6 +-
.../jpa/api/transactional/aggregation/BeanB.java | 6 +-
.../aggregation/TestEntityManagerProducer.java | 6 +-
.../aggregation/TransactionalBean.java | 4 +-
.../DefaultEntityManagerInjectionTest.java | 6 +-
.../api/transactional/defaultinjection/Failed.java | 2 +-
.../FailedFlushTransactionalBean.java | 6 +-
.../defaultinjection/FailedTransactionalBean.java | 2 +-
.../TestEntityManagerProducer.java | 6 +-
.../defaultinjection/TransactionalBean.java | 6 +-
.../DefaultNestedTransactionTest.java | 4 +-
.../defaultnested/FirstLevelTransactionBean.java | 6 +-
.../defaultnested/NestedTransactionBean.java | 6 +-
.../defaultnested/TestEntityManagerProducer.java | 6 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
...NestedMultiTransactionCatchedExceptionTest.java | 4 +-
.../nested/NestedTransactionBean.java | 6 +-
.../nested/TestEntityManagerProducer.java | 6 +-
.../catched/nested/FirstLevelTransactionBean.java | 6 +-
.../catched/nested/NestedTransactionBean.java | 6 +-
.../NestedTransactionCatchedExceptionTest.java | 4 +-
.../catched/nested/TestEntityManagerProducer.java | 6 +-
.../auto/MultiTransactionBean.java | 6 +-
.../auto/TestEntityManagerProducer.java | 6 +-
.../auto/UncatchedExceptionTest.java | 4 +-
.../flush/auto/MultiTransactionBean.java | 6 +-
.../flush/auto/TestEntityManagerProducer.java | 6 +-
.../flush/auto/UncatchedFlushExceptionTest.java | 4 +-
.../flush/nested/FirstLevelTransactionBean.java | 6 +-
.../flush/nested/NestedTransactionBean.java | 6 +-
.../flush/nested/TestEntityManagerProducer.java | 6 +-
.../flush/nested/UncatchedFlushExceptionTest.java | 4 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
.../nested/NestedTransactionBean.java | 6 +-
.../nested/TestEntityManagerProducer.java | 6 +-
.../nested/UncatchedExceptionTest.java | 4 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
.../uncatched/nested/NestedTransactionBean.java | 6 +-
.../nested/NestedTransactionWithExceptionTest.java | 4 +-
.../nested/TestEntityManagerProducer.java | 6 +-
.../auto/MultiTransactionBean.java | 6 +-
.../multipleinjection/auto/RollbackOnly1Test.java | 4 +-
.../multipleinjection/auto/RollbackOnly2Test.java | 4 +-
.../multipleinjection/auto/RollbackOnlyTest.java | 4 +-
.../auto/TestEntityManagerProducer.java | 6 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
.../NestedMultiTransactionRollbackOnlyTest.java | 4 +-
.../nested/NestedTransactionBean.java | 6 +-
.../nested/TestEntityManagerProducer.java | 6 +-
.../auto/MultiTransactionBean.java | 6 +-
.../auto/MultipleEntityManagerInjectionTest.java | 4 +-
.../auto/TestEntityManagerProducer.java | 6 +-
.../manual/BeanManagedlTransactionTest.java | 4 +-
.../manual/ManualTransactionBean.java | 8 +-
.../manual/ManualTransactionTest.java | 4 +-
.../manual/MockUserTransactionResolver.java | 20 +-
.../manual/TestEntityManagerProducer.java | 8 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
.../nested/NestedMultiTransactionTest.java | 4 +-
.../nested/NestedTransactionBean.java | 6 +-
.../nested/TestEntityManagerProducer.java | 6 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
.../nested/NestedTransactionBean.java | 6 +-
.../nested/NestedTransactionTest.java | 4 +-
.../nested/TestEntityManagerProducer.java | 6 +-
.../NoEntityManagerProducerTest.java | 2 +-
.../noentitymanager/TestEntityManagerProducer.java | 6 +-
.../noentitymanager/TransactionalBean.java | 4 +-
.../readonly/auto/MultiTransactionBean.java | 6 +-
...MultipleEntityManagerInjectionReadOnlyTest.java | 4 +-
.../readonly/auto/TestEntityManagerProducer.java | 6 +-
.../norollback/FirstLevelTransactionBean.java | 6 +-
...stedMultiTransactionReadOnlyNoRollbackTest.java | 4 +-
.../nested/norollback/NestedTransactionBean.java | 6 +-
.../norollback/TestEntityManagerProducer.java | 6 +-
.../nested/rollback/FirstLevelTransactionBean.java | 6 +-
...NestedMultiTransactionReadOnlyRollbackTest.java | 4 +-
.../nested/rollback/NestedTransactionBean.java | 6 +-
.../nested/rollback/TestEntityManagerProducer.java | 6 +-
.../api/transactional/stereotype/Repository.java | 4 +-
.../stereotype/StereotypeTransactionalTest.java | 6 +-
.../stereotype/TestEntityManagerProducer.java | 6 +-
.../stereotype/TransactionalBean.java | 4 +-
.../transactionhelper/TransactionHelperTest.java | 8 +-
.../TransactionScopedEntityManagerProducer.java | 8 +-
...ransactionScopedEntityManagerInjectionTest.java | 8 +-
.../TestEntityManagerProducer.java | 8 +-
.../defaultinjection/TransactionalBean.java | 6 +-
...aultTransactionScopedNestedTransactionTest.java | 4 +-
.../defaultnested/FirstLevelTransactionBean.java | 6 +-
.../defaultnested/NestedTransactionBean.java | 6 +-
.../defaultnested/TestEntityManagerProducer.java | 8 +-
.../auto/MultiTransactionBean.java | 6 +-
...ransactionScopedEntityManagerInjectionTest.java | 4 +-
.../auto/TestEntityManagerProducer.java | 10 +-
.../manual/ManualTransactionBean.java | 8 +-
.../ManualTransactionScopedTransactionTest.java | 4 +-
.../manual/TestEntityManagerProducer.java | 10 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
...estedMultiTransactionScopedTransactionTest.java | 4 +-
.../nested/NestedTransactionBean.java | 6 +-
.../nested/TestEntityManagerProducer.java | 8 +-
.../nested/FirstLevelTransactionBean.java | 6 +-
.../nested/NestedTransactionBean.java | 6 +-
.../NestedTransactionScopedTransactionTest.java | 4 +-
.../nested/TestEntityManagerProducer.java | 8 +-
.../transactionscoped/stereotype/Repository.java | 4 +-
...ereotypeTransactionScopedTransactionalTest.java | 4 +-
.../stereotype/TestEntityManagerProducer.java | 8 +-
.../stereotype/TestEntityTransactionHolder.java | 2 +-
.../stereotype/TransactionalBean.java | 4 +-
.../test/jpa/spi/descriptor/xml/TeeId.java | 4 +-
deltaspike/modules/jpa/pom.xml | 4 +-
deltaspike/modules/jsf/api/pom.xml | 2 +-
.../deltaspike/jsf/api/config/JsfModuleConfig.java | 6 +-
.../jsf/api/listener/phase/AfterPhase.java | 2 +-
.../jsf/api/listener/phase/BeforePhase.java | 2 +-
.../jsf/api/listener/phase/JsfPhaseListener.java | 2 +-
.../deltaspike/jsf/api/literal/FolderLiteral.java | 2 +-
.../deltaspike/jsf/api/literal/ViewLiteral.java | 2 +-
.../deltaspike/jsf/api/message/JsfMessage.java | 2 +-
.../jsf/spi/scope/window/ClientWindow.java | 2 +-
.../jsf/spi/scope/window/ClientWindowConfig.java | 2 +-
.../scope/window/DefaultClientWindowConfig.java | 8 +-
.../util/ValueExpressionEvaluationInputStream.java | 2 +-
.../ValueExpressionEvaluationInputStreamTest.java | 2 +-
deltaspike/modules/jsf/impl-ee6/pom.xml | 2 +-
deltaspike/modules/jsf/impl/pom.xml | 2 +-
.../component/token/PostRequestTokenComponent.java | 4 +-
.../component/token/RequestTokenHtmlRenderer.java | 10 +-
.../window/DisableClientWindowComponent.java | 4 +-
.../window/DisableClientWindowHtmlRenderer.java | 8 +-
.../impl/component/window/WindowIdComponent.java | 4 +-
.../component/window/WindowIdHtmlRenderer.java | 18 +-
.../config/view/DefaultConfigNodeConverter.java | 2 +-
...faultErrorViewAwareExceptionHandlerWrapper.java | 20 +-
.../view/DefaultViewConfigInheritanceStrategy.java | 2 +-
.../config/view/DefaultViewConfigResolver.java | 2 +-
.../jsf/impl/config/view/ViewConfigExtension.java | 14 +-
.../impl/config/view/ViewConfigPathValidator.java | 4 +-
.../config/view/ViewConfigResolverProducer.java | 6 +-
.../config/view/ViewControllerActionListener.java | 6 +-
.../DefaultNavigationParameterContext.java | 2 +-
.../DefaultNavigationParameterStrategy.java | 6 +-
.../navigation/DefaultViewNavigationHandler.java | 4 +-
.../view/navigation/NavigationCaseMapWrapper.java | 6 +-
.../navigation/NavigationParameterInterceptor.java | 8 +-
.../NavigationParameterListInterceptor.java | 8 +-
.../ViewConfigAwareNavigationHandler.java | 8 +-
.../control/BridgeExceptionHandlerWrapper.java | 18 +-
.../jsf/impl/injection/AbstractBeanStorage.java | 2 +-
.../AbstractContextualReferenceWrapper.java | 8 +-
.../jsf/impl/injection/ConverterWrapper.java | 10 +-
.../jsf/impl/injection/DependentBeanEntry.java | 4 +-
.../InjectionAwareApplicationWrapper.java | 18 +-
.../impl/injection/ManagedArtifactResolver.java | 14 +-
.../injection/RequestDependentBeanStorage.java | 2 +-
.../jsf/impl/injection/ValidatorWrapper.java | 10 +-
.../proxy/ConverterAndValidatorProxyExtension.java | 20 +-
.../proxy/ConverterAndValidatorProxyFactory.java | 6 +-
.../injection/proxy/DefaultPartialStateHolder.java | 4 +-
.../listener/action/DeltaSpikeActionListener.java | 4 +-
.../jsf/impl/listener/phase/AfterPhaseBinding.java | 2 +-
.../impl/listener/phase/BeforePhaseBinding.java | 2 +-
.../listener/phase/DeltaSpikePhaseListener.java | 14 +-
.../phase/JsfRequestLifecycleBroadcaster.java | 14 +-
.../phase/JsfRequestLifecyclePhaseListener.java | 8 +-
.../request/DeltaSpikeExternalContextWrapper.java | 6 +-
.../request/DeltaSpikeFacesContextFactory.java | 6 +-
.../request/DeltaSpikeFacesContextWrapper.java | 16 +-
.../request/DeltaSpikeLifecycleFactoryWrapper.java | 4 +-
.../request/DeltaSpikeLifecycleWrapper.java | 6 +-
.../JsfClientWindowAwareLifecycleWrapper.java | 8 +-
.../listener/request/JsfRequestBroadcaster.java | 12 +-
.../listener/system/JsfSystemEventBroadcaster.java | 8 +-
.../jsf/impl/message/DefaultJsfMessage.java | 6 +-
.../jsf/impl/message/FacesMessageEntry.java | 4 +-
.../jsf/impl/message/JsfAwareLocaleResolver.java | 8 +-
.../message/JsfMessageBundleInvocationHandler.java | 6 +-
.../jsf/impl/message/JsfMessageProducer.java | 8 +-
.../jsf/impl/message/JsfMessageResolver.java | 6 +-
.../navigation/DeltaSpikeNavigationHandler.java | 8 +-
.../DeltaSpikeNavigationHandlerWrapper.java | 8 +-
.../NavigationHandlerAwareApplication.java | 8 +-
.../jsf/impl/resource/DeltaSpikeResource.java | 4 +-
.../impl/resource/DeltaSpikeResourceHandler.java | 6 +-
.../jsf/impl/scope/mapped/Jsf2BeanWrapper.java | 2 +-
.../scope/mapped/MappedJsf2ScopeExtension.java | 12 +-
.../jsf/impl/scope/view/ViewScopedContext.java | 18 +-
.../jsf/impl/scope/view/ViewScopedExtension.java | 12 +-
.../ViewAccessScopedAwareNavigationHandler.java | 4 +-
.../jsf/impl/scope/window/ClientWindowAdapter.java | 4 +-
.../jsf/impl/scope/window/DefaultClientWindow.java | 6 +-
.../scope/window/JsfWindowContextQuotaHandler.java | 6 +-
.../strategy/AbstractClientWindowStrategy.java | 8 +-
.../window/strategy/ClientSideWindowStrategy.java | 14 +-
.../window/strategy/DelegatedWindowStrategy.java | 6 +-
.../scope/window/strategy/LazyWindowStrategy.java | 6 +-
.../scope/window/strategy/NoneWindowStrategy.java | 6 +-
.../security/AccessDeniedExceptionBroadcaster.java | 6 +-
.../impl/security/SecurityAwareViewHandler.java | 8 +-
.../jsf/impl/security/ViewRootAccessHandler.java | 6 +-
.../impl/token/DoubleSubmitAwarePhaseListener.java | 10 +-
.../jsf/impl/token/PostRequestTokenManager.java | 4 +-
.../jsf/impl/util/ClientWindowHelper.java | 8 +-
.../apache/deltaspike/jsf/impl/util/JsfUtils.java | 12 +-
.../deltaspike/jsf/impl/util/SecurityUtils.java | 6 +-
.../jsf/impl/util/SharedStringBuilder.java | 4 +-
.../jsf/impl/view/DeltaSpikeViewHandler.java | 8 +-
.../test/jsf/impl/config/TestJsfModuleConfig.java | 4 +-
.../config/view/controller/uc001/PageBean001.java | 2 +-
.../config/view/controller/uc002/PageBean002.java | 4 +-
.../config/view/controller/uc003/PageBean003.java | 2 +-
.../config/view/controller/uc004/PageBean004.java | 2 +-
.../config/view/controller/uc005/PageBean005.java | 2 +-
.../view/controller/uc005/SecuredStereotype1.java | 2 +-
.../view/controller/uc005/SecuredStereotype2.java | 2 +-
.../impl/config/view/custom/uc002/PageBean002.java | 2 +-
.../impl/config/view/custom/uc003/PageBean003.java | 2 +-
.../impl/config/view/custom/uc004/PageBean004.java | 2 +-
.../view/custom/uc004/TestFacesRedirect.java | 2 +-
.../navigation/destination/uc001/PageBean001.java | 2 +-
.../navigation/destination/uc002/PageBean002.java | 2 +-
.../navigation/destination/uc003/PageBean003.java | 2 +-
.../navigation/destination/uc004/PageBean004.java | 2 +-
.../navigation/destination/uc006/PageBean006.java | 2 +-
.../view/navigation/event/uc001/PageBean002.java | 4 +-
.../uc001/NoNavigationParameterWarFileTest.java | 2 +-
.../navigation/parameter/uc001/PageBean001.java | 2 +-
.../navigation/parameter/uc002/PageBean002.java | 2 +-
.../StaticNavigationParameterWarFileTest.java | 2 +-
.../navigation/parameter/uc003/PageBean003.java | 2 +-
.../DynamicNavigationParameterWarFileTest.java | 2 +-
.../navigation/parameter/uc004/PageBean004.java | 6 +-
.../navigation/parameter/uc005/PageBean005.java | 2 +-
.../navigation/parameter/uc006/PageBean006.java | 4 +-
.../navigation/parameter/uc007/PageBean007.java | 2 +-
.../navigation/syntax/uc007/TestFacesRedirect.java | 2 +-
.../view/navigation/syntax/uc010/MyView.java | 2 +-
.../config/view/navigation/syntax/uc011/Pages.java | 2 +-
.../validation/ViewConfigPathValidatorTest.java | 2 +-
.../impl/injection/uc001/AnotherBeanConverter.java | 14 +-
.../test/jsf/impl/injection/uc001/MyBean.java | 6 +-
.../jsf/impl/injection/uc001/MyBeanValidator.java | 14 +-
.../impl/injection/uc002/AnotherBeanConverter.java | 16 +-
.../test/jsf/impl/injection/uc002/MyBean.java | 6 +-
.../jsf/impl/injection/uc002/MyBeanValidator.java | 16 +-
.../impl/injection/uc003/AbstractStateHolder.java | 4 +-
.../impl/injection/uc003/AnotherBeanConverter.java | 14 +-
.../test/jsf/impl/injection/uc003/MyBean.java | 6 +-
.../jsf/impl/injection/uc003/MyBeanValidator.java | 14 +-
.../impl/injection/uc004/AnotherBeanConverter.java | 14 +-
.../test/jsf/impl/injection/uc004/MyBean.java | 6 +-
.../jsf/impl/injection/uc004/MyBeanValidator.java | 16 +-
.../impl/message/beans/JsfMessageBackingBean.java | 6 +-
.../test/jsf/impl/message/beans/UserMessage.java | 2 +-
.../beans/JsfApplicationScopedBackingBean.java | 4 +-
.../mapped/beans/JsfRequestScopedBackingBean.java | 4 +-
.../mapped/beans/JsfSessionScopedBackingBean.java | 4 +-
.../scope/view/beans/ViewScopedBackingBean.java | 4 +-
.../viewaccess/beans/ViewAccessScopedBeanX.java | 2 +-
.../viewaccess/beans/ViewAccessScopedBeanY.java | 2 +-
.../jsf/impl/scope/window/MyWindowScopedBean.java | 2 +-
.../impl/scope/window/beans/WindowAccessBean.java | 4 +-
.../window/beans/WindowScopedBackingBean.java | 2 +-
.../test/jsf/impl/util/JsfUtilsTest.java | 2 +-
deltaspike/modules/jsf/pom.xml | 4 +-
.../impl/CDIAwareConstraintValidatorFactory.java | 6 +-
.../deltaspike/beanvalidation/test/ArraySize.java | 4 +-
.../test/InjectableConstraintValidator.java | 6 +-
.../test/InjectedValidationTest.java | 6 +-
.../{servlet => obsolete_servlet}/api/pom.xml | 0
.../api/resourceloader/WebResourceProvider.java | 6 +-
.../api/src/main/resources/META-INF/beans.xml | 0
.../{servlet => obsolete_servlet}/impl/pom.xml | 0
.../servlet/impl/config/ServletConfigListener.java | 10 +-
.../servlet/impl/config/ServletConfigSource.java | 0
.../impl/event/EventBridgeContextListener.java | 4 +-
.../servlet/impl/event/EventBridgeFilter.java | 12 +-
.../impl/event/EventBridgeSessionListener.java | 4 +-
.../servlet/impl/event/EventBroadcaster.java | 2 +-
.../impl/produce/RequestResponseHolder.java | 4 +-
.../impl/produce/RequestResponseHolderFilter.java | 12 +-
.../produce/RequestResponseHolderListener.java | 4 +-
.../servlet/impl/produce/ServletContextHolder.java | 2 +-
.../impl/produce/ServletContextHolderListener.java | 4 +-
.../impl/produce/ServletObjectProducer.java | 18 +-
.../impl/src/main/resources/META-INF/beans.xml | 0
....apache.deltaspike.core.spi.config.ConfigSource | 0
.../src/main/resources/META-INF/web-fragment.xml | 0
.../context/ServletContextEventsObserver.java | 8 +-
.../event/context/ServletContextEventsTest.java | 2 +-
.../request/RequestResponseEventsObserver.java | 8 +-
.../event/request/RequestResponseEventsTest.java | 2 +-
.../impl/event/session/CreateSessionServlet.java | 10 +-
.../impl/event/session/DestroySessionServlet.java | 10 +-
.../impl/event/session/SessionEventsObserver.java | 6 +-
.../impl/event/session/SessionEventsTest.java | 2 +-
.../impl/producer/EarlyRequestInjectionFilter.java | 18 +-
.../impl/producer/EarlyRequestInjectionTest.java | 0
.../impl/producer/ServletContextInjectionTest.java | 4 +-
.../impl/producer/ServletObjectInjectionBean.java | 12 +-
.../producer/ServletObjectInjectionServlet.java | 10 +-
.../impl/producer/ServletObjectInjectionTest.java | 0
.../resourceloader/WebResourceProviderTest.java | 2 +-
.../test/servlet/impl/util/ArchiveUtils.java | 0
.../modules/{servlet => obsolete_servlet}/pom.xml | 0
deltaspike/modules/partial-bean/api/pom.xml | 2 +-
deltaspike/modules/partial-bean/impl/pom.xml | 2 +-
.../impl/DeltaSpikePartialProducerLifecycle.java | 4 +-
.../impl/PartialBeanBindingExtension.java | 20 +-
.../partialbean/impl/PartialBeanProxyFactory.java | 2 +-
.../api/partialbean/shared/CustomInterceptor.java | 2 +-
.../partialbean/shared/CustomInterceptorImpl.java | 8 +-
.../partialbean/shared/CustomInterceptorState.java | 2 +-
.../test/core/api/partialbean/shared/TestBean.java | 2 +-
.../shared/ThrowExceptionPartialBeanHandler.java | 2 +-
.../core/api/partialbean/uc001/PartialBean.java | 2 +-
.../uc001/PartialBeanAsInterfaceTest.java | 2 +-
.../partialbean/uc001/TestPartialBeanHandler.java | 8 +-
.../core/api/partialbean/uc002/PartialBean.java | 8 +-
.../uc002/PartialBeanAsAbstractClassTest.java | 2 +-
.../partialbean/uc002/TestPartialBeanHandler.java | 8 +-
.../core/api/partialbean/uc003/PartialBean.java | 2 +-
.../partialbean/uc003/TestPartialBeanHandler.java | 8 +-
.../uc004/ApplicationScopedPartialBean.java | 2 +-
.../partialbean/uc004/TestPartialBeanHandler.java | 8 +-
.../uc005/ApplicationScopedPartialBean.java | 2 +-
.../partialbean/uc005/TestPartialBeanHandler.java | 8 +-
.../uc006/ApplicationScopedPartialBean.java | 2 +-
.../partialbean/uc006/TestPartialBeanHandler.java | 8 +-
.../uc007/CustomInterceptorStereotype.java | 2 +-
.../core/api/partialbean/uc007/PartialBean.java | 2 +-
.../partialbean/uc007/TestPartialBeanHandler.java | 2 +-
.../core/api/partialbean/uc008/PartialBean.java | 2 +-
.../partialbean/uc008/TestPartialBeanHandler.java | 2 +-
.../uc009/PartialBeanWithProducerTest.java | 2 +-
.../core/api/partialbean/uc009/TestBaseConfig.java | 2 +-
.../core/api/partialbean/uc009/TestConfig.java | 4 +-
.../core/api/partialbean/uc009/TestCustomType.java | 2 +-
.../test/core/api/partialbean/uc009/TestValue.java | 2 +-
.../uc010/PartialBeanAsAbstractClassTest.java | 4 +-
.../api/partialbean/uc010/PartialBeanWrapper.java | 4 +-
.../partialbean/uc010/TestPartialBeanHandler.java | 2 +-
.../api/partialbean/uc011/CustomerRepository.java | 2 +-
.../partialbean/uc011/TestPartialBeanHandler.java | 2 +-
.../api/partialbean/uc012/ConcurrencyBugTest.java | 2 +-
.../core/api/partialbean/uc012/PartialBean.java | 2 +-
.../uc013/MethodLevelInterceptorTest.java | 2 +-
.../core/api/partialbean/uc013/MyRepository.java | 2 +-
.../partialbean/uc013/SimpleCacheExtension.java | 6 +-
.../partialbean/uc013/SimpleCacheInterceptor.java | 8 +-
.../api/partialbean/uc013/SimpleCacheManager.java | 4 +-
.../partialbean/uc013/TestPartialBeanHandler.java | 2 +-
deltaspike/modules/partial-bean/pom.xml | 4 +-
deltaspike/modules/pom.xml | 6 +-
deltaspike/modules/proxy/api/pom.xml | 2 +-
.../api/DeltaSpikeProxyContextualLifecycle.java | 14 +-
.../proxy/api/DeltaSpikeProxyFactory.java | 2 +-
.../deltaspike/proxy/api/EnableInterceptors.java | 2 +-
.../DeltaSpikeProxyInterceptorLookup.java | 8 +-
.../DeltaSpikeProxyInvocationContext.java | 10 +-
.../DeltaSpikeProxyInvocationHandler.java | 8 +-
.../proxy/util/EnableInterceptorsInterceptor.java | 10 +-
.../proxy/util/EnableInterceptorsProxyFactory.java | 2 +-
deltaspike/modules/proxy/impl-asm/pom.xml | 2 +-
.../impl/AsmDeltaSpikeProxyClassGenerator.java | 2 +-
.../proxy/impl/AsmProxyClassGeneratorTest.java | 2 +-
.../apache/deltaspike/proxy/impl/TestClass.java | 2 +-
.../enableinterceptors/EnableInterceptorsTest.java | 2 +-
.../impl/enableinterceptors/MyBeanInterceptor.java | 6 +-
.../MyBeanInterceptorBinding.java | 2 +-
.../impl/enableinterceptors/MyBeanProducer.java | 2 +-
.../dynamicbinding/MyRepositoryProducer.java | 2 +-
.../dynamicbinding/SimpleCacheExtension.java | 6 +-
.../dynamicbinding/SimpleCacheInterceptor.java | 8 +-
.../dynamicbinding/SimpleCacheManager.java | 4 +-
.../dynamicbinding/SimpleCacheTest.java | 4 +-
deltaspike/modules/proxy/pom.xml | 4 +-
deltaspike/modules/scheduler/api/pom.xml | 2 +-
.../apache/deltaspike/scheduler/api/Scheduled.java | 4 +-
deltaspike/modules/scheduler/impl/pom.xml | 2 +-
.../scheduler/impl/AbstractJobAdapter.java | 4 +-
.../impl/DynamicExpressionObserverJob.java | 2 +-
.../deltaspike/scheduler/impl/JobAdapter.java | 2 +-
.../scheduler/impl/JobRunnableAdapter.java | 2 +-
.../scheduler/impl/QuartzSchedulerProducer.java | 6 +-
.../scheduler/impl/SchedulerExtension.java | 4 +-
.../scheduler/impl/SchedulerProducer.java | 6 +-
.../test/scheduler/custom/CustomSchedulerTest.java | 2 +-
.../test/scheduler/custom/RequestScopedJob.java | 2 +-
.../test/scheduler/custom/ScopeNotStartedTest.java | 2 +-
.../test/scheduler/custom/TestJobManager.java | 6 +-
deltaspike/modules/scheduler/pom.xml | 4 +-
deltaspike/modules/security/api/pom.xml | 2 +-
.../security/api/authorization/Secured.java | 2 +-
deltaspike/modules/security/impl/pom.xml | 2 +-
.../AccessDeniedExceptionBroadcaster.java | 6 +-
.../DefaultAccessDecisionVoterContext.java | 2 +-
.../authorization/SecuredAnnotationAuthorizer.java | 6 +-
.../SecurityParameterValueRedefiner.java | 8 +-
.../impl/extension/AuthorizationParameter.java | 2 +-
.../security/impl/extension/Authorizer.java | 18 +-
.../impl/extension/DefaultSecurityStrategy.java | 8 +-
.../security/impl/extension/SecurityExtension.java | 18 +-
.../impl/extension/SecurityInterceptor.java | 8 +-
.../impl/extension/SecurityInterceptorBinding.java | 2 +-
.../SecurityInterceptorBindingLiteral.java | 2 +-
.../impl/extension/SecurityMetaDataStorage.java | 4 +-
.../security/impl/util/SecurityUtils.java | 4 +-
.../authorization/nonbinding/CustomAuthorizer.java | 4 +-
.../ParamBindingWithNonbindingMember.java | 2 +-
.../impl/authorization/nonbinding/SecuredBean.java | 2 +-
.../impl/authorization/secured/SecuredBean1.java | 2 +-
.../impl/authorization/secured/SecuredBean2.java | 2 +-
.../impl/authorization/secured/SecuredBean3.java | 2 +-
.../impl/authorization/secured/SecuredBean4.java | 2 +-
.../impl/authorization/secured/SecuredBean5.java | 2 +-
.../secured/SecuredBeanWithStereotype.java | 2 +-
.../secured/SecuredBeanWithStereotype1.java | 2 +-
.../secured/SecuredBeanWithStereotype2.java | 2 +-
.../secured/SecuredBeanWithStereotype3.java | 2 +-
.../secured/TestAccessDecisionVoter.java | 4 +-
.../secured/TestAccessDecisionVoter1.java | 2 +-
.../secured/TestAccessDecisionVoter2.java | 2 +-
.../securitybinding/CustomAuthorizer.java | 4 +-
.../securitybinding/SecuredBean1.java | 2 +-
.../securitybinding/SecuredBean2.java | 2 +-
.../securityparameterbinding/CustomAuthorizer.java | 4 +-
.../securityparameterbinding/SecuredBean1.java | 2 +-
.../securityparameterbinding/SecuredBean2.java | 2 +-
deltaspike/modules/security/pom.xml | 4 +-
deltaspike/modules/test-control/api/pom.xml | 2 +-
.../testcontrol/api/junit/CdiTestRunner.java | 16 +-
.../testcontrol/api/junit/CdiTestSuiteRunner.java | 2 +-
.../api/literal/TestControlLiteral.java | 2 +-
.../testcontrol/spi/mock/MockFilter.java | 4 +-
deltaspike/modules/test-control/impl/pom.xml | 2 +-
.../impl/jsf/MockedJsf2TestContainer.java | 32 +-
.../impl/jsf/MockedJsfTestContainerAdapter.java | 6 +-
.../impl/jsf/MyFacesContainerAdapter.java | 6 +-
.../jsf/MyFacesContainerPerTestMethodAdapter.java | 2 +-
.../testcontrol/impl/mock/AbstractMockManager.java | 2 +-
.../testcontrol/impl/mock/BeanCacheKey.java | 2 +-
.../testcontrol/impl/mock/DefaultMockFilter.java | 14 +-
.../impl/mock/MockAwareInjectionTargetWrapper.java | 8 +-
.../impl/mock/MockAwareProducerWrapper.java | 8 +-
.../testcontrol/impl/mock/MockExtension.java | 20 +-
.../impl/mock/SimpleApplicationMockManager.java | 4 +-
.../testcontrol/impl/mock/SimpleMockManager.java | 6 +-
.../impl/request/ContextControlDecorator.java | 16 +-
.../TransactionStatementDecoratorFactory.java | 2 +-
.../StandardContextTestControlValidator.java | 2 +-
.../test/testcontrol/CustomMockManager.java | 6 +-
.../mock/shared/ApplicationScopedBean.java | 2 +-
.../test/testcontrol/mock/shared/MyQualifier.java | 2 +-
.../testcontrol/mock/shared/RequestScopedBean.java | 2 +-
.../testcontrol/mock/shared/SessionScopedBean.java | 2 +-
.../mock/uc001/MockedRequestScopedBeanTest.java | 2 +-
.../mock/uc002/MockedSessionScopedBeanTest.java | 2 +-
.../mock/uc003/MockedSessionScopedBean.java | 2 +-
.../MockedSessionScopedBeanAcrossMethodsTest.java | 6 +-
.../mock/uc004/MockedApplicationScopedBean.java | 2 +-
.../uc004/MockedApplicationScopedBeanTest.java | 2 +-
.../mock/uc005/MockedProducedBeanTest.java | 2 +-
.../test/testcontrol/mock/uc005/ProducedBean.java | 2 +-
.../mock/uc005/ProducedBeanProducer.java | 6 +-
.../MockedRequestScopedQualifiedBeanTest.java | 2 +-
.../test/testcontrol/mock/uc006/QualifiedBean.java | 2 +-
.../uc007/MockedProducedQualifiedBeanTest.java | 2 +-
.../test/testcontrol/mock/uc007/ProducedBean.java | 2 +-
.../mock/uc007/ProducedBeanProducer.java | 6 +-
.../mock/uc008/MockedTypedBeanTest.java | 4 +-
.../testcontrol/mock/uc008/TypedBean1and2.java | 4 +-
.../test/testcontrol/mock/uc008/TypedBean3.java | 4 +-
.../mock/uc009/MockedTypedProducedBeanTest.java | 4 +-
.../testcontrol/mock/uc009/TypedBean1and2.java | 2 +-
.../test/testcontrol/mock/uc009/TypedBean3.java | 2 +-
.../testcontrol/mock/uc009/TypedBeanProducer.java | 6 +-
.../mock/uc010/MockedRequestScopedBeanTest.java | 2 +-
.../MockedRequestScopedBeanWithInjection.java | 4 +-
.../MockedRequestScopedBeanWithInjectionTest.java | 2 +-
.../MockedRequestScopedBeanWithInjection.java | 4 +-
.../MockedRequestScopedBeanWithInjectionTest.java | 2 +-
.../mock/uc013/MockedTypedProducedBeanTest.java | 2 +-
.../testcontrol/mock/uc013/TypedBean1and2.java | 2 +-
.../test/testcontrol/mock/uc013/TypedBean3.java | 2 +-
.../testcontrol/mock/uc013/TypedBeanProducer.java | 6 +-
.../mock/uc014/MockedTypedProducedBeanTest.java | 4 +-
.../testcontrol/mock/uc014/TypedBean1and2.java | 2 +-
.../test/testcontrol/mock/uc014/TypedBean3.java | 2 +-
.../testcontrol/mock/uc014/TypedBeanProducer.java | 6 +-
.../mock/uc015/InterceptedBeanClassLevel.java | 2 +-
.../mock/uc015/InterceptedBeanMethodLevel.java | 2 +-
.../mock/uc015/InterceptedBeanTest.java | 2 +-
.../mock/uc015/InterceptionResultStorage.java | 2 +-
.../testcontrol/mock/uc015/TestInterceptor.java | 2 +-
.../mock/uc015/TestInterceptorImplementation.java | 8 +-
.../mock/uc016/CustomMockManagerTest.java | 2 +-
.../testcontrol/shared/ApplicationScopedBean.java | 4 +-
.../test/testcontrol/shared/RequestScopedBean.java | 4 +-
.../test/testcontrol/shared/SessionScopedBean.java | 2 +-
.../RequestAndSessionScopePerTestMethodTest.java | 2 +-
.../uc002/SessionScopePerTestClassTest.java | 4 +-
.../RequestAndSessionScopePerTestMethodTest.java | 2 +-
.../uc003/SessionScopePerTestClassTest.java | 4 +-
.../uc004/ProjectStageTestControlTest.java | 4 +-
.../testcontrol/uc005/MockedJsfContainerTest.java | 8 +-
.../uc006/SkipExternalContainerTest.java | 2 +-
.../test/testcontrol/uc007/BaseTest.java | 2 +-
.../uc008/BeforeAndAfterInjectionTest.java | 2 +-
.../test/testcontrol/uc009/JsfContainerTest.java | 8 +-
.../uc010/JsfContainerPerTestMethodTest.java | 2 +-
.../uc011/InterceptedBeanClassLevel.java | 2 +-
.../uc011/InterceptedBeanMethodLevel.java | 2 +-
.../testcontrol/uc011/InterceptedBeanTest.java | 2 +-
.../uc011/InterceptionResultStorage.java | 2 +-
.../test/testcontrol/uc011/TestInterceptor.java | 2 +-
.../uc011/TestInterceptorImplementation.java | 8 +-
.../uc012/ApplicationScopedBeanTest.java | 2 +-
.../uc012/ApplicationScopedTestBean.java | 2 +-
.../uc012/ApplicationScopedTestBeanClient.java | 4 +-
.../test/testcontrol/uc014/DefaultTestService.java | 2 +-
.../test/testcontrol/uc014/TestServiceLabelX.java | 4 +-
.../test/testcontrol/uc014/TestServiceLabelY.java | 4 +-
.../testcontrol/uc014/TestServiceLabelYTest.java | 2 +-
.../testcontrol/uc014/TestServiceNoLabelTest.java | 2 +-
.../uc014/TestServiceTestLabelXTest.java | 2 +-
.../testcontrol/uc015/AlternativeServiceTest.java | 2 +-
.../test/testcontrol/uc015/DefaultTestService.java | 2 +-
.../uc015/GlobalAlternativeTestService.java | 33 -
.../test/testcontrol/uc015/LabeledServiceTest.java | 4 +-
.../test/testcontrol/uc015/LabeledTestService.java | 4 +-
.../uc016/CustomAlternativeBeanClassProvider.java | 79 -
.../test/testcontrol/uc016/DefaultTestService.java | 2 +-
.../test/testcontrol/uc016/TestServiceLabelX.java | 4 +-
.../testcontrol/uc016/TestServiceLabelXTest.java | 2 +-
.../test/testcontrol/uc016/TestServiceLabelY.java | 4 +-
.../testcontrol/uc016/TestServiceLabelYTest.java | 2 +-
.../test/testcontrol/uc017/DefaultServiceTest.java | 2 +-
.../uc017/DefaultTestServiceProducer.java | 4 +-
.../test/testcontrol/uc017/LabeledServiceTest.java | 2 +-
.../uc017/LabeledTestServiceProducer.java | 6 +-
.../test/testcontrol/uc018/DefaultServiceTest.java | 2 +-
.../uc018/DefaultTestServiceProducer.java | 8 +-
.../uc018/InterceptedDefaultTestService.java | 2 +-
.../uc018/InterceptedLabeledTestService.java | 2 +-
.../test/testcontrol/uc018/LabeledServiceTest.java | 2 +-
.../uc018/LabeledTestServiceProducer.java | 10 +-
.../testcontrol/uc018/TestServiceQualifier.java | 2 +-
.../uc018/TestUpperCaseInterceptor.java | 2 +-
.../TestUpperCaseInterceptorImplementation.java | 6 +-
.../test/testcontrol/uc019/DefaultTestService.java | 2 +-
.../uc019/TestLabeledAlternativeFilter.java | 2 +-
.../test/testcontrol/uc019/TestServiceLabelX.java | 4 +-
.../testcontrol/uc019/TestServiceLabelXTest.java | 2 +-
.../test/testcontrol/uc019/TestServiceLabelY.java | 4 +-
.../testcontrol/uc019/TestServiceLabelYTest.java | 2 +-
deltaspike/modules/test-control/pom.xml | 4 +-
deltaspike/parent/code/pom.xml | 1650 +++-----------------
deltaspike/parent/pom.xml | 366 +----
deltaspike/pom.xml | 6 +-
deltaspike/test-utils/pom.xml | 2 +-
documentation/pom.xml | 4 +-
pom.xml | 2 +-
site/pom.xml | 4 +-
1196 files changed, 3284 insertions(+), 6023 deletions(-)
diff --git a/deltaspike/cdictrl/api/pom.xml b/deltaspike/cdictrl/api/pom.xml
index 0f1cc049a..d7bb3221e 100644
--- a/deltaspike/cdictrl/api/pom.xml
+++ b/deltaspike/cdictrl/api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>cdictrl-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/api/src/main/java/org/apache/deltaspike/cdise/api/CdiContainer.java b/deltaspike/cdictrl/api/src/main/java/org/apache/deltaspike/cdise/api/CdiContainer.java
index 88ac7fb7e..090ac1813 100644
--- a/deltaspike/cdictrl/api/src/main/java/org/apache/deltaspike/cdise/api/CdiContainer.java
+++ b/deltaspike/cdictrl/api/src/main/java/org/apache/deltaspike/cdise/api/CdiContainer.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.cdise.api;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.util.Map;
diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml b/deltaspike/cdictrl/impl-openejb/pom.xml
index 69b998503..d1de017ee 100644
--- a/deltaspike/cdictrl/impl-openejb/pom.xml
+++ b/deltaspike/cdictrl/impl-openejb/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>cdictrl-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java b/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
index 5d982631f..9d655ad2e 100644
--- a/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
+++ b/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
@@ -25,9 +25,9 @@ import org.apache.openejb.core.LocalInitialContext;
import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.webbeans.config.WebBeansContext;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java b/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java
index de8309d5f..8bf687256 100644
--- a/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java
+++ b/deltaspike/cdictrl/impl-openejb/src/test/java/org/apache/deltaspike/cdise/openejb/OpenEJbContainerControlConfigurationTest.java
@@ -25,9 +25,9 @@ import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.junit.Test;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import javax.naming.NamingException;
-import javax.sql.DataSource;
+import jakarta.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
diff --git a/deltaspike/cdictrl/impl-owb/pom.xml b/deltaspike/cdictrl/impl-owb/pom.xml
index 8d38250fa..e5406eca5 100644
--- a/deltaspike/cdictrl/impl-owb/pom.xml
+++ b/deltaspike/cdictrl/impl-owb/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>cdictrl-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
index 226ae1eab..6427e3db4 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java
@@ -22,10 +22,10 @@ import java.util.Enumeration;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.inject.Typed;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionContext;
/**
* A simple mock HttpSession
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
index 9c2d8daf6..75c8f20f1 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
@@ -28,18 +28,18 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import javax.enterprise.inject.Typed;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
+import jakarta.enterprise.inject.Typed;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
/**
* Mock ServletContext needed to startup the container.
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
index 7553dcd7b..d9e71ec7c 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
@@ -23,9 +23,9 @@ import org.apache.deltaspike.cdise.api.ContextControl;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.ContainerLifecycle;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java
index 1a211d441..bb6e6a30a 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContextControl.java
@@ -18,12 +18,12 @@
*/
package org.apache.deltaspike.cdise.owb;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.Dependent;
-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.Dependent;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Singleton;
import java.lang.annotation.Annotation;
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OwbHelper.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OwbHelper.java
index b2e1252d8..81f6ed39e 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OwbHelper.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OwbHelper.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.cdise.owb;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
/**
* A few utility methods for OWB
diff --git a/deltaspike/cdictrl/impl-weld/pom.xml b/deltaspike/cdictrl/impl-weld/pom.xml
index d769ba3b0..d70cc8439 100644
--- a/deltaspike/cdictrl/impl-weld/pom.xml
+++ b/deltaspike/cdictrl/impl-weld/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>cdictrl-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
index ac114f339..11f41df1b 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java
@@ -25,17 +25,17 @@ import org.jboss.weld.environment.se.Weld;
import org.jboss.weld.environment.se.WeldContainer;
import org.jboss.weld.util.reflection.Formats;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
/**
* Weld specific implementation of {@link org.apache.deltaspike.cdise.api.CdiContainer}.
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
index cf4f25bb0..6f05b1a0b 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
@@ -18,13 +18,13 @@
*/
package org.apache.deltaspike.cdise.weld;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import java.lang.annotation.Annotation;
import java.util.HashMap;
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index 87bce9f55..d9ec79976 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike</groupId>
<artifactId>parent-code</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/code/pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml
index b66d7ee62..893200015 100644
--- a/deltaspike/cdictrl/servlet/pom.xml
+++ b/deltaspike/cdictrl/servlet/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>cdictrl-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java b/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java
index 985033d16..f5b7f5dd1 100644
--- a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java
+++ b/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletContextListener.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.cdise.servlet;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
/**
* Adds a listener to the context for enabling requests.
diff --git a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java b/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java
index efa50381f..0137a611c 100644
--- a/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java
+++ b/deltaspike/cdictrl/servlet/src/main/java/org/apache/deltaspike/cdise/servlet/CdiServletRequestListener.java
@@ -22,9 +22,9 @@ import org.apache.deltaspike.cdise.api.CdiContainer;
import org.apache.deltaspike.cdise.api.CdiContainerLoader;
import org.apache.deltaspike.cdise.api.ContextControl;
-import javax.enterprise.context.RequestScoped;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java
index 41958bc5e..a65e7ffc2 100644
--- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java
+++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.cdise.servlet.test.content;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
/**
* a simple request scoped object.
diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java
index 6fa1d985e..bf8b56e3f 100644
--- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java
+++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java
@@ -20,13 +20,13 @@ package org.apache.deltaspike.cdise.servlet.test.content;
import org.apache.deltaspike.cdise.api.CdiContainerLoader;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Set;
diff --git a/deltaspike/cdictrl/tck/pom.xml b/deltaspike/cdictrl/tck/pom.xml
index 26b6a9d90..c4fa3ce5d 100644
--- a/deltaspike/cdictrl/tck/pom.xml
+++ b/deltaspike/cdictrl/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>cdictrl-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
index f33a199e5..2fa2d89e7 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
@@ -24,11 +24,11 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.deltaspike.cdise.api.CdiContainer;
import org.apache.deltaspike.cdise.api.CdiContainerLoader;
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
index 93e33b08b..c5e012d33 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
@@ -19,10 +19,10 @@
package org.apache.deltaspike.cdise.tck.beans;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
@RequestScoped
public class Car
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/CarRepair.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/CarRepair.java
index d479685b6..14fc0f563 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/CarRepair.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/CarRepair.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.cdise.tck.beans;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
@ApplicationScoped
public class CarRepair
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java
index 82337109f..48d4e1a44 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.cdise.tck.beans;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.SessionScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.SessionScoped;
import java.io.Serializable;
@SessionScoped
diff --git a/deltaspike/checkstyle-rules/pom.xml b/deltaspike/checkstyle-rules/pom.xml
index f5ec41e98..f01a41506 100644
--- a/deltaspike/checkstyle-rules/pom.xml
+++ b/deltaspike/checkstyle-rules/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike</groupId>
<artifactId>deltaspike-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml b/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
index 93e8d8f9d..219b70699 100644
--- a/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
+++ b/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
@@ -114,7 +114,7 @@
<module name="LineLength">
- <property name="max" value="120" />
+ <property name="max" value="150" />
<property name="ignorePattern" value="@version|@see"/>
</module>
<module name="MethodLength">
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/BeforeHandles.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/BeforeHandles.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/BeforeHandles.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/BeforeHandles.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionHandler.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionHandler.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionHandler.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionHandler.java
index 28cb6ad61..10e2f2965 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionHandler.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionHandler.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.api.exception.control;
-import javax.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Stereotype;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionHandlingFlow.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionHandlingFlow.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionHandlingFlow.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionHandlingFlow.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java
similarity index 98%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java
index c4e193773..8f11f9fac 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.api.exception.control;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.io.Serializable;
import java.util.Arrays;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/HandlerMethod.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/HandlerMethod.java
similarity index 98%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/HandlerMethod.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/HandlerMethod.java
index 22d7c1446..56402d620 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/HandlerMethod.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/HandlerMethod.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.exception.control;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/Handles.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/Handles.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/Handles.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/Handles.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionEvent.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionEvent.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionEvent.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionEvent.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java
similarity index 99%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java
index 945aa54ba..b64f82a50 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.exception.control.event;
import org.apache.deltaspike.core.api.exception.control.ExceptionStackItem;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.io.Serializable;
import java.sql.SQLException;
import java.util.ArrayDeque;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java
similarity index 98%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java
index 18b8fe611..67c2f012e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.api.exception.control.event;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.util.Collections;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/AlternativeLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/AlternativeLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/AlternativeLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/AlternativeLiteral.java
index 3e2910078..5d7decf6c 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/AlternativeLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/AlternativeLiteral.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link javax.enterprise.inject.Alternative}.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/AnyLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/AnyLiteral.java
similarity index 92%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/AnyLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/AnyLiteral.java
index b5b5d97ad..c47dd8182 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/AnyLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/AnyLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.Any;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for the {@link javax.enterprise.inject.Any} annotation.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ApplicationScopedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ApplicationScopedLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ApplicationScopedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ApplicationScopedLiteral.java
index cd6e99d1d..5b53597fd 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ApplicationScopedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ApplicationScopedLiteral.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link ApplicationScoped}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ConversationScopedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ConversationScopedLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ConversationScopedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ConversationScopedLiteral.java
index ace18285c..37235fee3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ConversationScopedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ConversationScopedLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link ConversationScoped}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DefaultLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DefaultLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DefaultLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DefaultLiteral.java
index e20412d1c..5a626beab 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DefaultLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DefaultLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link Default}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DeltaSpikeLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DeltaSpikeLiteral.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DeltaSpikeLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DeltaSpikeLiteral.java
index 8d9c2516c..1f894ae53 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DeltaSpikeLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DeltaSpikeLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import org.apache.deltaspike.core.api.common.DeltaSpike;
/**
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DependentScopeLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DependentScopeLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DependentScopeLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DependentScopeLiteral.java
index c18361b5d..502c85239 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DependentScopeLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DependentScopeLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link Dependent}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java
index e986b6744..3ab0474b7 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/DestroyedLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import org.apache.deltaspike.core.api.lifecycle.Destroyed;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java
index 9fd311bad..d0aa24473 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/InitializedLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import org.apache.deltaspike.core.api.lifecycle.Initialized;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InjectableResourceLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/InjectableResourceLiteral.java
similarity index 97%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InjectableResourceLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/InjectableResourceLiteral.java
index c5a83eb0f..9c20b3c65 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/InjectableResourceLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/InjectableResourceLiteral.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.literal;
import org.apache.deltaspike.core.api.resourceloader.InjectableResource;
import org.apache.deltaspike.core.api.resourceloader.InjectableResourceProvider;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
public class InjectableResourceLiteral extends AnnotationLiteral<InjectableResource> implements InjectableResource
{
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ModelLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ModelLiteral.java
similarity index 92%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ModelLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ModelLiteral.java
index b9eb07ea7..88dcd04be 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ModelLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/ModelLiteral.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.Model;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Model;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link javax.enterprise.inject.Model} annotation.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
similarity index 94%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
index 748983c43..e53e5dd10 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Named;
/**
* Literal for {@link javax.inject.Named} qualifier.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NewLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/NewLiteral.java
similarity index 93%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NewLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/NewLiteral.java
index 1becda963..97fa45af1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NewLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/NewLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.New;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.New;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link New}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/RequestScopedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/RequestScopedLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/RequestScopedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/RequestScopedLiteral.java
index 1f9b18a82..58a59a029 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/RequestScopedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/RequestScopedLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link RequestScoped}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SessionScopeLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SessionScopeLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SessionScopeLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SessionScopeLiteral.java
index 0cbc82091..565b28a90 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SessionScopeLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SessionScopeLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link SessionScoped}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SingletonLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SingletonLiteral.java
similarity index 92%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SingletonLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SingletonLiteral.java
index 8c930d459..7640b5671 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SingletonLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SingletonLiteral.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Singleton;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Singleton;
/**
* Literal for {@link javax.inject.Singleton}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SpecializesLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SpecializesLiteral.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SpecializesLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SpecializesLiteral.java
index 68fb6f984..8891d0aba 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/SpecializesLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/SpecializesLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link Specializes}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
similarity index 93%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
index f233ec8cd..1736be40b 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link javax.enterprise.inject.Typed}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/AbstractResourceProvider.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/AbstractResourceProvider.java
similarity index 95%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/AbstractResourceProvider.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/AbstractResourceProvider.java
index f4b78255f..d520e2a0f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/AbstractResourceProvider.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/AbstractResourceProvider.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.core.api.resourceloader;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/ClasspathResourceProvider.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/ClasspathResourceProvider.java
similarity index 98%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/ClasspathResourceProvider.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/ClasspathResourceProvider.java
index 47aeb773f..cbf180aa3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/ClasspathResourceProvider.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/ClasspathResourceProvider.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.api.resourceloader;
import org.apache.deltaspike.core.util.ClassUtils;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/FileResourceProvider.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/FileResourceProvider.java
similarity index 97%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/FileResourceProvider.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/FileResourceProvider.java
index 72fd1f683..f6114d1d6 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/FileResourceProvider.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/FileResourceProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.resourceloader;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
index 4b40788c7..e30a6b99f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResource.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.resourceloader;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResourceProvider.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResourceProvider.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResourceProvider.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/resourceloader/InjectableResourceProvider.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/exception/control/event/IntrospectiveExceptionEvent.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/spi/event/IntrospectiveExceptionEvent.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/exception/control/event/IntrospectiveExceptionEvent.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/spi/event/IntrospectiveExceptionEvent.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/BaseImmutableBean.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BaseImmutableBean.java
similarity index 98%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/BaseImmutableBean.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BaseImmutableBean.java
index 6342c257d..3b580f1a9 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/BaseImmutableBean.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BaseImmutableBean.java
@@ -23,9 +23,9 @@ import org.apache.deltaspike.core.api.literal.DefaultLiteral;
import org.apache.deltaspike.core.util.ArraysUtils;
import org.apache.deltaspike.core.util.metadata.InjectionPointWrapper;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java
similarity index 97%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java
index f9c8b35bf..1ec72b2eb 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java
@@ -26,15 +26,15 @@ import org.apache.deltaspike.core.util.metadata.builder.ContextualLifecycle;
import org.apache.deltaspike.core.util.metadata.builder.DelegatingContextualLifecycle;
import org.apache.deltaspike.core.util.metadata.builder.DummyInjectionTarget;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.inject.Named;
import java.beans.Introspector;
import java.lang.annotation.Annotation;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBean.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBean.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBean.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBean.java
index 7663e1585..3e02d2003 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBean.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBean.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.core.util.bean;
import org.apache.deltaspike.core.util.metadata.builder.ContextualLifecycle;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBeanWrapper.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBeanWrapper.java
similarity index 97%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBeanWrapper.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBeanWrapper.java
index 09cc3b008..d0a4bf3e7 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBeanWrapper.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutableBeanWrapper.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.util.bean;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBean.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBean.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBean.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBean.java
index 43f103cd1..810f16164 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBean.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBean.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.core.util.bean;
import org.apache.deltaspike.core.util.metadata.builder.ContextualLifecycle;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBeanWrapper.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBeanWrapper.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBeanWrapper.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBeanWrapper.java
index ede029bf1..0a96fd07a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBeanWrapper.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/ImmutablePassivationCapableBeanWrapper.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.util.bean;
-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 java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/WrappingBeanBuilder.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/WrappingBeanBuilder.java
similarity index 91%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/WrappingBeanBuilder.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/WrappingBeanBuilder.java
index a189a9592..ac9da7f6a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/bean/WrappingBeanBuilder.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/WrappingBeanBuilder.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.core.util.bean;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
/**
* <p>A WrappingBeanBuilder helps creating Beans which internally
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
similarity index 95%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
index 0e939e13f..cd2d06fa2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.core.util.metadata.builder;
-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;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
import java.util.ArrayList;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
similarity index 97%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
index 206577c03..32a167f8e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedConstructorImpl.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
import java.util.Map;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
similarity index 93%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
index 94ee5ee39..09824fe6d 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedFieldImpl.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
similarity index 98%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
index e04f8d089..1679d8530 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.util.metadata.builder;
import org.apache.deltaspike.core.util.HierarchyDiscovery;
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Annotated;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
similarity index 95%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
index 495ec4143..9b4e9cc94 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.util.metadata.builder;
-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 java.lang.reflect.Member;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
similarity index 94%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
index e7bd64d87..430e616e0 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMethodImpl.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.util.metadata.builder;
-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 java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Map;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
similarity index 94%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
index 53cf86f17..2c581adc1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedParameterImpl.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedCallable;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
import java.lang.reflect.Type;
/**
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
similarity index 99%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
index 4177ea7ba..de40ac025 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
@@ -22,12 +22,12 @@ package org.apache.deltaspike.core.util.metadata.builder;
import org.apache.deltaspike.core.util.ReflectionUtils;
import org.apache.deltaspike.core.util.securitymanaged.SetAccessiblePrivilegedAction;
-import javax.enterprise.inject.spi.Annotated;
-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 jakarta.enterprise.inject.spi.Annotated;
+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 java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
similarity index 96%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
index 4f5da7e59..b98996668 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
@@ -19,10 +19,10 @@
package org.apache.deltaspike.core.util.metadata.builder;
-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 java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ContextualLifecycle.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ContextualLifecycle.java
similarity index 95%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ContextualLifecycle.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ContextualLifecycle.java
index 0c3c73686..c39766ca7 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ContextualLifecycle.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ContextualLifecycle.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
/**
* Callbacks used by {@link org.apache.deltaspike.core.util.bean.BeanBuilder}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DelegatingContextualLifecycle.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DelegatingContextualLifecycle.java
similarity index 93%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DelegatingContextualLifecycle.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DelegatingContextualLifecycle.java
index 17566f9be..28d105ba5 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DelegatingContextualLifecycle.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DelegatingContextualLifecycle.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionTarget;
/**
* An implementation of {@link ContextualLifecycle} that is backed by an
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DummyInjectionTarget.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DummyInjectionTarget.java
similarity index 89%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DummyInjectionTarget.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DummyInjectionTarget.java
index bf9f5a6d9..548ef965f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DummyInjectionTarget.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/DummyInjectionTarget.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import java.util.Set;
import static java.util.Collections.emptySet;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
similarity index 95%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
index 8258da419..dc690120e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
@@ -20,12 +20,12 @@ package org.apache.deltaspike.core.util.metadata.builder;
import org.apache.deltaspike.core.util.BeanUtils;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-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 jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+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 java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
similarity index 97%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
index 84eff1579..e3368e922 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/InjectableMethod.java
@@ -20,11 +20,11 @@ package org.apache.deltaspike.core.util.metadata.builder;
import org.apache.deltaspike.core.util.metadata.builder.ParameterValueRedefiner.ParameterValue;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
similarity index 95%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
index 7f87aaccf..6dced38e5 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
+++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ParameterValueRedefiner.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.core.util.metadata.builder;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
/**
* Provides the ability to redefine the value of a parameter on an
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java
similarity index 93%
rename from deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java
rename to deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java
index 74fed6ca8..af30e3d57 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java
+++ b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java
@@ -27,17 +27,17 @@ import org.apache.deltaspike.core.api.literal.TypedLiteral;
import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
import org.junit.Test;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Typed;
-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.util.AnnotationLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Typed;
+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.util.AnnotationLiteral;
+import jakarta.inject.Named;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
similarity index 89%
rename from deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
rename to deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
index 66ad69690..e63058a8e 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
+++ b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
@@ -19,11 +19,11 @@
package org.apache.deltaspike.test.api.metadata;
-import javax.annotation.PostConstruct;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named("cat")
public class Cat
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Small.java b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/Small.java
similarity index 97%
rename from deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Small.java
rename to deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/Small.java
index eace316af..8d7f203a0 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Small.java
+++ b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/Small.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.api.metadata;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/deltaspike/core/api/pom.xml b/deltaspike/core/api/pom.xml
index c6cdcc4e9..e8bc316f5 100644
--- a/deltaspike/core/api/pom.xml
+++ b/deltaspike/core/api/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>core-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java
index 4f1d10639..c40849aba 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java
@@ -26,7 +26,7 @@ import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Common qualifier to manage co-existence of DeltaSpike features and Java EE features.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java
index a856ad7aa..db9e1b250 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.config;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
index 50c4ce3bc..f5f088c50 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
@@ -29,7 +29,7 @@ import java.util.ServiceLoader;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import org.apache.deltaspike.core.spi.config.ConfigFilter;
import org.apache.deltaspike.core.spi.config.ConfigSource;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java
index 463463198..d9dda84a3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/ViewRef.java
@@ -24,8 +24,8 @@ import org.apache.deltaspike.core.spi.config.view.InlineMetaDataTransformer;
import org.apache.deltaspike.core.spi.config.view.TargetViewConfigProvider;
import org.apache.deltaspike.core.api.config.view.controller.ViewControllerRef;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Named;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Named;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/CallbackDescriptor.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/CallbackDescriptor.java
index 848c5aa2d..6b232dc54 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/CallbackDescriptor.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/metadata/CallbackDescriptor.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.api.config.view.metadata;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import javax.inject.Named;
+import jakarta.inject.Named;
import java.beans.Introspector;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java
index fdecffc70..3a3250285 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/view/navigation/NavigationParameter.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.core.api.config.view.navigation;
import org.apache.deltaspike.core.api.config.view.metadata.Aggregated;
import org.apache.deltaspike.core.api.config.view.metadata.ViewMetaData;
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java
index 118b5883e..b0e0e28e8 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.future;
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java
index 27b23d4f4..297a38c0f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.jmx;
-import javax.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Stereotype;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
index 35e4d48da..a4dbdd205 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
@@ -28,7 +28,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 for events which are fired when servlet objects are destroyed.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
index 7278fb629..a32529d99 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
@@ -28,7 +28,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 for events which are fired when servlet objects are created.
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageBundleLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageBundleLiteral.java
index e2a3aff2f..b72d32d3a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageBundleLiteral.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageBundleLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.literal;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import org.apache.deltaspike.core.api.message.MessageBundle;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
index ca8bf6b3e..94494ab31 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.message.MessageContextConfig;
import org.apache.deltaspike.core.api.message.MessageInterpolator;
import org.apache.deltaspike.core.api.message.MessageResolver;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link org.apache.deltaspike.core.api.message.MessageContextConfig}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ViewControllerRefLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ViewControllerRefLiteral.java
index 0c5cd822d..3ac68e5d1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ViewControllerRefLiteral.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/ViewControllerRefLiteral.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.literal;
import org.apache.deltaspike.core.api.config.view.controller.ViewControllerRef;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Literal for {@link org.apache.deltaspike.core.api.config.view.controller.ViewControllerRef}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java
index c86632736..9a5512cc1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.core.api.lock;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageBundle.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageBundle.java
index 9ab019ece..9c99e84a6 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageBundle.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageBundle.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.message;
-import javax.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Stereotype;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/InvocationMonitored.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/InvocationMonitored.java
index 48170c866..e79b40970 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/InvocationMonitored.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/InvocationMonitored.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.monitoring;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java
index 7c4db7bae..5496bc798 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.monitoring;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
index 5ee9098f1..6bef269a3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.projectstage;
import org.apache.deltaspike.core.util.ServiceUtils;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
index 5897b59f1..3cda0fe51 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
@@ -18,12 +18,12 @@
*/
package org.apache.deltaspike.core.api.provider;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.Extension;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.lang.reflect.Method;
@@ -153,17 +153,6 @@ public class BeanManagerProvider implements Extension
*/
public static BeanManagerProvider getInstance()
{
- /*X TODO Java-EE5 support needs to be discussed
- if (bmpSingleton == null)
- {
- // workaround for some Java-EE5 environments in combination with a special
- // StartupBroadcaster for bootstrapping CDI
-
- // CodiStartupBroadcaster.broadcastStartup();
- // here bmp might not be null (depends on the broadcasters)
- }
- */
-
if (bmpSingleton == null)
{
throw new IllegalStateException("No " + BeanManagerProvider.class.getName() + " in place! " +
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java
index 7e9b05b4c..97411998f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java
@@ -18,17 +18,17 @@
*/
package org.apache.deltaspike.core.api.provider;
-import org.apache.deltaspike.core.api.literal.AnyLiteral;
+import jakarta.enterprise.inject.Any;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.util.ProjectStageProducer;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
@@ -415,7 +415,7 @@ public final class BeanProvider
boolean includeDefaultScopedBeans,
BeanManager beanManager)
{
- Set<Bean<?>> beans = beanManager.getBeans(type, new AnyLiteral());
+ Set<Bean<?>> beans = beanManager.getBeans(type, Any.Literal.INSTANCE);
if (beans == null || beans.isEmpty())
{
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java
index 2c89808f7..feb0078b2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/DependentProvider.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.core.api.provider;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.inject.Provider;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.inject.Provider;
import java.io.IOException;
import java.io.NotSerializableException;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ConversationGroup.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ConversationGroup.java
index 5d5d10263..0a8e0614c 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ConversationGroup.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ConversationGroup.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.scope;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/GroupedConversationScoped.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/GroupedConversationScoped.java
index 5db97689e..2387c2e32 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/GroupedConversationScoped.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/GroupedConversationScoped.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.scope;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
import java.lang.annotation.Documented;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ViewAccessScoped.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ViewAccessScoped.java
index 627ea392f..2510c60e2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ViewAccessScoped.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/ViewAccessScoped.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.scope;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
import java.lang.annotation.Documented;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/WindowScoped.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/WindowScoped.java
index 07fda5470..14ba3aa3f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/WindowScoped.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/scope/WindowScoped.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.api.scope;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
import java.lang.annotation.Documented;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java
index 4dcc0d2ed..acdde866e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.api.throttling;
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttling.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttling.java
index fdf2cf196..1c528ce65 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttling.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttling.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.core.api.throttling;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
import java.util.concurrent.Semaphore;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/InterceptorStrategy.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/InterceptorStrategy.java
index a772152c4..894cd6226 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/InterceptorStrategy.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/InterceptorStrategy.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.spi;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
import java.io.Serializable;
/**
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java
deleted file mode 100644
index 038732773..000000000
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/alternative/AlternativeBeanClassProvider.java
+++ /dev/null
@@ -1,32 +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.deltaspike.core.spi.alternative;
-
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
-
-import java.util.Map;
-
-public interface AlternativeBeanClassProvider extends Deactivatable
-{
- /**
- * @return mapping between the interface of the bean an the alternative-bean-class
- */
- //instead of Class/Class we are using String/String to avoid classloader issues e.g. with EARs
- Map<String, String> getAlternativeMapping();
-}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
index 48517dcd0..b754e94e7 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.spi.config;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java
index ede25c476..c9024ba33 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java
@@ -19,14 +19,14 @@
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Annotated;
-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 jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Annotated;
+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 java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java
index e619649f9..ce873eaa1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.Nonbinding;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java
index 20c5e8cc5..dfbb5f4c0 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java
index bf7c0a463..a6dfee040 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java
@@ -18,19 +18,12 @@
*/
package org.apache.deltaspike.core.util;
-import org.apache.deltaspike.core.util.metadata.builder.ImmutableInjectionPoint;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Annotated;
-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.InjectionPoint;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
/**
@@ -119,28 +112,4 @@ public abstract class BeanUtils
return result;
}
-
- /**
- * Given a method, and the bean on which the method is declared, create a
- * collection of injection points representing the parameters of the method.
- *
- * @param <X> the type declaring the method
- * @param method the method
- * @param declaringBean the bean on which the method is declared
- * @param beanManager the bean manager to use to create the injection points
- * @return the injection points
- */
- public static <X> List<InjectionPoint> createInjectionPoints(AnnotatedMethod<X> method, Bean<?> declaringBean,
- BeanManager beanManager)
- {
- List<InjectionPoint> injectionPoints = new ArrayList<InjectionPoint>();
- for (AnnotatedParameter<X> parameter : method.getParameters())
- {
- InjectionPoint injectionPoint =
- new ImmutableInjectionPoint(parameter, beanManager, declaringBean, false, false);
-
- injectionPoints.add(injectionPoint);
- }
- return injectionPoints;
- }
}
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
index b6555e726..c0314ba1f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.spi.activation.ClassDeactivator;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java
index 9347900c7..a9b553da9 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.util;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java
index c1f3e31a5..f8d329542 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util;
import java.util.Collection;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
/**
* A collection of utilities for working with Collections
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java
index 222db5149..165acb1cd 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.core.util;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
/**
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java
index 1d0ce9636..b1f70c68e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.Constructor;
@Typed()
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
index df9bbcb79..6e19fd00d 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java
index 2346cc5a9..abbc679b2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java
@@ -22,7 +22,7 @@ package org.apache.deltaspike.core.util;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
@Typed()
public abstract class ParameterUtil
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java
index 99f7ea00e..e3a0e761c 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Arrays;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
index 8f892f0cb..8b3fbe803 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParentExtensionStorage.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
import java.lang.ref.WeakReference;
import java.util.HashSet;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index 33f3dcabc..4cd4ff566 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.core.util;
import org.apache.deltaspike.core.api.config.ConfigResolver;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
import java.io.Serializable;
import java.util.logging.Logger;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
index f38029bed..5f36fdd99 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java
index 7eb509ea4..3d5efba17 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.List;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
index bfbe87361..651d2b7fe 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.util.Nonbinding;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
index c6b795297..ae6f20f39 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.util;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java
index 61ebe12e7..f6e27b1e3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.util;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
@Typed()
public abstract class StringUtils
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java
index dcd9fa9f3..8039ff0e9 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java
@@ -19,12 +19,12 @@
package org.apache.deltaspike.core.util.context;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualInstanceInfo.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualInstanceInfo.java
index 3e265228b..ccb8487ce 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualInstanceInfo.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualInstanceInfo.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util.context;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.CreationalContext;
import java.io.Serializable;
/**
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
index c511bfcb6..a74260a69 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
@@ -20,10 +20,10 @@
package org.apache.deltaspike.core.util.context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java
index 3bb0a9bc9..78aad17d9 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.util.interceptor;
-import javax.enterprise.inject.Typed;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.interceptor.InvocationContext;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.HashMap;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java
index 1159ec6b5..305e1fced 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.core.util.metadata;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java
index 1f96a07f7..596b0dafb 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.util.securitymanaged;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.AccessibleObject;
import java.security.PrivilegedAction;
diff --git a/deltaspike/core/api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/deltaspike/core/api/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from deltaspike/core/api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to deltaspike/core/api/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
index 7a9957ccf..10ff7ee8d 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
+++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
@@ -19,12 +19,12 @@
package org.apache.deltaspike.test.api.util.metadata;
-import org.apache.deltaspike.core.api.literal.NamedLiteral;
+import jakarta.enterprise.inject.literal.NamedLiteral;
import org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
import org.junit.Test;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.util.Collections;
import java.util.HashMap;
@@ -138,7 +138,7 @@ public class AnnotationInstanceProviderTest
@Test
public void assertBasicToString()
{
- assertThat(AnnotationInstanceProvider.of(RequestScoped.class).toString(), is("@javax.enterprise.context.RequestScoped()"));
+ assertThat(AnnotationInstanceProvider.of(RequestScoped.class).toString(), is("@jakarta.enterprise.context.RequestScoped()"));
}
@Test
@@ -273,7 +273,7 @@ public class AnnotationInstanceProviderTest
memberValue.put("value", "test");
Named named1 = AnnotationInstanceProvider.of(Named.class, memberValue);
- Named named2 = new NamedLiteral("test");
+ Named named2 = NamedLiteral.of("test");
assertTrue(named2.equals(named1));
assertTrue(named1.equals(named2));
@@ -286,7 +286,7 @@ public class AnnotationInstanceProviderTest
memberValue.put("value", "test1");
Named named1 = AnnotationInstanceProvider.of(Named.class, memberValue);
- Named named2 = new NamedLiteral("test");
+ Named named2 = NamedLiteral.of("test");
assertFalse(named1.equals(named2));
}
@@ -301,7 +301,7 @@ public class AnnotationInstanceProviderTest
public void assertHashCodeSameAsLiteral()
{
Named a1 = AnnotationInstanceProvider.of(Named.class);
- Named a2 = new NamedLiteral();
+ Named a2 = NamedLiteral.INSTANCE;
assertThat(a2.hashCode(), is(a1.hashCode()));
}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java
similarity index 98%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java
index 0ddf7d2f4..914d4d6c9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandlingFlow;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionStackEvent;
import org.apache.deltaspike.core.spi.exception.control.event.IntrospectiveExceptionEvent;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
/**
* Payload for an exception to be handled. This object is not immutable as small pieces of the state may be set by the
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerBroadcaster.java
similarity index 97%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerBroadcaster.java
index 0bb21a25e..e5a8a713e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerBroadcaster.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerBroadcaster.java
@@ -27,11 +27,11 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.deltaspike.core.api.exception.control.HandlerMethod;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionStackEvent;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java
similarity index 99%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java
index 071e08d3d..48bbf0201 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.exception.control.HandlerMethod;
import org.apache.deltaspike.core.api.literal.AnyLiteral;
import org.apache.deltaspike.core.util.HierarchyDiscovery;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java
similarity index 96%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java
index 4f772e3c2..a96abcdf6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java
@@ -29,13 +29,13 @@ import org.apache.deltaspike.core.util.BeanUtils;
import org.apache.deltaspike.core.util.metadata.builder.ImmutableInjectionPoint;
import org.apache.deltaspike.core.util.metadata.builder.InjectableMethod;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-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.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+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.InjectionPoint;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorage.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorage.java
similarity index 97%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorage.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorage.java
index 341c34576..419f43cde 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorage.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorage.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.impl.exception.control;
import org.apache.deltaspike.core.api.exception.control.HandlerMethod;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collection;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java
similarity index 98%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java
index 6abdbef1a..59aafd293 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java
@@ -23,8 +23,8 @@ import org.apache.deltaspike.core.api.exception.control.HandlerMethod;
import org.apache.deltaspike.core.api.literal.AnyLiteral;
import org.apache.deltaspike.core.util.HierarchyDiscovery;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collection;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageProducer.java
similarity index 91%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageProducer.java
index 2f5743549..f322465c0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageProducer.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.core.impl.exception.control;
import org.apache.deltaspike.core.impl.exception.control.extension.ExceptionControlExtension;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
@ApplicationScoped
public class HandlerMethodStorageProducer
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/OutboundParameterValueRedefiner.java
similarity index 96%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/OutboundParameterValueRedefiner.java
index 044169e17..5edb779de 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/OutboundParameterValueRedefiner.java
@@ -23,8 +23,8 @@ import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
import org.apache.deltaspike.core.util.metadata.builder.ParameterValueRedefiner;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
/**
* Redefiner allowing to inject a non contextual instance of {@link DefaultExceptionEvent} into the first parameter.
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/extension/ExceptionControlExtension.java
similarity index 91%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/extension/ExceptionControlExtension.java
index b60d04195..fb1a4fd6a 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/extension/ExceptionControlExtension.java
@@ -25,18 +25,18 @@ import org.apache.deltaspike.core.impl.exception.control.HandlerMethodImpl;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.ProcessBean;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.Collection;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/InjectableResourceProducer.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/InjectableResourceProducer.java
similarity index 93%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/InjectableResourceProducer.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/InjectableResourceProducer.java
index 1e61376b8..02af23420 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/InjectableResourceProducer.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/InjectableResourceProducer.java
@@ -22,13 +22,13 @@ import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.api.resourceloader.InjectableResource;
import org.apache.deltaspike.core.api.resourceloader.InjectableResourceProvider;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
similarity index 90%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
index 66ab8ce6f..950e946c4 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
+++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.core.impl.resourceloader;
import org.apache.deltaspike.core.api.resourceloader.ClasspathResourceProvider;
import org.apache.deltaspike.core.api.resourceloader.FileResourceProvider;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
/**
* This is needed for certain class loading cases (EARs, external modules).
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/BeanBuilderTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/BeanBuilderTest.java
similarity index 93%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/BeanBuilderTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/BeanBuilderTest.java
index ebb607063..81923adea 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/BeanBuilderTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/BeanBuilderTest.java
@@ -32,12 +32,12 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
import java.util.HashSet;
import java.util.Set;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/SimpleClass.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/SimpleClass.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/SimpleClass.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/SimpleClass.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/WithInjectionPoint.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/WithInjectionPoint.java
similarity index 89%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/WithInjectionPoint.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/WithInjectionPoint.java
index e06f5a1ee..590f82211 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/bean/WithInjectionPoint.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/api/util/bean/WithInjectionPoint.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.test.core.api.util.bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
*
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventQualifier.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventQualifier.java
similarity index 96%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventQualifier.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventQualifier.java
index d30293e15..ea435e509 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventQualifier.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventQualifier.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.core.impl.exception.control.event;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
public @interface EventQualifier
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
index d4245fb66..56c394441 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
@@ -36,8 +36,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/literal/EventQualifierLiteral.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/literal/EventQualifierLiteral.java
similarity index 95%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/literal/EventQualifierLiteral.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/literal/EventQualifierLiteral.java
index 7963c27d5..d3bf42b3a 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/literal/EventQualifierLiteral.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/literal/EventQualifierLiteral.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.exception.control.event.literal;
import org.apache.deltaspike.test.core.impl.exception.control.event.EventQualifier;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
public class EventQualifierLiteral extends AnnotationLiteral<EventQualifier> implements EventQualifier
{
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Account.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Account.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Account.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Account.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Arquillian.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Arquillian.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Arquillian.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Arquillian.java
index 4ca96f4d0..88d0e8250 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Arquillian.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/Arquillian.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.core.impl.exception.control.extension;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/CatchQualifier.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/CatchQualifier.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/CatchQualifier.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/CatchQualifier.java
index 167027730..1151a2543 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/CatchQualifier.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/CatchQualifier.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.test.core.impl.exception.control.extension;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/literal/CatchQualifierLiteral.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/literal/CatchQualifierLiteral.java
similarity index 95%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/literal/CatchQualifierLiteral.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/literal/CatchQualifierLiteral.java
index 490116cad..01a87e5a1 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/literal/CatchQualifierLiteral.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/extension/literal/CatchQualifierLiteral.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.exception.control.extension.literal
import org.apache.deltaspike.test.core.impl.exception.control.extension.CatchQualifier;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
*
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingBreadthFirstHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingBreadthFirstHandler.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingBreadthFirstHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingBreadthFirstHandler.java
index 79d455b6f..630228095 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingBreadthFirstHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingBreadthFirstHandler.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
import org.apache.deltaspike.core.api.exception.control.Handles;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod"})
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingDepthHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingDepthHandler.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingDepthHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingDepthHandler.java
index 3883dade5..eb038f039 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingDepthHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/AbortingDepthHandler.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
import org.apache.deltaspike.core.api.exception.control.Handles;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod"})
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
similarity index 96%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
index fe942aaae..bc494f0eb 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
similarity index 96%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
index 7151c9505..af94843ac 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ExceptionHandledHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ExceptionHandledHandler.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ExceptionHandledHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ExceptionHandledHandler.java
index bd708429b..32c50cd5b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ExceptionHandledHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ExceptionHandledHandler.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
import org.apache.deltaspike.core.api.exception.control.Handles;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
@ExceptionHandler
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
index 81d68b166..f6a8eeafa 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandler.java
similarity index 98%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandler.java
index 5784940de..9c5a1432a 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandler.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
import org.apache.deltaspike.core.api.exception.control.Handles;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
@ExceptionHandler
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
similarity index 96%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
index 1b120a6fb..0af1a0c59 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static junit.framework.Assert.assertEquals;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowHandler.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowHandler.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowTest.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowTest.java
index 076950568..d7a61351b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/RethrowTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertFalse;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewExceptionTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewExceptionTest.java
similarity index 96%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewExceptionTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewExceptionTest.java
index e3ad7f0a7..1d66860e3 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewExceptionTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewExceptionTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
public class ThrowingNewExceptionTest
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewHandler.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ThrowingNewHandler.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/BadInjectionPointHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/BadInjectionPointHandler.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/BadInjectionPointHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/BadInjectionPointHandler.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CalledExceptionHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CalledExceptionHandler.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CalledExceptionHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CalledExceptionHandler.java
index d1f2e25dc..1663892a0 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CalledExceptionHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CalledExceptionHandler.java
@@ -24,8 +24,8 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
import org.apache.deltaspike.core.api.exception.control.Handles;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.sql.SQLException;
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
index 2f7ea2ca9..1c170f762 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import java.sql.SQLException;
import static org.junit.Assert.assertEquals;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/ExtensionExceptionHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/ExtensionExceptionHandler.java
similarity index 98%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/ExtensionExceptionHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/ExtensionExceptionHandler.java
index 8d6edb870..28c659f8e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/ExtensionExceptionHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/ExtensionExceptionHandler.java
@@ -27,7 +27,7 @@ import org.apache.deltaspike.test.core.impl.exception.control.extension.Account;
import org.apache.deltaspike.test.core.impl.exception.control.extension.Arquillian;
import org.apache.deltaspike.test.core.impl.exception.control.extension.CatchQualifier;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.sql.SQLException;
@ExceptionHandler
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerComparatorTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerComparatorTest.java
similarity index 98%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerComparatorTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerComparatorTest.java
index 4f4074930..e500af07e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerComparatorTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerComparatorTest.java
@@ -35,8 +35,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerWhichThrowsExceptions.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerWhichThrowsExceptions.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerWhichThrowsExceptions.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/HandlerWhichThrowsExceptions.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandler.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandler.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandler.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandler.java
index b17940a0c..123bae599 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandler.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandler.java
@@ -24,7 +24,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandler;
import org.apache.deltaspike.core.api.exception.control.Handles;
import org.apache.deltaspike.core.api.exception.control.event.ExceptionEvent;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
@ExceptionHandler
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
similarity index 96%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
index 0f1045fd0..7cfd8e7b8 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static junit.framework.Assert.assertEquals;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/ExceptionHandlerMethods.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/ExceptionHandlerMethods.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/ExceptionHandlerMethods.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/ExceptionHandlerMethods.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/Exceptions.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/Exceptions.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/Exceptions.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/Exceptions.java
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/TraversalPathTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/TraversalPathTest.java
similarity index 97%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/TraversalPathTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/TraversalPathTest.java
index 8fda07ca8..599b2afba 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/TraversalPathTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/traversal/TraversalPathTest.java
@@ -30,8 +30,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertArrayEquals;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
similarity index 99%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
index 384e60797..3800c906b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathResourceTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
similarity index 99%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
index bb7968f85..c528c8abb 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
+++ b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java b/deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
similarity index 100%
rename from deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
rename to deltaspike/core/impl/obsolete/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/FileResourceTest.java
diff --git a/deltaspike/core/impl/pom.xml b/deltaspike/core/impl/pom.xml
index 4acad99f0..0e53409ce 100644
--- a/deltaspike/core/impl/pom.xml
+++ b/deltaspike/core/impl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>core-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -63,12 +63,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
-
+
<!-- Allows to create beans.xml files with certain content -->
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
index 3b7fcad2c..adbb585e8 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
@@ -18,22 +18,24 @@
*/
package org.apache.deltaspike.core.impl.config;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
import javax.management.InstanceAlreadyExistsException;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanServer;
@@ -41,6 +43,7 @@ import javax.management.ObjectName;
import java.lang.annotation.Annotation;
import java.lang.management.ManagementFactory;
+import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashSet;
@@ -58,8 +61,6 @@ import org.apache.deltaspike.core.api.config.Filter;
import org.apache.deltaspike.core.api.config.PropertyFileConfig;
import org.apache.deltaspike.core.api.config.Source;
import org.apache.deltaspike.core.api.exclude.Exclude;
-import org.apache.deltaspike.core.api.literal.AnyLiteral;
-import org.apache.deltaspike.core.api.literal.DefaultLiteral;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.spi.config.BaseConfigPropertyProducer;
@@ -69,7 +70,6 @@ import org.apache.deltaspike.core.spi.config.ConfigValidator;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.ServiceUtils;
-import org.apache.deltaspike.core.util.bean.BeanBuilder;
/**
* This extension handles {@link org.apache.deltaspike.core.api.config.PropertyFileConfig}s
@@ -251,15 +251,28 @@ public class ConfigurationExtension implements Extension, Deactivatable
}
for (final Class<?> proxyType : dynamicConfigurationBeanClasses)
{
- afterBeanDiscovery.addBean(new BeanBuilder(null)
- .types(proxyType, Object.class)
- .qualifiers(new DefaultLiteral(), new AnyLiteral())
- .beanLifecycle(new ProxyConfigurationLifecycle(proxyType))
- .scope(ApplicationScoped.class)
- .passivationCapable(true)
- .id("DeltaSpikeConfiguration#" + proxyType.getName())
- .beanClass(proxyType)
- .create());
+ afterBeanDiscovery.addBean()
+ .types(proxyType, Object.class)
+ .qualifiers(Default.Literal.INSTANCE, Any.Literal.INSTANCE)
+ .scope(ApplicationScoped.class)
+ .id("DeltaSpikeConfiguration#" + proxyType.getName())
+ .createWith(cc -> {
+ // TODO: support partialbean binding? can make sense for virtual properties +
+ // would integrate with jcache
+ // we'd need to add @PartialBeanBinding on a bean created from ConfigurationHandler
+ // detection can just be a loadClass of this API
+ // for now: waiting for user request for it
+ final Class<?>[] api = new Class<?>[]{proxyType};
+ final Configuration configuration = api[0].getAnnotation(Configuration.class);
+ final long cacheFor = configuration.cacheFor();
+ return Proxy.newProxyInstance(
+ Thread.currentThread().getContextClassLoader(), api,
+ new ProxyConfigurationLifecycle.ConfigurationHandler(
+ cacheFor <= 0 ? -1 : configuration.cacheUnit().toMillis(cacheFor), configuration.prefix())
+ );
+
+ })
+ .beanClass(proxyType);
}
}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
index 7e7efeb50..a7bc317c3 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.core.impl.config;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.deltaspike.core.spi.config.BaseConfigPropertyProducer;
import org.apache.deltaspike.core.api.config.ConfigProperty;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
index df7aea251..aedb6407c 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.impl.config;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import org.apache.deltaspike.core.impl.util.JndiUtils;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java
index 4387a11d5..61be57116 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java
@@ -20,17 +20,12 @@ package org.apache.deltaspike.core.impl.config;
import org.apache.deltaspike.core.api.config.ConfigProperty;
import org.apache.deltaspike.core.api.config.ConfigResolver;
-import org.apache.deltaspike.core.api.config.Configuration;
import org.apache.deltaspike.core.spi.config.BaseConfigPropertyProducer;
-import org.apache.deltaspike.core.util.metadata.builder.ContextualLifecycle;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.List;
@@ -40,38 +35,10 @@ import java.util.concurrent.ConcurrentMap;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-class ProxyConfigurationLifecycle implements ContextualLifecycle
+class ProxyConfigurationLifecycle
{
- private Class<?>[] api;
- ProxyConfigurationLifecycle(final Class<?> proxyType)
- {
- this.api = new Class<?>[]{proxyType};
- }
-
- @Override
- public Object create(final Bean bean, final CreationalContext creationalContext)
- {
- // TODO: support partialbean binding? can make sense for virtual properties + would integrate with jcache
- // we'd need to add @PartialBeanBinding on a bean created from ConfigurationHandler
- // detection can just be a loadClass of this API
- // for now: waiting for user request for it
-
- final Configuration configuration = api[0].getAnnotation(Configuration.class);
- final long cacheFor = configuration.cacheFor();
- return Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(), api,
- new ConfigurationHandler(
- cacheFor <= 0 ? -1 : configuration.cacheUnit().toMillis(cacheFor), configuration.prefix()));
- }
-
- @Override
- public void destroy(final Bean bean, final Object instance, final CreationalContext creationalContext)
- {
- // no-op
- }
-
- private static final class ConfigurationHandler implements InvocationHandler
+ static final class ConfigurationHandler implements InvocationHandler
{
private final BaseConfigPropertyProducer delegate = new BaseConfigPropertyProducer()
{
@@ -82,7 +49,7 @@ class ProxyConfigurationLifecycle implements ContextualLifecycle
private final long cacheMs;
private final String prefix;
- private ConfigurationHandler(final long cacheMs, final String prefix)
+ ConfigurationHandler(final long cacheMs, final String prefix)
{
this.cacheMs = cacheMs;
this.prefix = prefix;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/CdiCipherService.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/CdiCipherService.java
index 381fe5d53..10128c3a6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/CdiCipherService.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/CdiCipherService.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.core.impl.crypto;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.IOException;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/GlobalAlternative.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/GlobalAlternative.java
deleted file mode 100644
index 2ea824409..000000000
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/GlobalAlternative.java
+++ /dev/null
@@ -1,28 +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.deltaspike.core.impl.exclude;
-
-import org.apache.deltaspike.core.spi.activation.Deactivatable;
-
-/**
- * Allows to deactivate only the global alternative feature (needed if we keep it in the exclude extension)
- */
-public interface GlobalAlternative extends Deactivatable
-{
-}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 183d1d932..1ecca99c5 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -19,42 +19,25 @@
package org.apache.deltaspike.core.impl.exclude.extension;
import org.apache.deltaspike.core.api.config.ConfigResolver;
-import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
import org.apache.deltaspike.core.api.exclude.Exclude;
import org.apache.deltaspike.core.spi.filter.ClassFilter;
import org.apache.deltaspike.core.api.interpreter.ExpressionInterpreter;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.impl.exclude.CustomProjectStageBeanFilter;
-import org.apache.deltaspike.core.impl.exclude.GlobalAlternative;
import org.apache.deltaspike.core.impl.interpreter.PropertyExpressionInterpreter;
-import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
-import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.core.util.ServiceUtils;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.util.Nonbinding;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
+
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
import java.lang.reflect.Modifier;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import java.util.logging.Level;
@@ -71,17 +54,8 @@ public class ExcludeExtension implements Extension, Deactivatable
private static final Logger LOG = Logger.getLogger(ExcludeExtension.class.getName());
private boolean isActivated = true;
- private boolean isGlobalAlternativeActivated = true;
private boolean isCustomProjectStageBeanFilterActivated = true;
- /**
- * Contains the globalAlternatives which should get used
- * KEY=Interface class name
- * VALUE=Implementation class name
- */
- private Map<String, String> globalAlternatives = new HashMap<String, String>();
- private Annotation priorityAnnotationInstance;
-
//overruling the filter is supported via config-ordinal - for now only one is supported to keep it simple
//a custom filter can always delegate to multiple filters
//(e.g. in combination with ServiceUtils or querying all config-sources explicitly)
@@ -96,24 +70,6 @@ public class ExcludeExtension implements Extension, Deactivatable
isCustomProjectStageBeanFilterActivated =
ClassDeactivationUtils.isActivated(CustomProjectStageBeanFilter.class);
- isGlobalAlternativeActivated =
- ClassDeactivationUtils.isActivated(GlobalAlternative.class);
- if (isGlobalAlternativeActivated)
- {
- loadGlobalAlternativeConfigs();
-
- if (globalAlternatives.isEmpty())
- {
- isGlobalAlternativeActivated = false;
- }
-
- if (isGlobalAlternativeActivated)
- {
- int priorityValue = CoreBaseConfig.InterceptorCustomization.PRIORITY;
- priorityAnnotationInstance = AnnotationInstanceUtils.getPriorityAnnotationInstance(priorityValue);
- }
- }
-
boolean isClassFilterActivated = ClassDeactivationUtils.isActivated(ClassFilter.class);
if (isClassFilterActivated)
@@ -129,28 +85,6 @@ public class ExcludeExtension implements Extension, Deactivatable
}
}
- private void loadGlobalAlternativeConfigs()
- {
- List<AlternativeBeanClassProvider> alternativeBeanClassProviders =
- new ArrayList<AlternativeBeanClassProvider>();
-
- //add the default implementation first (if enabled), to give custom implementations a higher priority
- //(they can replace mappings defined by the default implementation)
- if (ClassDeactivationUtils.isActivated(LabelAwareGlobalAlternativeBeanClassProvider.class))
- {
- alternativeBeanClassProviders.add(new LabelAwareGlobalAlternativeBeanClassProvider());
- }
-
- alternativeBeanClassProviders.addAll(
- ServiceUtils.loadServiceImplementations(AlternativeBeanClassProvider.class));
-
- for (AlternativeBeanClassProvider currentProvider : alternativeBeanClassProviders)
- {
- Map<String, String> alternativeBeanMappings = currentProvider.getAlternativeMapping();
- globalAlternatives.putAll(alternativeBeanMappings);
- }
- }
-
/**
* triggers initialization in any case
* @param afterDeploymentValidation observed event
@@ -169,11 +103,6 @@ public class ExcludeExtension implements Extension, Deactivatable
protected void vetoBeans(@Observes ProcessAnnotatedType processAnnotatedType, BeanManager beanManager)
{
//we need to do it before the exclude logic to keep the @Exclude support for global alternatives
- if (isGlobalAlternativeActivated)
- {
- activateGlobalAlternatives(processAnnotatedType, beanManager);
- }
-
if (isCustomProjectStageBeanFilterActivated)
{
vetoCustomProjectStageBeans(processAnnotatedType);
@@ -266,201 +195,6 @@ public class ExcludeExtension implements Extension, Deactivatable
}
-
- private void activateGlobalAlternatives(ProcessAnnotatedType processAnnotatedType,
- BeanManager beanManager)
- {
- Class<Object> currentBean = processAnnotatedType.getAnnotatedType().getJavaClass();
-
- if (currentBean.isInterface())
- {
- return;
- }
-
- Set<Class> beanBaseTypes = resolveBeanTypes(currentBean);
-
- boolean isAlternativeBeanImplementation = currentBean.isAnnotationPresent(Alternative.class);
-
- List<Annotation> qualifiersOfCurrentBean =
- resolveQualifiers(processAnnotatedType.getAnnotatedType().getAnnotations(), beanManager);
-
- String configuredBeanName;
- List<Annotation> qualifiersOfConfiguredBean;
- Class<Object> alternativeBeanClass;
- Set<Annotation> alternativeBeanAnnotations;
-
- for (Class currentType : beanBaseTypes)
- {
- alternativeBeanAnnotations = new HashSet<Annotation>();
-
- configuredBeanName = globalAlternatives.get(currentType.getName());
- if (configuredBeanName != null && configuredBeanName.length() > 0)
- {
- alternativeBeanClass = ClassUtils.tryToLoadClassForName(configuredBeanName);
-
- if (alternativeBeanClass == null)
- {
- throw new IllegalStateException("Can't find class " + configuredBeanName + " which is configured" +
- " for " + currentType.getName());
- }
-
- //check that the configured class is an alternative
- if (!alternativeBeanClass.isAnnotationPresent(Alternative.class))
- {
- //we have to continue because other classes can be configured as well
- continue;
- }
-
- alternativeBeanAnnotations.addAll(Arrays.asList(alternativeBeanClass.getAnnotations()));
- qualifiersOfConfiguredBean = resolveQualifiers(alternativeBeanAnnotations, beanManager);
- }
- else
- {
- continue;
- }
-
- if (!doQualifiersMatch(qualifiersOfCurrentBean, qualifiersOfConfiguredBean))
- {
- continue;
- }
-
- //current bean is annotated with @Alternative and of the same type as the configured bean
- if (isAlternativeBeanImplementation && alternativeBeanClass.equals(currentBean))
- {
- LOG.info(processAnnotatedType.getAnnotatedType().getJavaClass().getName() +
- " is configured as global-alternative");
-
- //cdi 1.0
- if (priorityAnnotationInstance == null)
- {
- AnnotatedTypeBuilder<Object> annotatedTypeBuilder
- = new AnnotatedTypeBuilder<Object>().readFromType(processAnnotatedType.getAnnotatedType());
-
- annotatedTypeBuilder.removeFromClass(Alternative.class);
- processAnnotatedType.setAnnotatedType(annotatedTypeBuilder.create());
- return;
- }
- //cdi 1.1+
- else
- {
- AnnotatedTypeBuilder<Object> annotatedTypeBuilder
- = new AnnotatedTypeBuilder<Object>().readFromType(processAnnotatedType.getAnnotatedType());
-
- annotatedTypeBuilder.addToClass(priorityAnnotationInstance);
- processAnnotatedType.setAnnotatedType(annotatedTypeBuilder.create());
- return;
- }
- }
- else //current bean is the original implementation
- {
- //cdi 1.0 (no change needed with cdi 1.1+)
- if (priorityAnnotationInstance == null)
- {
- //veto this original implementation because the alternative will be added
- processAnnotatedType.veto();
- return;
- }
- }
- }
- }
-
- private boolean doQualifiersMatch(List<Annotation> qualifiersOfCurrentBean,
- List<Annotation> qualifiersOfConfiguredBean)
- {
- if (qualifiersOfCurrentBean.size() != qualifiersOfConfiguredBean.size())
- {
- return false;
- }
-
- int matchingQualifiers = 0;
- for (Annotation currentQualifier : qualifiersOfCurrentBean)
- {
- for (Annotation qualifierConfiguredBean : qualifiersOfConfiguredBean)
- {
- if (doesQualifierMatch(currentQualifier, qualifierConfiguredBean))
- {
- matchingQualifiers++;
- break;
- }
- }
- }
- return qualifiersOfConfiguredBean.size() == matchingQualifiers;
- }
-
- private boolean doesQualifierMatch(Annotation currentQualifier, Annotation qualifierConfiguredBean)
- {
- if (!currentQualifier.annotationType().equals(qualifierConfiguredBean.annotationType()))
- {
- return false;
- }
-
- Object currentValue;
- Object valueOfQualifierConfiguredBean;
- for (Method currentMethod : currentQualifier.annotationType().getDeclaredMethods())
- {
- if (currentMethod.isAnnotationPresent(Nonbinding.class))
- {
- continue;
- }
-
- try
- {
- currentMethod.setAccessible(true);
- currentValue = currentMethod.invoke(currentQualifier);
- valueOfQualifierConfiguredBean = currentMethod.invoke(qualifierConfiguredBean);
-
- if (!currentValue.equals(valueOfQualifierConfiguredBean))
- {
- return false;
- }
- }
- catch (Exception e)
- {
- throw new IllegalStateException("Can't compare " + currentQualifier.annotationType().getName() +
- " with " + qualifierConfiguredBean.annotationType().getName(), e);
- }
- }
- return true;
- }
-
- private List<Annotation> resolveQualifiers(Set<Annotation> annotations, BeanManager beanManager)
- {
- List<Annotation> result = new ArrayList<Annotation>();
-
- for (Annotation annotation : annotations)
- {
- if (beanManager.isQualifier(annotation.annotationType()))
- {
- result.add(annotation);
- }
- }
- return result;
- }
-
- private Set<Class> resolveBeanTypes(Class beanClass)
- {
- Set<Class> result = new HashSet<Class>();
-
- Class<?> currentClass = beanClass;
- while (currentClass != null && !Object.class.getName().equals(currentClass.getName()))
- {
- result.add(currentClass);
-
- for (Class interfaceClass : currentClass.getInterfaces())
- {
- if (interfaceClass.getName().startsWith("java.") || interfaceClass.getName().startsWith("javax."))
- {
- continue;
- }
- result.addAll(resolveBeanTypes(interfaceClass));
- }
-
- currentClass = currentClass.getSuperclass();
- }
-
- return result;
- }
-
private boolean evalExcludeWithoutCondition(ProcessAnnotatedType processAnnotatedType, Exclude exclude)
{
if (exclude.ifProjectStage().length == 0 && exclude.exceptIfProjectStage().length == 0 &&
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
deleted file mode 100644
index 9d7d296b6..000000000
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/LabelAwareGlobalAlternativeBeanClassProvider.java
+++ /dev/null
@@ -1,82 +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.deltaspike.core.impl.exclude.extension;
-
-import org.apache.deltaspike.core.api.config.ConfigResolver;
-import org.apache.deltaspike.core.spi.alternative.AlternativeBeanClassProvider;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class LabelAwareGlobalAlternativeBeanClassProvider implements AlternativeBeanClassProvider
-{
- private static final String GLOBAL_ALTERNATIVES = "globalAlternatives.";
- private static final String LABELED_ALTERNATIVES = "labeledAlternatives";
- private static final String ACTIVE_ALTERNATIVE_LABEL_KEY = "activeAlternativeLabel";
-
- private static final Logger LOG = Logger.getLogger(LabelAwareGlobalAlternativeBeanClassProvider.class.getName());
-
- @Override
- public Map<String, String> getAlternativeMapping()
- {
- Map<String, String> result = new HashMap<String, String>();
-
- String alternativeLabel = ConfigResolver.getPropertyValue(ACTIVE_ALTERNATIVE_LABEL_KEY);
-
- String activeQualifierLabel = null;
- if (alternativeLabel != null)
- {
- activeQualifierLabel = LABELED_ALTERNATIVES + "[" + alternativeLabel + "].";
- }
-
- Map<String, String> allProperties = ConfigResolver.getAllProperties();
- for (Map.Entry<String, String> property : allProperties.entrySet())
- {
- if (activeQualifierLabel != null && property.getKey().startsWith(activeQualifierLabel))
- {
- String interfaceName = property.getKey().substring(activeQualifierLabel.length());
- String implementation = property.getValue();
- if (LOG.isLoggable(Level.FINE))
- {
- LOG.fine("Enabling labeled alternative for interface " + interfaceName + ": " + implementation);
- }
-
- result.put(interfaceName, implementation);
- }
- else if (property.getKey().startsWith(GLOBAL_ALTERNATIVES))
- {
- String interfaceName = property.getKey().substring(GLOBAL_ALTERNATIVES.length());
- String implementation = property.getValue();
- if (LOG.isLoggable(Level.FINE))
- {
- LOG.fine("Enabling global alternative for interface " + interfaceName + ": " + implementation);
- }
-
- if (!result.containsKey(interfaceName)) //don't override labeled alternatives
- {
- result.put(interfaceName, implementation);
- }
- }
- }
-
- return result;
- }
-}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
index 3b652a1f9..53897f8a0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java
@@ -23,12 +23,12 @@ import org.apache.deltaspike.core.impl.util.AnnotatedMethods;
import org.apache.deltaspike.core.spi.future.FutureableStrategy;
import org.apache.deltaspike.core.util.ExceptionUtils;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java
index ff39fb785..36dd3bac9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.core.impl.future;
import org.apache.deltaspike.core.api.future.Futureable;
import org.apache.deltaspike.core.spi.future.FutureableStrategy;
-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 java.io.Serializable;
@Interceptor
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
index 104133199..b5ccbac35 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java
@@ -21,12 +21,12 @@ package org.apache.deltaspike.core.impl.future;
import org.apache.deltaspike.core.api.config.ConfigResolver;
import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.util.ArrayList;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
index 9aab45949..f1796f3e9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
@@ -23,12 +23,12 @@ import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.interceptor.Interceptor;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.interceptor.Interceptor;
import java.lang.annotation.Annotation;
import java.util.logging.Logger;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorWrapper.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorWrapper.java
index 17c59c93f..c1adc4a6e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorWrapper.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorWrapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.impl.interceptor;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedType;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.HashMap;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/interdyn/InterDynExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/interdyn/InterDynExtension.java
index 80789bd2d..7c08c97d9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/interdyn/InterDynExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/interdyn/InterDynExtension.java
@@ -25,15 +25,14 @@ import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.interceptor.InterceptorBinding;
+
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.HashMap;
@@ -119,7 +118,6 @@ public class InterDynExtension implements Deactivatable, Extension
{
AnnotatedType at = pat.getAnnotatedType();
String beanClassName = at.getJavaClass().getName();
- AnnotatedTypeBuilder atb = null;
for (AnnotationRule rule : interceptorRules)
{
if (beanClassName.matches(rule.getRule()))
@@ -131,20 +129,12 @@ public class InterDynExtension implements Deactivatable, Extension
return;
}
- if (atb == null)
- {
- atb = new AnnotatedTypeBuilder();
- atb.readFromType(at);
- }
- atb.addToClass(rule.getAdditionalAnnotation());
+ pat.configureAnnotatedType()
+ .add(rule.getAdditionalAnnotation());
logger.info("Adding Dynamic Interceptor " + rule.getAdditionalAnnotation()
+ " to class " + beanClassName );
}
}
- if (atb != null)
- {
- pat.setAnnotatedType(atb.create());
- }
}
}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/BroadcasterProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/BroadcasterProducer.java
index 69c355690..ab099d08e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/BroadcasterProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/BroadcasterProducer.java
@@ -21,11 +21,11 @@ package org.apache.deltaspike.core.impl.jmx;
import org.apache.deltaspike.core.api.jmx.JmxBroadcaster;
import org.apache.deltaspike.core.api.jmx.MBean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
@ApplicationScoped
public class BroadcasterProducer
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java
index ccd287c06..cab993912 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java
@@ -29,9 +29,9 @@ import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.util.ParameterUtil;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import javax.management.Attribute;
import javax.management.AttributeList;
import javax.management.AttributeNotFoundException;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/JmxBroadcasterLifecycle.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/JmxBroadcasterLifecycle.java
deleted file mode 100644
index 85a79835d..000000000
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/JmxBroadcasterLifecycle.java
+++ /dev/null
@@ -1,49 +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.deltaspike.core.impl.jmx;
-
-import org.apache.deltaspike.core.api.jmx.JmxBroadcaster;
-import org.apache.deltaspike.core.util.metadata.builder.ContextualLifecycle;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-public class JmxBroadcasterLifecycle implements ContextualLifecycle<JmxBroadcaster>
-{
- private final DynamicMBeanWrapper delegate;
-
- public JmxBroadcasterLifecycle(final DynamicMBeanWrapper mbean)
- {
- delegate = mbean;
- }
-
- @Override
- public JmxBroadcaster create(final Bean<JmxBroadcaster> bean,
- final CreationalContext<JmxBroadcaster> creationalContext)
- {
- return delegate;
- }
-
- @Override
- public void destroy(final Bean<JmxBroadcaster> bean, final JmxBroadcaster instance,
- final CreationalContext<JmxBroadcaster> creationalContext)
- {
- // no-op
- }
-}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
index 93f8d9f11..fa7ffa2fc 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java
@@ -26,13 +26,13 @@ import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.BeanUtils;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import java.lang.annotation.Annotation;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
index 37ee5deff..13021c777 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/DefaultLockedStrategy.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.core.impl.lock;
import org.apache.deltaspike.core.spi.lock.LockedStrategy;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
import java.util.concurrent.locks.Lock;
@Dependent
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java
index 6a720c172..e51c6d7bd 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java
@@ -21,13 +21,13 @@ package org.apache.deltaspike.core.impl.lock;
import org.apache.deltaspike.core.api.lock.Locked;
import org.apache.deltaspike.core.impl.util.AnnotatedMethods;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
import java.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockedInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockedInterceptor.java
index d413f5f82..7b30d3b60 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockedInterceptor.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockedInterceptor.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.core.impl.lock;
import org.apache.deltaspike.core.api.lock.Locked;
import org.apache.deltaspike.core.spi.lock.LockedStrategy;
-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 java.io.Serializable;
@Locked
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultLocaleResolver.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultLocaleResolver.java
index 6cd194d41..00925aeb0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultLocaleResolver.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultLocaleResolver.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.impl.message;
import org.apache.deltaspike.core.api.message.LocaleResolver;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
import java.io.Serializable;
import java.util.Locale;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index 4d41d974f..ffb53ec86 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.core.api.message.MessageInterpolator;
import org.apache.deltaspike.core.api.message.MessageResolver;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
index 44fb94547..a7d6b928f 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java
@@ -24,9 +24,9 @@ import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.core.api.message.MessageInterpolator;
import org.apache.deltaspike.core.api.message.MessageResolver;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Typed;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Typed;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
index 028a0dc4e..062eb2c63 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.impl.message;
import org.apache.deltaspike.core.api.message.MessageInterpolator;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.Serializable;
import java.util.Locale;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
index a8548e4e6..4e64f7c5f 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.core.api.message.MessageResolver;
import org.apache.deltaspike.core.util.PropertyFileUtils;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java
index 85bf72acb..972eda705 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.impl.message;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Bean;
@Typed()
abstract class MessageBundleContext
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
index 1733f5f4f..0f345767d 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
@@ -27,30 +27,25 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import org.apache.deltaspike.core.api.literal.DefaultLiteral;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+
import org.apache.deltaspike.core.api.message.Message;
import org.apache.deltaspike.core.api.message.MessageBundle;
import org.apache.deltaspike.core.api.message.MessageTemplate;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.api.provider.DependentProvider;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.ParentExtensionStorage;
-import org.apache.deltaspike.core.util.bean.BeanBuilder;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
-import org.apache.deltaspike.core.util.metadata.builder.ContextualLifecycle;
/**
* Extension for handling {@link MessageBundle}s.
@@ -149,28 +144,25 @@ public class MessageBundleExtension implements Extension, Deactivatable
messageBundleTypes.addAll(parentExtension.messageBundleTypes);
}
- for (AnnotatedType<?> type : messageBundleTypes)
+ for (AnnotatedType<?> mbType : messageBundleTypes)
{
- abd.addBean(createMessageBundleBean(type, beanManager));
+ abd.addBean()
+ .createWith(cc -> {
+ final Bean<?> invocationHandlerBean = beanManager.resolve(
+ beanManager.getBeans(MessageBundleInvocationHandler.class));
+
+ return createMessageBundleProxy(mbType.getJavaClass(),
+ (MessageBundleInvocationHandler)
+ beanManager.getReference(invocationHandlerBean, MessageBundleInvocationHandler.class, cc));
+ })
+ .read(mbType)
+ .types(mbType.getJavaClass(), Object.class, Serializable.class)
+ .addQualifier(Default.Literal.INSTANCE)
+ .scope(ApplicationScoped.class) // needs to be a normalscope due to a bug in older Weld versions
+ .id("MessageBundleBean#" + mbType.getJavaClass().getName());
}
}
- private <T> Bean<T> createMessageBundleBean(AnnotatedType<T> annotatedType,
- BeanManager beanManager)
- {
- BeanBuilder<T> beanBuilder = new BeanBuilder<T>(beanManager).readFromType(annotatedType);
-
- beanBuilder.beanLifecycle(new MessageBundleLifecycle<T>(beanManager));
-
- beanBuilder.types(annotatedType.getJavaClass(), Object.class, Serializable.class);
- beanBuilder.addQualifier(new DefaultLiteral());
-
- beanBuilder.passivationCapable(true);
- beanBuilder.scope(ApplicationScoped.class); // needs to be a normalscope due to a bug in older Weld versions
- beanBuilder.id("MessageBundleBean#" + annotatedType.getJavaClass().getName());
-
- return beanBuilder.create();
- }
@SuppressWarnings("UnusedDeclaration")
protected void cleanup(@Observes AfterDeploymentValidation afterDeploymentValidation)
@@ -178,39 +170,9 @@ public class MessageBundleExtension implements Extension, Deactivatable
messageBundleTypes.clear();
}
- private static class MessageBundleLifecycle<T> implements ContextualLifecycle<T>
+ private <T> T createMessageBundleProxy(Class<T> type, MessageBundleInvocationHandler handler)
{
- private final BeanManager beanManager;
-
- private DependentProvider<MessageBundleInvocationHandler> invocationHandlerProvider;
-
- private MessageBundleLifecycle(BeanManager beanManager)
- {
- this.beanManager = beanManager;
- }
-
- @Override
- public T create(Bean<T> bean, CreationalContext<T> creationalContext)
- {
- invocationHandlerProvider = BeanProvider.getDependent(beanManager, MessageBundleInvocationHandler.class);
-
- return createMessageBundleProxy((Class<T>) bean.getBeanClass(), invocationHandlerProvider.get());
- }
-
- @Override
- public void destroy(Bean<T> bean, T instance, CreationalContext<T> creationalContext)
- {
- if (invocationHandlerProvider != null)
- {
- invocationHandlerProvider.destroy();
- }
- }
-
- private <T> T createMessageBundleProxy(Class<T> type, MessageBundleInvocationHandler handler)
- {
- return type.cast(Proxy.newProxyInstance(ClassUtils.getClassLoader(null),
- new Class<?>[]{type, Serializable.class}, handler));
- }
-
+ return type.cast(Proxy.newProxyInstance(ClassUtils.getClassLoader(null),
+ new Class<?>[]{type, Serializable.class}, handler));
}
}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
index e3dac800a..0bf6da2de 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleInvocationHandler.java
@@ -18,16 +18,16 @@
*/
package org.apache.deltaspike.core.impl.message;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Typed;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Typed;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import org.apache.deltaspike.core.api.literal.AnyLiteral;
import org.apache.deltaspike.core.api.message.LocaleResolver;
import org.apache.deltaspike.core.api.message.Message;
import org.apache.deltaspike.core.api.message.MessageContext;
@@ -134,7 +134,7 @@ public class MessageBundleInvocationHandler implements InvocationHandler, Serial
ClassUtils.tryToLoadClassForName(messageContextConfig.messageResolver().getName());
messageContext.messageResolver(
- BeanProvider.getContextualReference(messageResolverClass, new AnyLiteral()));
+ BeanProvider.getContextualReference(messageResolverClass, Any.Literal.INSTANCE));
}
if (!MessageInterpolator.class.equals(messageContextConfig.messageInterpolator()))
@@ -143,7 +143,7 @@ public class MessageBundleInvocationHandler implements InvocationHandler, Serial
ClassUtils.tryToLoadClassForName(messageContextConfig.messageInterpolator().getName());
messageContext.messageInterpolator(
- BeanProvider.getContextualReference(messageInterpolatorClass, new AnyLiteral()));
+ BeanProvider.getContextualReference(messageInterpolatorClass, Any.Literal.INSTANCE));
}
if (!LocaleResolver.class.equals(messageContextConfig.localeResolver()))
@@ -152,7 +152,7 @@ public class MessageBundleInvocationHandler implements InvocationHandler, Serial
ClassUtils.tryToLoadClassForName(messageContextConfig.localeResolver().getName());
messageContext.localeResolver(
- BeanProvider.getContextualReference(localeResolverClass, new AnyLiteral()));
+ BeanProvider.getContextualReference(localeResolverClass, Any.Literal.INSTANCE));
}
String[] messageSources = messageContextConfig.messageSource();
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java
index 4230d4e31..3f1e0f8be 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageFormatMessageInterpolator.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.impl.message;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
import java.io.Serializable;
import java.util.Locale;
import java.text.MessageFormat;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationMonitorInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationMonitorInterceptor.java
index add31b5c4..f1d3ad6e6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationMonitorInterceptor.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationMonitorInterceptor.java
@@ -20,11 +20,11 @@ package org.apache.deltaspike.core.impl.monitoring;
import org.apache.deltaspike.core.api.monitoring.InvocationMonitored;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
import java.io.Serializable;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationResultLogger.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationResultLogger.java
index 52639e21a..4e6c6ab2e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationResultLogger.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/InvocationResultLogger.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.core.impl.monitoring;
import org.apache.deltaspike.core.api.monitoring.MonitorResultEvent;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/RequestInvocationCounter.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/RequestInvocationCounter.java
index 8f46c37f3..6f082bae6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/RequestInvocationCounter.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/monitoring/RequestInvocationCounter.java
@@ -20,10 +20,10 @@ package org.apache.deltaspike.core.impl.monitoring;
import org.apache.deltaspike.core.api.monitoring.MonitorResultEvent;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/AbstractBeanHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/AbstractBeanHolder.java
index 3648dd66f..0a0688fda 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/AbstractBeanHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/AbstractBeanHolder.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.core.impl.scope;
import org.apache.deltaspike.core.util.context.AbstractContext;
import org.apache.deltaspike.core.util.context.ContextualStorage;
-import javax.annotation.PreDestroy;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
index e5ab31578..a93c9c2b4 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/DeltaSpikeContextExtension.java
@@ -18,12 +18,12 @@
*/
package org.apache.deltaspike.core.impl.scope;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.impl.scope.conversation.ConversationBeanHolder;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/ConversationKey.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/ConversationKey.java
index 378322bc1..a40f6566a 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/ConversationKey.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/ConversationKey.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.core.impl.scope.conversation;
import org.apache.deltaspike.core.api.scope.ConversationGroup;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.inject.Named;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.util.Collections;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationArtifactProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationArtifactProducer.java
index 5ecaf368b..a1970fe77 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationArtifactProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationArtifactProducer.java
@@ -23,12 +23,12 @@ import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
import org.apache.deltaspike.core.impl.util.ConversationUtils;
import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.inject.Inject;
@ApplicationScoped
public class GroupedConversationArtifactProducer
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java
index bfa2cf1fb..06699fe43 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java
@@ -27,9 +27,9 @@ import org.apache.deltaspike.core.util.context.AbstractContext;
import org.apache.deltaspike.core.util.context.ContextualInstanceInfo;
import org.apache.deltaspike.core.util.context.ContextualStorage;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java
index 4805aa660..60eee7296 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.core.impl.scope.conversation;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.annotation.Annotation;
import java.util.Set;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
index 56fcdf777..57b4eac1e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager;
import org.apache.deltaspike.core.util.context.ContextualStorage;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.annotation.Annotation;
import java.util.Set;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java
index a4cfac3d4..c72eeac93 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
import org.apache.deltaspike.core.spi.scope.viewaccess.ViewAccessContextManager;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
@Typed()
class InjectableViewAccessContextManager implements ViewAccessContextManager
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessBeanAccessHistory.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessBeanAccessHistory.java
index acc96453a..6fd49d51a 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessBeanAccessHistory.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessBeanAccessHistory.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.impl.scope.viewaccess;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
@RequestScoped
public class ViewAccessBeanAccessHistory
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
index c43f8c123..e2ba15ac0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java
@@ -25,11 +25,11 @@ import org.apache.deltaspike.core.util.context.AbstractContext;
import org.apache.deltaspike.core.util.context.ContextualInstanceInfo;
import org.apache.deltaspike.core.util.context.ContextualStorage;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.lang.annotation.Annotation;
import java.util.Map;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContextArtifactProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContextArtifactProducer.java
index 5d514a204..fb0c4c0a9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContextArtifactProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContextArtifactProducer.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.core.impl.scope.viewaccess;
import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
import org.apache.deltaspike.core.spi.scope.viewaccess.ViewAccessContextManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
@ApplicationScoped
public class ViewAccessContextArtifactProducer
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
index 928333e2e..23b8b8eda 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/DefaultWindowContextQuotaHandler.java
@@ -21,9 +21,9 @@ package org.apache.deltaspike.core.impl.scope.window;
import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
import org.apache.deltaspike.core.spi.scope.window.WindowContextQuotaHandler;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
import java.util.Stack;
@SessionScoped
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java
index e74861996..6383b19c9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
import org.apache.deltaspike.core.spi.scope.window.WindowContext;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
//keep it public for supporting #{dsWindowContext.getCurrentWindowId()} in addition to
//#{dsWindowContext.currentWindowId}
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
index bed91c7bf..e5d30aaad 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowBeanHolder.java
@@ -25,10 +25,10 @@ import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ProxyUtils;
import org.apache.deltaspike.core.util.context.ContextualStorage;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
/**
* This holder will store the window Ids and it's beans for the current
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
index 8a88f314f..0845c52e4 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.core.impl.scope.window;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java
index aadd9da66..20892f278 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextProducer.java
@@ -18,11 +18,11 @@
*/
package org.apache.deltaspike.core.impl.scope.window;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension;
import org.apache.deltaspike.core.spi.scope.window.WindowContext;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextQuotaHandlerCache.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextQuotaHandlerCache.java
index 47ae860f3..a61e2a399 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextQuotaHandlerCache.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextQuotaHandlerCache.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.core.impl.scope.window;
import org.apache.deltaspike.core.spi.scope.window.WindowContext;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
import java.io.Serializable;
@RequestScoped
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
index 519d77e89..c97504b7b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowIdHolder.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.core.impl.scope.window;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
/**
* Simple class which just provides a @RequestScoped windowId.
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/DefaultThrottledStrategy.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/DefaultThrottledStrategy.java
index e31241f65..486c7e64b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/DefaultThrottledStrategy.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/DefaultThrottledStrategy.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.core.impl.throttling;
import org.apache.deltaspike.core.spi.throttling.ThrottledStrategy;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
@Dependent
public class DefaultThrottledStrategy implements ThrottledStrategy
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/Invoker.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/Invoker.java
index 0d4e49f64..9da5fe3c1 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/Invoker.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/Invoker.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.core.impl.throttling;
import org.apache.deltaspike.core.util.ExceptionUtils;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java
index 3f1d69d1c..4b6ee17a7 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java
@@ -23,13 +23,13 @@ import org.apache.deltaspike.core.api.throttling.Throttled;
import org.apache.deltaspike.core.api.throttling.Throttling;
import org.apache.deltaspike.core.impl.util.AnnotatedMethods;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
import java.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/ThrottledInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/ThrottledInterceptor.java
index 19ddd5c4a..51d363892 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/ThrottledInterceptor.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/ThrottledInterceptor.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.core.impl.throttling;
import org.apache.deltaspike.core.api.throttling.Throttled;
import org.apache.deltaspike.core.spi.throttling.ThrottledStrategy;
-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 java.io.Serializable;
@Throttled
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotatedMethods.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotatedMethods.java
index fc0c9800a..53a2eb7ba 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotatedMethods.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotatedMethods.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.core.impl.util;
-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 java.lang.reflect.Method;
public final class AnnotatedMethods
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotationInstanceUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotationInstanceUtils.java
index 9c19215c8..3a2865938 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotationInstanceUtils.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotationInstanceUtils.java
@@ -22,7 +22,7 @@ package org.apache.deltaspike.core.impl.util;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Map;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java
index 9cc3e3160..981b1d37e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java
@@ -22,11 +22,11 @@ import org.apache.deltaspike.core.api.scope.ConversationGroup;
import org.apache.deltaspike.core.api.scope.ConversationSubGroup;
import org.apache.deltaspike.core.impl.scope.conversation.ConversationKey;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.lang.annotation.Annotation;
import java.util.Set;
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
index 968e9799e..b2616a3b6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import javax.naming.InitialContext;
import javax.naming.Name;
import javax.naming.NameClassPair;
diff --git a/deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 93%
rename from deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
index b81b882c4..ed1dc83d3 100644
--- a/deltaspike/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -19,7 +19,6 @@
org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension
org.apache.deltaspike.core.impl.message.MessageBundleExtension
-org.apache.deltaspike.core.impl.exception.control.extension.ExceptionControlExtension
org.apache.deltaspike.core.impl.config.ConfigurationExtension
org.apache.deltaspike.core.impl.jmx.MBeanExtension
org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseBean1.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseBean1.java
index e83405045..085944ee6 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseBean1.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseBean1.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* Simple base bean which gets overruled by an global alternative
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1AlternativeImplementation.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1AlternativeImplementation.java
index a42117b84..5d3c8db2f 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1AlternativeImplementation.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1AlternativeImplementation.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
/**
* Global alternative
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1DefaultImplementation.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1DefaultImplementation.java
index 3ff3d258c..35681b02c 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1DefaultImplementation.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/BaseInterface1DefaultImplementation.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* Default implementation which gets overruled by the alternative
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
deleted file mode 100644
index 50f01d103..000000000
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
+++ /dev/null
@@ -1,134 +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.deltaspike.test.core.api.alternative.global;
-
-
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.core.api.alternative.global.qualifier.AlternativeBaseBeanB;
-import org.apache.deltaspike.test.core.api.alternative.global.qualifier.BaseBeanA;
-import org.apache.deltaspike.test.core.api.alternative.global.qualifier.BaseInterface;
-import org.apache.deltaspike.test.core.api.alternative.global.qualifier.QualifierA;
-import org.apache.deltaspike.test.core.api.alternative.global.qualifier.QualifierB;
-import org.apache.deltaspike.test.core.api.alternative.global.qualifier.QualifierValue1;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.inject.Inject;
-
-/**
- * Tests for @Alternative across BDAs
- */
-@RunWith(Arquillian.class)
-//X TODO remove the restriction to SeCategory after fixing the packaging issue
-@Category(SeCategory.class)
-public class GlobalAlternativeTest
-{
- @Inject
- private BaseInterface1 bean;
-
- @Inject
- @QualifierA(QualifierValue1.class)
- private BaseInterface beanA;
-
- @Inject
- @QualifierB(QualifierValue1.class)
- private BaseInterface beanB;
-
- /**
- * X TODO creating a WebArchive is only a workaround because JavaArchive cannot contain other archives.
- */
- @Deployment
- public static WebArchive deploy()
- {
-
- Asset beansXml = EmptyAsset.INSTANCE;
-
- try
- {
- // if this doesn't throw a ClassNotFoundException, then we have OpenWebBeans on the ClassPath.
- Class.forName("org.apache.webbeans.spi.ContainerLifecycle");
-
- // Older OWB versions had an error with @Alternatives pickup from AnnotatedType.
- // But as OWB has global-alternatives behaviour by default, we can simply add them
- // via beans.xml. From OWB-1.2.1 on we would not need this anymore, but it's still needed
- // for 1.0.x, 1.1.x and 1.2.0 series
- beansXml = new StringAsset(
- "<beans><alternatives>" +
- "<class>" + BaseInterface1AlternativeImplementation.class.getName() + "</class>" +
- "<class>" + SubBaseBean2.class.getName() + "</class>" +
- "<class>" + AlternativeBaseBeanB.class.getName() + "</class>" +
- "</alternatives></beans>"
- );
- }
- catch (ClassNotFoundException cnfe)
- {
- // all fine, no OWB here -> Weld handling
- }
-
-
- JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeIntegrationTest.jar")
- .addPackage(GlobalAlternativeTest.class.getPackage())
- .addPackage(QualifierA.class.getPackage())
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
- return ShrinkWrap.create(WebArchive.class, "globalAlternative.war")
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive(new String[]{"META-INF.config"}))
- .addAsLibraries(testJar)
- .addAsWebInfResource(beansXml, "beans.xml");
- }
-
- /**
- * The alternative configured in the low-level config should get used instead of the default implementation
- */
- @Test
- public void alternativeImplementationWithClassAsBaseType()
- {
- BaseBean1 testBean = BeanProvider.getContextualReference(BaseBean1.class);
-
- Assert.assertEquals(SubBaseBean2.class.getName(), testBean.getClass().getName());
- }
-
- /**
- * The alternative configured in the low-level config should get used instead of the default implementation
- */
- @Test
- public void alternativeImplementationWithInterfaceAsBaseType()
- {
- Assert.assertEquals(BaseInterface1AlternativeImplementation.class.getName(), bean.getClass().getName());
- }
-
- @Test
- public void alternativeImplementationWithInterfaceAsBaseTypeAndQualifier()
- {
- Assert.assertEquals(BaseBeanA.class.getName(), beanA.getClass().getName());
- Assert.assertEquals(AlternativeBaseBeanB.class.getName(), beanB.getClass().getName());
- }
-}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
index 9c944ff8a..55e9cf933 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
@Alternative
@Dependent
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
index 694a4a07c..371819c8b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
@Alternative
@Dependent
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/AlternativeBaseBeanB.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/AlternativeBaseBeanB.java
index 063f6f5ff..c84b52c77 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/AlternativeBaseBeanB.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/AlternativeBaseBeanB.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global.qualifier;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
/**
*
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanA.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanA.java
index 6928780f3..25c784efb 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanA.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanA.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global.qualifier;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
*
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB.java
index 694ee3a0c..a9d0c3a22 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global.qualifier;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
*
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB2.java
index 361660541..c044f2bce 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/BaseBeanB2.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global.qualifier;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
*
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierA.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierA.java
index f54a567f9..0490279c0 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierA.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierA.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global.qualifier;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierB.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierB.java
index 498013cb6..aa525ced9 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierB.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/qualifier/QualifierB.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.global.qualifier;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseBean2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseBean2.java
index 3b92c5d67..cb977380e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseBean2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseBean2.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.local;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* Simple base bean which doesn't get overruled by an global alternative
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2AlternativeImplementation.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2AlternativeImplementation.java
index a75f5dac2..2e774b6e2 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2AlternativeImplementation.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2AlternativeImplementation.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.local;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
/**
* Alternative which isn't configured as global alternative.
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2DefaultImplementation.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2DefaultImplementation.java
index 11e2f483d..6a7318e7b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2DefaultImplementation.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BaseInterface2DefaultImplementation.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.alternative.local;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* Default implementation which doesn't get overruled by the alternative
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java
deleted file mode 100644
index 73cd5152a..000000000
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java
+++ /dev/null
@@ -1,56 +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.deltaspike.test.core.api.alternative.local;
-
-import org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-@RunWith(Arquillian.class)
-@Category(EnterpriseArchiveProfileCategory.class)
-public class BdaAlternativeEarFileTest extends BdaAlternativeTest
-{
- public static final String CONFIG = "deltaspike.bean-manager.delegate_lookup=false\n" // Weld3 bug :(
- + "globalAlternatives.org.apache.deltaspike.test.core.api.alternative.local.BaseBean2="
- + "org.apache.deltaspike.test.core.api.alternative.local.SubBaseBean2";
-
- @Deployment
- public static EnterpriseArchive deployEar()
- {
- //workaround for tomee - the ear-file needs to have the same name as the war-file
- String simpleName = BdaAlternativeWarFileTest.class.getSimpleName();
- String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1);
-
- JavaArchive globalAlternativeConfigJar = ShrinkWrap.create(JavaArchive.class, "globalAlternativesConfig.jar")
- .addAsManifestResource(new StringAsset(CONFIG),
- "apache-deltaspike.properties");
-
-
- return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear")
- .addAsLibrary(globalAlternativeConfigJar)
- .addAsModule(BdaAlternativeWarFileTest.deploy());
- }
-}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
index 05b0b6cb0..85a226595 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.junit.Assert;
import org.junit.Test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
/**
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java
deleted file mode 100644
index 8612911d2..000000000
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java
+++ /dev/null
@@ -1,57 +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.deltaspike.test.core.api.alternative.local;
-
-import org.apache.deltaspike.test.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.runner.RunWith;
-
-/**
- * Keep in sync with {@link org.apache.deltaspike.test.core.api.alternative.global.GlobalAlternativeTest} -
- * but without configuring the alternatives and check for the default implementations.
- *
- * Tests which checks the behaviour with deactivated global alternates.
- */
-@RunWith(Arquillian.class)
-public class BdaAlternativeWarFileTest extends BdaAlternativeTest
-{
- /**
- * X TODO creating a WebArchive is only a workaround because JavaArchive cannot contain other archives.
- */
- @Deployment
- public static WebArchive deploy()
- {
- String simpleName = BdaAlternativeWarFileTest.class.getSimpleName();
- String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1);
-
- JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, archiveName + ".jar")
- .addPackage(BdaAlternativeWarFileTest.class.getPackage())
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
- return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive(new String[]{"META-INF.config"}))
- .addAsLibraries(testJar)
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- }
-}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/SubBaseBean2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/SubBaseBean2.java
index a2f69574d..13bcaffde 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/SubBaseBean2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/SubBaseBean2.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.alternative.local;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Alternative;
/**
* Alternative which isn't configured as global alternative.
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java
index 5f5023af0..79c94d2eb 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.api.config.injectable;
import org.apache.deltaspike.core.api.config.Filter;
import org.apache.deltaspike.core.spi.config.ConfigFilter;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@Filter
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiSource.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiSource.java
index 951a9d1f2..d5aa6e79e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiSource.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiSource.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.api.config.injectable;
import org.apache.deltaspike.core.api.config.Source;
import org.apache.deltaspike.core.impl.config.MapConfigSource;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.HashMap;
import java.util.Map;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaData.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaData.java
index 1380aa084..ac5162901 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaData.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaData.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.test.core.api.config.injectable;
import org.apache.deltaspike.core.api.config.ConfigProperty;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaDataProducer.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaDataProducer.java
index 8a3e5f26e..61bd87ae6 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaDataProducer.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CustomConfigAnnotationWithMetaDataProducer.java
@@ -20,10 +20,10 @@ package org.apache.deltaspike.test.core.api.config.injectable;
import org.apache.deltaspike.core.spi.config.BaseConfigPropertyProducer;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
/**
* Sample producer for {@link CustomConfigAnnotationWithMetaData}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
index cd582d2f9..20e3c272e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.test.core.api.config.injectable;
import org.apache.deltaspike.core.api.config.ConfigProperty;
import org.apache.deltaspike.core.api.config.ConfigResolver;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfig.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfig.java
index e5a472716..e3b63e368 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfig.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfig.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.config.injectable.numberconfig;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfigPropertyProducer.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfigPropertyProducer.java
index 6a4712d13..b64fd2b43 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfigPropertyProducer.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfigPropertyProducer.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.test.core.api.config.injectable.numberconfig;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.ParseException;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfiguredBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfiguredBean.java
index b187465c8..035687eb2 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfiguredBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/numberconfig/NumberConfiguredBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.config.injectable.numberconfig;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
index 4362d76e2..fbd034e39 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/BaseTestConfigProperty.java
@@ -18,8 +18,6 @@
*/
package org.apache.deltaspike.test.core.api.config.propertyconfigsource;
-import javax.inject.Inject;
-
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -35,24 +33,6 @@ public class BaseTestConfigProperty
protected final static String CONFIG_FILE_NAME = "myconfig.properties";
protected static final String CONFIG_VALUE = "deltaspike.dynamic.reloadable.config.value";
- @Inject
- private MyBean myBean;
-
- @Test
- public void testInjectConfig()
- {
- Assert.assertEquals("psAwareStringValue", myBean.getStringConfig());
- Assert.assertEquals("DEFAULT", myBean.getStringConfigWithDefault());
- Assert.assertEquals("stringValue", myBean.getStringConfigWithoutProjectStage());
- Assert.assertEquals("parameterizedPsAwareStringValue", myBean.getStringConfigParameterized());
-
- Assert.assertEquals(false, myBean.getBooleanConfig());
- Assert.assertEquals(MyBean.class, myBean.getClassConfig());
- Assert.assertEquals(5, myBean.getIntConfig());
- Assert.assertEquals(8589934592l, myBean.getLongConfig());
- Assert.assertEquals(-1.1f, myBean.getFloatConfig(), 0);
- Assert.assertEquals(4e40, myBean.getDoubleConfig(), 0);
- }
@Test
public void testDynamicReload() throws Exception
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/ConfigPropertyEARTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/ConfigPropertyEARTest.java
deleted file mode 100644
index c25aff8ef..000000000
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/ConfigPropertyEARTest.java
+++ /dev/null
@@ -1,72 +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.deltaspike.test.core.api.config.propertyconfigsource;
-
-import org.apache.deltaspike.core.api.config.PropertyFileConfig;
-import org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-@RunWith(Arquillian.class)
-@Category(EnterpriseArchiveProfileCategory.class)
-public class ConfigPropertyEARTest extends BaseTestConfigProperty
-{
-
- @Deployment
- public static EnterpriseArchive deployEar()
- {
- JavaArchive ejbJar = ShrinkWrap
- .create(JavaArchive.class, "ejb-jar.jar")
- .addClasses(BaseTestConfigProperty.class, ConfigPropertyEARTest.class,
- MyBean.class, MyCustomEarPropertyFileConfig.class)
- .addAsResource(CONFIG_FILE_NAME)
- .addAsServiceProvider(PropertyFileConfig.class, MyCustomEarPropertyFileConfig.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
- .addAsManifestResource(new StringAsset("org.apache.deltaspike.ProjectStage = UnitTest"),
- "apache-deltaspike.properties");
-
- WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
-
- EnterpriseArchive enterpriseArchive = ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
- .addAsModule(ejbJar)
- .addAsModule(war)
- .setApplicationXML("application.xml");
-
- return enterpriseArchive;
- }
-
- @Test
- public void testInjectConfig()
- {
- // TODO Auto-generated method stub
- super.testInjectConfig();
- }
-}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyBean.java
deleted file mode 100644
index a097d862f..000000000
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyBean.java
+++ /dev/null
@@ -1,120 +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.deltaspike.test.core.api.config.propertyconfigsource;
-
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-
-import org.apache.deltaspike.core.api.config.ConfigProperty;
-
-@Stateless
-public class MyBean
-{
-
- @Inject
- @ConfigProperty(name = "configproperty.test.string")
- private String stringConfig;
-
- @Inject
- @ConfigProperty(name = "INVALIDKEY", defaultValue = "DEFAULT")
- private String stringConfigWithDefault;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.string", projectStageAware = false)
- private String stringConfigWithoutProjectStage;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.string", projectStageAware = true,
- parameterizedBy = "configproperty.test.param")
- private String stringConfigParameterized;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.boolean")
- private Boolean booleanConfig;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.class")
- private Class classConfig;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.int")
- private Integer intConfig;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.long")
- private Long longConfig;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.float")
- private Float floatConfig;
-
- @Inject
- @ConfigProperty(name = "configproperty.test.double")
- private Double doubleConfig;
-
- public String getStringConfig()
- {
- return stringConfig;
- }
-
- public String getStringConfigWithDefault()
- {
- return stringConfigWithDefault;
- }
-
- public String getStringConfigWithoutProjectStage()
- {
- return stringConfigWithoutProjectStage;
- }
-
- public String getStringConfigParameterized()
- {
- return stringConfigParameterized;
- }
-
- public boolean getBooleanConfig()
- {
- return booleanConfig;
- }
-
- public Class getClassConfig()
- {
- return classConfig;
- }
-
- public int getIntConfig()
- {
- return intConfig;
- }
-
- public long getLongConfig()
- {
- return longConfig;
- }
-
- public float getFloatConfig()
- {
- return floatConfig;
- }
-
- public double getDoubleConfig()
- {
- return doubleConfig;
- }
-}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/AlwaysActiveBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/AlwaysActiveBean.java
index d2ec6bdc5..5554c3c19 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/AlwaysActiveBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/AlwaysActiveBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.exclude;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* Class which is always active
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java
index 108532208..9c4f6ed8f 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java
@@ -34,7 +34,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.AfterClass;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/ElPickedUpMessages.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/ElPickedUpMessages.java
index 699641f73..41d116a54 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/ElPickedUpMessages.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/ElPickedUpMessages.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.message;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.deltaspike.core.api.message.MessageBundle;
import org.apache.deltaspike.core.api.message.MessageContextConfig;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedEnglishLocalResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedEnglishLocalResolver.java
index af77e7f13..1891b2f49 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedEnglishLocalResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedEnglishLocalResolver.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.api.message;
import org.apache.deltaspike.core.api.message.LocaleResolver;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.Locale;
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java
index 86e4bd871..c10c53129 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.api.message;
import org.apache.deltaspike.core.api.message.LocaleResolver;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.util.Locale;
@Typed()
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/Jay.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/Jay.java
index 2a52ee77e..efccb7364 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/Jay.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/Jay.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.message;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class Jay
{
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
index a0893d0ae..4f3ce2a7c 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.test.core.api.message;
import java.io.Serializable;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
import org.apache.deltaspike.core.api.message.LocaleResolver;
import org.apache.deltaspike.core.api.message.Message;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java
index de531764c..633b1e864 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.message;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
import org.apache.deltaspike.core.impl.message.MessageBundleExtension;
import org.apache.deltaspike.core.impl.message.MessageFormatMessageInterpolator;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
index e80d6a4d0..a807e8fc9 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
@@ -31,8 +31,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageUser.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageUser.java
index d91d32d20..7acdf1c56 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageUser.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageUser.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.message;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
import java.io.Serializable;
/**
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
index 82373fbc6..c83ddce00 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
@@ -32,8 +32,8 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
/**
* Tests for type-safe messages without {@link org.apache.deltaspike.core.api.message.MessageTemplate}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
index f536826f9..d4fc18487 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
@@ -33,8 +33,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestConfiguration.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestConfiguration.java
index abbbe6145..2270120bf 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestConfiguration.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestConfiguration.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.message;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestLocalResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestLocalResolver.java
index 08142e3a4..159831819 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestLocalResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestLocalResolver.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.test.core.api.message;
import org.apache.deltaspike.core.impl.message.DefaultLocaleResolver;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Specializes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Specializes;
import java.util.Locale;
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
index 0da517897..b8ee7ed01 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.api.message;
import org.apache.deltaspike.core.api.message.MessageInterpolator;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.Serializable;
import java.util.Locale;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
index 4246dbe0b..c04cc5e16 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.core.api.message.MessageResolver;
import org.apache.deltaspike.core.util.PropertyFileUtils;
-import javax.enterprise.inject.Typed;
+import jakarta.enterprise.inject.Typed;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TypedMessageWithCustomName.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TypedMessageWithCustomName.java
index e9f66be38..05b2e63ed 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TypedMessageWithCustomName.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TypedMessageWithCustomName.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.api.message;
import org.apache.deltaspike.core.api.message.MessageBundle;
import org.apache.deltaspike.core.api.message.MessageContextConfig;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("namedTypedMessages")
@MessageBundle
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
index 3db6f0283..bcad94751 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/broken/BrokenMessageBundleOnClassTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.message.broken;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
import org.apache.deltaspike.core.impl.message.MessageBundleExtension;
import org.apache.deltaspike.test.category.SeCategory;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleMessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleMessageTest.java
index 84cd03c82..1284e6670 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleMessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleMessageTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.message.locale;
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.Locale;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleResolver.java
index 8d444bdad..05ef6d802 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/locale/ConfigurableLocaleResolver.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.test.core.api.message.locale;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
import java.util.Locale;
import org.apache.deltaspike.core.api.message.LocaleResolver;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderTest.java
index 4bcee5906..29cc20bd3 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanManagerProviderTest.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
import org.junit.Assert;
import org.junit.Test;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
public abstract class BeanManagerProviderTest
{
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java
index 62ee43c9e..56be54e74 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/DependentTestBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.test.core.api.provider;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.Dependent;
-import javax.inject.Named;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Named;
import java.io.Serializable;
@Dependent
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean01.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean01.java
index b44cf3d3f..9bae3ac22 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean01.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean01.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.provider;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
* Impl #1
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean02.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean02.java
index cec48bb0f..12e618f67 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean02.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/MBean02.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.provider;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
/**
* Impl #2
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java
index 96b7ccca9..ba5144ae7 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.provider;
-import javax.enterprise.inject.Typed;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Typed;
+import jakarta.inject.Inject;
@Typed()
class ManualBean
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/TestBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/TestBean.java
index f2cfb5a71..d83c94fc0 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/TestBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/TestBean.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.provider;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
@Named("extraNameBean")
@ApplicationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanX.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanX.java
index 9e4e58359..da910c5c4 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanX.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanX.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.scope.ConversationGroup;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
@GroupedConversationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanY.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanY.java
index 8e4b0c7e7..527534572 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanY.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedBeanY.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.core.api.scope.ConversationGroup;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
@GroupedConversationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedConversationsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedConversationsTest.java
index e5762ea77..d12820174 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedConversationsTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/explicit/ExplicitlyGroupedConversationsTest.java
@@ -34,8 +34,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
@Category(SeCategory.class)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedBean.java
index 84e08a058..0f9789d79 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedBean.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.api.scope.conversation.grouped.implicit;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
@GroupedConversationScoped
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedConversationsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedConversationsTest.java
index 219579c6e..a6ae1f392 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedConversationsTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/grouped/implicit/ImplicitlyGroupedConversationsTest.java
@@ -33,8 +33,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
@Category(SeCategory.class)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/shared/TestBaseBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/shared/TestBaseBean.java
index 9d3eac85e..54522576b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/shared/TestBaseBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/shared/TestBaseBean.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.api.scope.conversation.subgroup.shared;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
public abstract class TestBaseBean implements Serializable
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc001/GroupedConversationSubGroupTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc001/GroupedConversationSubGroupTest.java
index b1c6a6289..80613282e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc001/GroupedConversationSubGroupTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc001/GroupedConversationSubGroupTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
@Category(SeCategory.class)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc002/GroupedConversationSubGroupTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc002/GroupedConversationSubGroupTest.java
index 6b235b659..3620250e4 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc002/GroupedConversationSubGroupTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc002/GroupedConversationSubGroupTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
@Category(SeCategory.class)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc003/GroupedConversationSubGroupTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc003/GroupedConversationSubGroupTest.java
index 946c221ea..8716ba628 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc003/GroupedConversationSubGroupTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/conversation/subgroup/uc003/GroupedConversationSubGroupTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
@Category(SeCategory.class)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/viewaccess/ViewAccessScopedTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/viewaccess/ViewAccessScopedTest.java
index c3ddde3ed..7e5863163 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/viewaccess/ViewAccessScopedTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/scope/viewaccess/ViewAccessScopedTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
@Category(SeCategory.class)
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/MyInterfaceImpl.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/MyInterfaceImpl.java
index bd51c783a..8b46485da 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/MyInterfaceImpl.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/MyInterfaceImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.util;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class MyInterfaceImpl implements MyInterface
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/ProxyUtilsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/ProxyUtilsTest.java
index 6e987ff4b..d673b96ae 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/ProxyUtilsTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/ProxyUtilsTest.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.deltaspike.core.util.ProxyUtils;
import org.apache.deltaspike.test.util.ArchiveUtils;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/AbstractContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/AbstractContextTest.java
index 8abcf5f4a..38a0198ae 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/AbstractContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/AbstractContextTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.util.context;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.test.category.SeCategory;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyContext.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyContext.java
index ab894e351..61e8ca698 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyContext.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyContext.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.test.core.api.util.context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import org.apache.deltaspike.core.util.context.AbstractContext;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScopeExtension.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScopeExtension.java
index 53988f668..26a265d4b 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScopeExtension.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScopeExtension.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.test.core.api.util.context;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
/**
* Registers the {@link DummyContext}
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScoped.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScoped.java
index 38001e1f5..23f37b1ba 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScoped.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/util/context/DummyScoped.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.api.util.context;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
import java.lang.annotation.Documented;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java
index bbf254244..7cc8034f9 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java
@@ -28,7 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java
index 4b729c0c6..ff95093fb 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.impl.future;
import org.apache.deltaspike.core.api.future.Futureable;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/ThreadPoolManagerTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/ThreadPoolManagerTest.java
index 0d3871bcf..10c35142c 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/ThreadPoolManagerTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/ThreadPoolManagerTest.java
@@ -30,7 +30,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Properties;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
index bc100b8cd..11f49c22d 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/InterDynTest.java
@@ -29,7 +29,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RunWith(Arquillian.class)
public class InterDynTest {
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/SomeTestService.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/SomeTestService.java
index fa1adfbdc..104c7763e 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/SomeTestService.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/interdyn/SomeTestService.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.test.core.impl.interdyn;
import org.apache.deltaspike.core.api.monitoring.MonitorResultEvent;
import org.junit.Assert;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
@ApplicationScoped
public class SomeTestService
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties.java
index d31f18bbe..f4699ad01 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.jmx;
import org.apache.deltaspike.core.api.jmx.JmxManaged;
import org.apache.deltaspike.core.api.jmx.MBean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
@MBean(category = "cat", type = "and", name = "", properties = "foo=bar,dummy=empty")
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties2.java
index 1a26d11f7..c0800baba 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomProperties2.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.jmx;
import org.apache.deltaspike.core.api.jmx.JmxManaged;
import org.apache.deltaspike.core.api.jmx.MBean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
@MBean(category = "cat", type = "and", name = "nom", properties = "foo=bar,dummy=empty")
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomPropertiesTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomPropertiesTest.java
index 578fe2072..ab6484ab7 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomPropertiesTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomPropertiesTest.java
@@ -28,7 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.ObjectName;
import java.lang.management.ManagementFactory;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomType.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomType.java
index a38c4fb75..2dfc44429 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomType.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomType.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.jmx;
import org.apache.deltaspike.core.api.jmx.JmxManaged;
import org.apache.deltaspike.core.api.jmx.MBean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
@MBean(category = "cat", type = "and", name = "fish")
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomTypeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomTypeTest.java
index a0eb0f24d..94f45a608 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomTypeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/CustomTypeTest.java
@@ -28,7 +28,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import java.lang.management.ManagementFactory;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java
index 3cf63705c..4994456fe 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java
@@ -24,8 +24,8 @@ import org.apache.deltaspike.core.api.jmx.JmxParameter;
import org.apache.deltaspike.core.api.jmx.MBean;
import org.apache.deltaspike.core.api.jmx.Table;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import javax.management.Notification;
import java.util.HashMap;
import java.util.Map;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
index b4f0199e9..3e9e5b1c3 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.jmx;
import org.junit.Assert;
import org.junit.Test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.Attribute;
import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
index 105368d87..7f132dbd7 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
@@ -27,7 +27,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/Service.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/Service.java
index e2c7894c5..0eec3b714 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/Service.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/Service.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.impl.lock;
import org.apache.deltaspike.core.api.lock.Locked;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
index 39640b8d4..d41abff2f 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/scope/window/DefaultWindowContextTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.test.core.impl.scope.window;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.deltaspike.core.spi.scope.window.WindowContext;
import org.apache.deltaspike.test.category.SeCategory;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service.java
index 95f7e7f22..93716e867 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.test.core.impl.throttling;
import org.apache.deltaspike.core.api.throttling.Throttled;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service2.java
index 4d81d51a7..12f458678 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/Service2.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.throttling;
import org.apache.deltaspike.core.api.throttling.Throttled;
import org.apache.deltaspike.core.api.throttling.Throttling;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java
index 16938f7b1..d21cd34b5 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
index 61bd5598c..62fac2edc 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/util/JndiUtilsTest.java
@@ -21,7 +21,7 @@ package org.apache.deltaspike.test.core.impl.util;
import org.apache.deltaspike.core.impl.util.JndiUtils;
import org.junit.Test;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.util.Map;
import static org.junit.Assert.assertNotNull;
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/deltaspike/core/impl/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from deltaspike/core/impl/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to deltaspike/core/impl/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/deltaspike/core/pom.xml b/deltaspike/core/pom.xml
index 689c252ea..5a3152cbb 100644
--- a/deltaspike/core/pom.xml
+++ b/deltaspike/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike</groupId>
<artifactId>parent-code</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/code/pom.xml</relativePath>
</parent>
diff --git a/deltaspike/dist/bom/pom.xml b/deltaspike/dist/bom/pom.xml
index 29c5c6f33..70441c377 100644
--- a/deltaspike/dist/bom/pom.xml
+++ b/deltaspike/dist/bom/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.deltaspike.distribution</groupId>
<artifactId>distributions-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.deltaspike.distribution</groupId>
<artifactId>distributions-bom</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache DeltaSpike Distribution Bill of Materials</name>
diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml
index 254cd323d..191f877e3 100644
--- a/deltaspike/dist/full/pom.xml
+++ b/deltaspike/dist/full/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.distribution</groupId>
<artifactId>distributions-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-full</artifactId>
@@ -77,19 +77,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-servlet-module-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-servlet-module-impl</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
@@ -139,6 +126,7 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -153,12 +141,7 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-servlet</artifactId>
- <version>${project.version}</version>
- </dependency>
+-->
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
@@ -188,20 +171,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-bean-validation-module-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.deltaspike.modules</groupId>
- <artifactId>deltaspike-bean-validation-module-impl</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>deltaspike-scheduler-module-api</artifactId>
diff --git a/deltaspike/dist/pom.xml b/deltaspike/dist/pom.xml
index bcf91753f..6ee3d75a1 100644
--- a/deltaspike/dist/pom.xml
+++ b/deltaspike/dist/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.deltaspike</groupId>
<artifactId>deltaspike-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.deltaspike.distribution</groupId>
<artifactId>distributions-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache DeltaSpike Distribution</name>
diff --git a/deltaspike/examples/data-examples/pom.xml b/deltaspike/examples/data-examples/pom.xml
index 045364bef..f7e75d201 100644
--- a/deltaspike/examples/data-examples/pom.xml
+++ b/deltaspike/examples/data-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-data-examples</artifactId>
diff --git a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Article.java b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Article.java
index 10505b6f0..0336b5f1a 100644
--- a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Article.java
+++ b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Article.java
@@ -20,13 +20,13 @@ package org.apache.deltaspike.example;
import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
@Entity
@Table(name = "articles")
diff --git a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java
index 8300191b9..1e371bee0 100644
--- a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java
+++ b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java
@@ -22,12 +22,12 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.logging.Logger;
-import javax.faces.application.FacesMessage;
-import javax.faces.bean.ViewScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.transaction.Transactional;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.bean.ViewScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.transaction.Transactional;
@Named
@ViewScoped
diff --git a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java
index 75755f4d5..2812157c0 100644
--- a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java
+++ b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java
@@ -25,8 +25,8 @@ import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
@Qualifier
@Retention(RUNTIME)
diff --git a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java
index b4edfa95e..a16106d0b 100644
--- a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java
+++ b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.example;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletRequest;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletRequest;
public class HttpParams
{
diff --git a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java
index 2cacecb6c..03b256cf6 100644
--- a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java
+++ b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.example;
import java.util.logging.Logger;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
public class LogProducer
{
diff --git a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Resources.java b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Resources.java
index 2d69e68b0..0fd74d145 100644
--- a/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Resources.java
+++ b/deltaspike/examples/data-examples/src/main/java/org/apache/deltaspike/example/Resources.java
@@ -18,16 +18,16 @@
*/
package org.apache.deltaspike.example;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.faces.context.FacesContext;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.faces.context.FacesContext;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
@ApplicationScoped
public class Resources
diff --git a/deltaspike/examples/jpa-examples/pom.xml b/deltaspike/examples/jpa-examples/pom.xml
index ec3591645..021c225b4 100644
--- a/deltaspike/examples/jpa-examples/pom.xml
+++ b/deltaspike/examples/jpa-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-jpa-examples</artifactId>
diff --git a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Article.java b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Article.java
index 10505b6f0..0336b5f1a 100644
--- a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Article.java
+++ b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Article.java
@@ -20,13 +20,13 @@ package org.apache.deltaspike.example;
import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
@Entity
@Table(name = "articles")
diff --git a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java
index 0c978a0f0..ecaacce6c 100644
--- a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java
+++ b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/ArticleController.java
@@ -22,13 +22,13 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.logging.Logger;
-import javax.faces.application.FacesMessage;
-import javax.faces.bean.ViewScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.bean.ViewScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
@Named
@ViewScoped
diff --git a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java
index 75755f4d5..2812157c0 100644
--- a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java
+++ b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParam.java
@@ -25,8 +25,8 @@ import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
@Qualifier
@Retention(RUNTIME)
diff --git a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java
index b4edfa95e..a16106d0b 100644
--- a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java
+++ b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/HttpParams.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.example;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletRequest;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletRequest;
public class HttpParams
{
diff --git a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java
index 2cacecb6c..03b256cf6 100644
--- a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java
+++ b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/LogProducer.java
@@ -19,8 +19,8 @@
package org.apache.deltaspike.example;
import java.util.logging.Logger;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
public class LogProducer
{
diff --git a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Resources.java b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Resources.java
index 2d69e68b0..0fd74d145 100644
--- a/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Resources.java
+++ b/deltaspike/examples/jpa-examples/src/main/java/org/apache/deltaspike/example/Resources.java
@@ -18,16 +18,16 @@
*/
package org.apache.deltaspike.example;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.faces.context.FacesContext;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.faces.context.FacesContext;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
@ApplicationScoped
public class Resources
diff --git a/deltaspike/examples/jse-examples/pom.xml b/deltaspike/examples/jse-examples/pom.xml
index f3c4e3e4d..998e90b69 100644
--- a/deltaspike/examples/jse-examples/pom.xml
+++ b/deltaspike/examples/jse-examples/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.deltaspike.examples</groupId>
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
index d26da0b68..52e2f6ced 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/beanmanagement/SimpleBeanLookupExample.java
@@ -26,7 +26,7 @@ import org.apache.deltaspike.example.echo.DefaultEchoService;
import org.apache.deltaspike.example.echo.EchoService;
import org.apache.deltaspike.example.optional.OptionalService;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.List;
import java.util.logging.Logger;
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/ConfigExample.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/ConfigExample.java
index 3d9627f94..78ec77c55 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/ConfigExample.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/ConfigExample.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.cdise.api.CdiContainerLoader;
import org.apache.deltaspike.cdise.api.ContextControl;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.logging.Logger;
public class ConfigExample
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomConfigPropertyProducer.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomConfigPropertyProducer.java
index f9acd94b7..240b3e813 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomConfigPropertyProducer.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomConfigPropertyProducer.java
@@ -20,10 +20,10 @@ package org.apache.deltaspike.example.config;
import org.apache.deltaspike.core.spi.config.BaseConfigPropertyProducer;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import java.util.logging.Logger;
/**
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
index 6e89cd323..8ab60d3f8 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.example.config;
import org.apache.deltaspike.core.api.config.PropertyFileConfig;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
* Allows to use a different file than apache-deltaspike.properties
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Location.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Location.java
index c69b6add0..7ffb3cabc 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Location.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Location.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.example.config;
import org.apache.deltaspike.core.api.config.ConfigProperty;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2.java
index f3b86ee8c..6f425af71 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.example.config;
import org.apache.deltaspike.core.api.config.ConfigProperty;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2WithInverseSupport.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2WithInverseSupport.java
index 6fd872d2f..339e64507 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2WithInverseSupport.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/Property2WithInverseSupport.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.example.config;
import org.apache.deltaspike.core.api.config.ConfigProperty;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/SettingsBean.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/SettingsBean.java
index fa65ddc40..55dae31f4 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/SettingsBean.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/SettingsBean.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.example.config;
import org.apache.deltaspike.core.api.config.ConfigProperty;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
@ApplicationScoped
public class SettingsBean
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/DefaultEchoService.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/DefaultEchoService.java
index f11172398..9452ec145 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/DefaultEchoService.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/DefaultEchoService.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.example.echo;
-import javax.enterprise.context.Dependent;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Named;
/**
* Default implementation
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToLowerCaseEchoService.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToLowerCaseEchoService.java
index 2d123ad6c..13c73bb33 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToLowerCaseEchoService.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToLowerCaseEchoService.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.example.echo;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
* Implementation of {@link EchoService} which returns the given text in lower-case format
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToUpperCaseEchoService.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToUpperCaseEchoService.java
index b9a20b773..9cf7c7ae0 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToUpperCaseEchoService.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/echo/ToUpperCaseEchoService.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.example.echo;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
* Implementation of {@link EchoService} which returns the given text in upper-case format
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
index 6e6c4fcac..fd2181475 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/metadata/NamingConventionAwareMetadataFilter.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.example.metadata;
import org.apache.deltaspike.core.api.literal.NamedLiteral;
import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.inject.Named;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.inject.Named;
/**
* Just a test filter to show the basic functionality provided by {@link AnnotatedTypeBuilder}
diff --git a/deltaspike/examples/jsf-examples/pom.xml b/deltaspike/examples/jsf-examples/pom.xml
index deda34c94..a0b014824 100644
--- a/deltaspike/examples/jsf-examples/pom.xml
+++ b/deltaspike/examples/jsf-examples/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-jsf-example</artifactId>
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/ControllerView.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/ControllerView.java
index b0f36aa07..8bb80ea23 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/ControllerView.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/ControllerView.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.example.message;
import org.apache.deltaspike.jsf.api.message.JsfMessage;
-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 java.util.Date;
/**
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/Custom.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/Custom.java
index 52bd5bbda..522f628aa 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/Custom.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/Custom.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.example.message;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/CustomMessageResolver.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/CustomMessageResolver.java
index 0b571d84f..888885405 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/CustomMessageResolver.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/CustomMessageResolver.java
@@ -21,8 +21,8 @@ package org.apache.deltaspike.example.message;
import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.jsf.impl.message.JsfMessageResolver;
-import javax.enterprise.inject.Specializes;
-import javax.faces.context.FacesContext;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.faces.context.FacesContext;
@Specializes
public class CustomMessageResolver extends JsfMessageResolver
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/LanguageView.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/LanguageView.java
index 9051fb991..a63383ebd 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/LanguageView.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/message/LanguageView.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.example.message;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.Locale;
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ApplicationScopedBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ApplicationScopedBean.java
index 7628f33fb..23c1494c8 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ApplicationScopedBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ApplicationScopedBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.example.scope;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
/**
*
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/RequestScopedBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/RequestScopedBean.java
index cce6951f2..739f5daf3 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/RequestScopedBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/RequestScopedBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.example.scope;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
/**
*
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/SessionScopedBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/SessionScopedBean.java
index 0d8341e7f..7628e3299 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/SessionScopedBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/SessionScopedBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.example.scope;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
/**
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewAccessScopedBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewAccessScopedBean.java
index 16d99bf76..2a7914aab 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewAccessScopedBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewAccessScopedBean.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.example.scope;
import java.io.Serializable;
-import javax.annotation.PostConstruct;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Named;
import org.apache.deltaspike.core.api.scope.ViewAccessScoped;
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewScopedBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewScopedBean.java
index 11909c342..3e3186ed4 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewScopedBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/ViewScopedBean.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.example.scope;
-import javax.annotation.PostConstruct;
-import javax.faces.bean.ViewScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.faces.bean.ViewScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
/**
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/WindowScopedBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/WindowScopedBean.java
index 4c439154f..91138a17d 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/WindowScopedBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/scope/WindowScopedBean.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.example.scope;
import java.io.Serializable;
-import javax.annotation.PostConstruct;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Named;
import org.apache.deltaspike.core.api.scope.WindowScoped;
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/MyBean.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/MyBean.java
index fbd89126d..3b03cdf38 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/MyBean.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/MyBean.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.example.viewconfig;
-import javax.enterprise.inject.Model;
+import jakarta.enterprise.inject.Model;
@Model
public class MyBean
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/PageController.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/PageController.java
index be1fccf01..904c32d07 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/PageController.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/viewconfig/PageController.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.example.viewconfig;
-import javax.enterprise.inject.Model;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Model;
+import jakarta.inject.Inject;
import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter;
import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameterContext;
diff --git a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/window/SampleClientWindowConfig.java b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/window/SampleClientWindowConfig.java
index 69f573ccf..3e0224f17 100644
--- a/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/window/SampleClientWindowConfig.java
+++ b/deltaspike/examples/jsf-examples/src/main/java/org/apache/deltaspike/example/window/SampleClientWindowConfig.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.example.window;
-import javax.enterprise.inject.Specializes;
-import javax.faces.context.FacesContext;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.faces.context.FacesContext;
import org.apache.deltaspike.jsf.spi.scope.window.DefaultClientWindowConfig;
diff --git a/deltaspike/examples/jsf-playground/pom.xml b/deltaspike/examples/jsf-playground/pom.xml
index 221b08538..5f81cd855 100644
--- a/deltaspike/examples/jsf-playground/pom.xml
+++ b/deltaspike/examples/jsf-playground/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-jsf-playground</artifactId>
diff --git a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundClientWindowConfig.java b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundClientWindowConfig.java
index 691dc8098..0e240b4e4 100644
--- a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundClientWindowConfig.java
+++ b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundClientWindowConfig.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.playground;
-import javax.enterprise.inject.Specializes;
-import javax.faces.context.FacesContext;
+import jakarta.enterprise.inject.Specializes;
+import jakarta.faces.context.FacesContext;
import org.apache.deltaspike.jsf.spi.scope.window.DefaultClientWindowConfig;
@Specializes
diff --git a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java
index f4f4bf03a..9175dd71f 100644
--- a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java
+++ b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/PlaygroundJsfModuleConfig.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.playground;
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.Specializes;
import org.apache.deltaspike.playground.exception.Jsf;
import org.apache.deltaspike.jsf.api.config.JsfModuleConfig;
diff --git a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java
index e42ea550d..9d4d0632b 100644
--- a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java
+++ b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/Jsf.java
@@ -24,7 +24,7 @@ import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Target( { TYPE, ElementType.PARAMETER } )
@Retention(RUNTIME)
diff --git a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java
index 32084c3f2..e95205b77 100644
--- a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java
+++ b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/exception/TestExceptionController.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.playground.exception;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
@Named
@RequestScoped
diff --git a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/scope/viewaccess/ViewAccessScopedBean.java b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/scope/viewaccess/ViewAccessScopedBean.java
index 701dcfdd5..cc5946142 100644
--- a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/scope/viewaccess/ViewAccessScopedBean.java
+++ b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/scope/viewaccess/ViewAccessScopedBean.java
@@ -19,9 +19,9 @@
package org.apache.deltaspike.playground.scope.viewaccess;
import java.io.Serializable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Named;
import org.apache.deltaspike.core.api.scope.ViewAccessScoped;
@Named
diff --git a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
index 847102918..c245f42b6 100644
--- a/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
+++ b/deltaspike/examples/jsf-playground/src/main/java/org/apache/deltaspike/playground/windowhandling/ViewActionController.java
@@ -19,11 +19,11 @@
package org.apache.deltaspike.playground.windowhandling;
import java.util.Date;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.deltaspike.jsf.spi.scope.window.ClientWindow;
@Named
diff --git a/deltaspike/examples/pom.xml b/deltaspike/examples/pom.xml
index b8d8db303..43d186bb4 100644
--- a/deltaspike/examples/pom.xml
+++ b/deltaspike/examples/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike</groupId>
<artifactId>parent</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/deltaspike/examples/scheduler-playground/pom.xml b/deltaspike/examples/scheduler-playground/pom.xml
index c6bb679c2..cec36d326 100644
--- a/deltaspike/examples/scheduler-playground/pom.xml
+++ b/deltaspike/examples/scheduler-playground/pom.xml
@@ -42,7 +42,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.deltaspike.examples</groupId>
diff --git a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/GlobalResultHolder.java b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/GlobalResultHolder.java
index 56fa83ada..d2fb77543 100644
--- a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/GlobalResultHolder.java
+++ b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/GlobalResultHolder.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.example.scheduler;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import java.util.concurrent.atomic.AtomicInteger;
@ApplicationScoped
diff --git a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/RequestScopedNumberProvider.java b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/RequestScopedNumberProvider.java
index f09cb20ea..f5ea4f5f2 100644
--- a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/RequestScopedNumberProvider.java
+++ b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/RequestScopedNumberProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.example.scheduler;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
import java.math.BigDecimal;
@RequestScoped
diff --git a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerExample.java b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerExample.java
index 94c68ad54..fe0ce66cf 100644
--- a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerExample.java
+++ b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerExample.java
@@ -23,7 +23,7 @@ import org.apache.deltaspike.cdise.api.CdiContainerLoader;
import org.apache.deltaspike.cdise.api.ContextControl;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.logging.Logger;
public class SimpleSchedulerExample
diff --git a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob1.java b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob1.java
index 734591b3d..665e95896 100644
--- a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob1.java
+++ b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob1.java
@@ -23,7 +23,7 @@ import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.logging.Logger;
@Scheduled(cronExpression = "0/2 * * * * ?")
diff --git a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob2.java b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob2.java
index fc011c57c..aa18145b4 100644
--- a/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob2.java
+++ b/deltaspike/examples/scheduler-playground/src/main/java/org/apache/deltaspike/example/scheduler/SimpleSchedulerJob2.java
@@ -23,7 +23,7 @@ import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.logging.Logger;
@Scheduled(cronExpression = "0/1 * * * * ?")
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml b/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
index cc8a1ddb2..d3e0a4efd 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/pom.xml
@@ -41,7 +41,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-security-requested-page-after-login-cdi</artifactId>
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
index cc7c372e8..77ebcf66c 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/AuthenticationListener.java
@@ -20,8 +20,8 @@ package org.apache.deltaspike.example.security.requestedpage.cdi;
import org.apache.deltaspike.core.api.config.view.navigation.ViewNavigationHandler;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
public class AuthenticationListener
{
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoggedInAccessDecisionVoter.java b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoggedInAccessDecisionVoter.java
index 7a8d7870a..c4856d216 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoggedInAccessDecisionVoter.java
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoggedInAccessDecisionVoter.java
@@ -24,9 +24,9 @@ import org.apache.deltaspike.security.api.authorization.AbstractAccessDecisionVo
import org.apache.deltaspike.security.api.authorization.AccessDecisionVoterContext;
import org.apache.deltaspike.security.api.authorization.SecurityViolation;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
import java.util.Set;
@SessionScoped //or @WindowScoped
diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoginController.java b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoginController.java
index 7b6c5f968..bc9e3731d 100644
--- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoginController.java
+++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/java/org/apache/deltaspike/example/security/requestedpage/cdi/LoginController.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.example.security.requestedpage.cdi;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
@RequestScoped
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml b/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
index 79b20fa23..0607aa143 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/pom.xml
@@ -41,7 +41,7 @@
<parent>
<groupId>org.apache.deltaspike.examples</groupId>
<artifactId>examples-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-security-requested-page-after-login-picketlink</artifactId>
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
index 2d2d53bdf..6dfcf3b3c 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/AuthenticationListener.java
@@ -23,8 +23,8 @@ import org.picketlink.authentication.event.LoggedInEvent;
import org.picketlink.authentication.event.LoginFailedEvent;
import org.picketlink.authentication.event.PostLoggedOutEvent;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
public class AuthenticationListener
{
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
index 35a287e9f..5cf513cd9 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/Initializer.java
@@ -23,10 +23,10 @@ import org.picketlink.idm.PartitionManager;
import org.picketlink.idm.credential.Password;
import org.picketlink.idm.model.basic.User;
-import javax.annotation.PostConstruct;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.inject.Inject;
/**
* This startup bean creates the default users, groups and roles when the application is started.
diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/LoggedInAccessDecisionVoter.java b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/LoggedInAccessDecisionVoter.java
index 2abfeef1c..25fb3c5dc 100644
--- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/LoggedInAccessDecisionVoter.java
+++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/java/org/apache/deltaspike/example/security/requestedpage/picketlink/LoggedInAccessDecisionVoter.java
@@ -25,9 +25,9 @@ import org.apache.deltaspike.security.api.authorization.AccessDecisionVoterConte
import org.apache.deltaspike.security.api.authorization.SecurityViolation;
import org.picketlink.Identity;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
import java.util.Set;
@SessionScoped //or @WindowScoped
diff --git a/deltaspike/modules/data/api/pom.xml b/deltaspike/modules/data/api/pom.xml
index caf48236c..340c73f10 100755
--- a/deltaspike/modules/data/api/pom.xml
+++ b/deltaspike/modules/data/api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>data-module-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-data-module-api</artifactId>
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/AbstractEntityRepository.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/AbstractEntityRepository.java
index 529c474d8..20b5fcc9c 100755
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/AbstractEntityRepository.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/AbstractEntityRepository.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.data.api;
import java.io.Serializable;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaQuery;
/**
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityCountRepository.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityCountRepository.java
index b7d0870a9..2e8df211e 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityCountRepository.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityCountRepository.java
@@ -19,7 +19,7 @@
package org.apache.deltaspike.data.api;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
public interface EntityCountRepository<E>
{
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerConfig.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerConfig.java
index b3a032f84..2499cf03f 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerConfig.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerConfig.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.api;
-import javax.persistence.FlushModeType;
+import jakarta.persistence.FlushModeType;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerDelegate.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerDelegate.java
index e98a32284..5e155671a 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerDelegate.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityManagerDelegate.java
@@ -20,12 +20,12 @@ package org.apache.deltaspike.data.api;
import java.util.Map;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.metamodel.Metamodel;
/**
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityRepository.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityRepository.java
index 9aa57ccbe..dd03d04ec 100755
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityRepository.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityRepository.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.List;
import java.util.Optional;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
/**
* Base Repository interface. All methods are implemented by the CDI extension.
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Query.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Query.java
index c5eef1831..04bbc9124 100755
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Query.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Query.java
@@ -24,8 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.persistence.LockModeType;
-import javax.persistence.QueryHint;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.QueryHint;
/**
* Supply query meta data to a method with this annotation.<br/>
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/QueryResult.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/QueryResult.java
index 8fe7369f6..bc4cb358a 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/QueryResult.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/QueryResult.java
@@ -20,9 +20,9 @@ package org.apache.deltaspike.data.api;
import java.util.List;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.metamodel.SingularAttribute;
/**
* Can be used as query result type, which will not execute the query immediately.
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java
index 940ff64ca..e2a5ad66d 100755
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
import org.apache.deltaspike.partialbean.api.PartialBeanBinding;
-import javax.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Stereotype;
/**
* The Repository annotation needs to be present in order to have the
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/audit/CurrentUser.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/audit/CurrentUser.java
index 3e5f11de4..4f35d8b91 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/audit/CurrentUser.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/audit/CurrentUser.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Identifies the current user responsible for entity creation or modification.
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/Criteria.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/Criteria.java
index 72ab6619d..0682fc7d7 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/Criteria.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/Criteria.java
@@ -21,17 +21,17 @@ package org.apache.deltaspike.data.api.criteria;
import java.util.Collection;
import java.util.List;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
/**
* Criteria API utilities.
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/CriteriaSupport.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/CriteriaSupport.java
index 5d8288fcb..4537b947f 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/CriteriaSupport.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/CriteriaSupport.java
@@ -18,9 +18,9 @@
*/
package org.apache.deltaspike.data.api.criteria;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.metamodel.SingularAttribute;
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/QuerySelection.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/QuerySelection.java
index 84f4a0557..d2ed50835 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/QuerySelection.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/criteria/QuerySelection.java
@@ -18,10 +18,10 @@
*/
package org.apache.deltaspike.data.api.criteria;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Selection;
/**
* Used for selection queries with the simplified Criteria API.
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
index e82fe31d0..d15c0790e 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.deltaspike.data.spi.QueryInvocationContext;
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/QueryInvocationContext.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/QueryInvocationContext.java
index a92d29b80..9339ca999 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/QueryInvocationContext.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/spi/QueryInvocationContext.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.spi;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import java.lang.reflect.Method;
/**
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index c21b9f6ad..b3fa8b83f 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.deltaspike.modules</groupId>
<artifactId>data-module-project</artifactId>
- <version>1.9.6-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>deltaspike-data-module-impl</artifactId>
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
index 0bd76fb33..cd68725a1 100755
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditEntityListener.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditEntityListener.java
index 1caf03917..cabbc4495 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditEntityListener.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/AuditEntityListener.java
@@ -20,10 +20,10 @@ package org.apache.deltaspike.data.impl.audit;
import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/PrincipalProvider.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/PrincipalProvider.java
index 78d8b327a..8f5d746dd 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/PrincipalProvider.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/audit/PrincipalProvider.java
@@ -21,9 +21,9 @@ package org.apache.deltaspike.data.impl.audit;
import java.util.Set;
import java.util.logging.Level;
-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 org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
import org.apache.deltaspike.data.api.audit.CreatedBy;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
index 487e855bf..f1dbd558e 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
@@ -23,12 +23,12 @@ import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.param.Parameters;
import org.apache.deltaspike.data.impl.util.jpa.QueryStringExtractorFactory;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.deltaspike.core.util.ClassUtils;
import static org.apache.deltaspike.core.util.StringUtils.isNotEmpty;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/DelegateQueryBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/DelegateQueryBuilder.java
index ec34101f9..0793b77bc 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/DelegateQueryBuilder.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/DelegateQueryBuilder.java
@@ -25,14 +25,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.persistence.PersistenceException;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.persistence.PersistenceException;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.util.ClassUtils;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/MethodQueryBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/MethodQueryBuilder.java
index 9eeec897c..feb78be46 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/MethodQueryBuilder.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/MethodQueryBuilder.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.data.impl.builder;
-import javax.enterprise.context.ApplicationScoped;
-import javax.persistence.Query;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.builder.part.QueryRoot;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java
index ee1ee3e5f..6bddfba52 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java
@@ -22,7 +22,7 @@ import org.apache.deltaspike.data.api.QueryResult;
import org.apache.deltaspike.data.api.mapping.QueryInOutMapper;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import java.text.MessageFormat;
import java.util.List;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java
index 481ef3420..3dc944a32 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java
@@ -22,8 +22,8 @@ import static org.apache.deltaspike.data.impl.meta.RepositoryMethodType.ANNOTATE
import static org.apache.deltaspike.data.impl.meta.RepositoryMethodType.DELEGATE;
import static org.apache.deltaspike.data.impl.meta.RepositoryMethodType.PARSE;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.deltaspike.data.api.QueryResult;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
index d71afa4e4..284cdfcfb 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java
@@ -24,7 +24,7 @@ import static org.apache.deltaspike.data.impl.util.QueryUtils.nullSafeValue;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java
index 3733a57f4..3d02097b4 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FirstResultPostProcessor.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.impl.builder.postprocessor;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
index a97e8b46b..5dec7a892 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/FlushModePostProcessor.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.data.impl.builder.postprocessor;
-import javax.persistence.FlushModeType;
-import javax.persistence.Query;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
index beb772243..887513ef6 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/HintPostProcessor.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.impl.builder.postprocessor;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
index 6c21f8c44..7b3a6a1c8 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/LockModePostProcessor.java
@@ -18,8 +18,8 @@
*/
package org.apache.deltaspike.data.impl.builder.postprocessor;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java
index d97f61826..6da7f05a2 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/MaxResultPostProcessor.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.impl.builder.postprocessor;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
import org.apache.deltaspike.data.impl.handler.JpaQueryPostProcessor;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/OrderByQueryStringPostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/OrderByQueryStringPostProcessor.java
index edc0f4695..a7e4d2a8e 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/OrderByQueryStringPostProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/OrderByQueryStringPostProcessor.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.impl.builder.postprocessor;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
import org.apache.deltaspike.data.impl.builder.OrderDirection;
import org.apache.deltaspike.data.impl.builder.QueryBuilder;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/DefaultQueryResult.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/DefaultQueryResult.java
index bc70a1f85..634594b73 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/DefaultQueryResult.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/DefaultQueryResult.java
@@ -21,11 +21,11 @@ package org.apache.deltaspike.data.impl.builder.result;
import java.util.Iterator;
import java.util.List;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.SingularAttribute;
import org.apache.deltaspike.data.api.QueryResult;
import org.apache.deltaspike.data.impl.builder.OrderDirection;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessor.java
index deb7993b9..184e8324a 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessor.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessor.java
@@ -18,7 +18,7 @@
*/
package org.apache.deltaspike.data.impl.builder.result;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import org.apache.deltaspike.data.impl.handler.CdiQueryInvocationContext;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java
index 06fc3b06e..baf38dc5b 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java
@@ -21,11 +21,11 @@ package org.apache.deltaspike.data.impl.builder.result;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.data.api.Modifying;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/QueryCriteria.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/QueryCriteria.java
index 5a2aec2f6..7a7836750 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/QueryCriteria.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/QueryCriteria.java
@@ -26,22 +26,22 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Selection;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Selection;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
import org.apache.deltaspike.data.api.criteria.Criteria;
import org.apache.deltaspike.data.api.criteria.QuerySelection;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Between.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Between.java
index 8d80b4f37..641df8d5d 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Between.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Between.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class Between<E, V extends Comparable<? super V>> extends SingleValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Eq.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Eq.java
index 4c94e8a18..a837b2917 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Eq.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/Eq.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class Eq<E, V> extends SingleValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/EqIgnoreCase.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/EqIgnoreCase.java
index 2f9395496..460bc0bb4 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/EqIgnoreCase.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/EqIgnoreCase.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class EqIgnoreCase<E> extends SingleValueBuilder<E, String>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/FetchBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/FetchBuilder.java
index 59ae33128..595c4664a 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/FetchBuilder.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/FetchBuilder.java
@@ -21,13 +21,13 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Collections;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
public class FetchBuilder<P, R, E> implements PredicateBuilder<P>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThan.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThan.java
index 6bf61d722..aeb9e1747 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThan.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThan.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class GreaterThan<E, V extends Comparable<? super V>> extends SingleValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThanOrEqual.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThanOrEqual.java
index 0e2201f47..b9226323a 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThanOrEqual.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/GreaterThanOrEqual.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class GreaterThanOrEqual<E, V extends Comparable<? super V>> extends SingleValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/In.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/In.java
index 4ac343508..aaaf08816 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/In.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/In.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class In<P, V> implements PredicateBuilder<P>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsEmpty.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsEmpty.java
index 50d3fcd51..1ed992340 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsEmpty.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsEmpty.java
@@ -22,10 +22,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class IsEmpty<E, V extends Collection<?>> extends NoValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotEmpty.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotEmpty.java
index 116c2ff47..cac2ea6e9 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotEmpty.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotEmpty.java
@@ -22,10 +22,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class IsNotEmpty<E, V extends Collection<?>> extends NoValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotNull.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotNull.java
index 89a09fe10..0cc9d0c88 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotNull.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNotNull.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class IsNotNull<E, V> extends NoValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNull.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNull.java
index af83f4d1a..743c64b34 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNull.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/IsNull.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class IsNull<E, V> extends NoValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/JoinBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/JoinBuilder.java
index 1480d5003..ad5dbd67b 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/JoinBuilder.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/JoinBuilder.java
@@ -20,17 +20,17 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
import org.apache.deltaspike.data.api.criteria.Criteria;
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThan.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThan.java
index 6086da2a5..287b09c07 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThan.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThan.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.SingularAttribute;
public class LessThan<E, V extends Comparable<? super V>> extends SingleValueBuilder<E, V>
{
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThanOrEqual.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThanOrEqual.java
index cc2ac2e41..b9d40e873 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThanOrEqual.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/predicate/LessThanOrEqual.java
@@ -21,10 +21,10 @@ package org.apache.deltaspike.data.impl.criteria.predicate;
import java.util.Arrays;
import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
... 14537 lines suppressed ...