diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 7c0ecb3ac7fd..ad3007b61870 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -1152,19 +1152,13 @@
org.jboss.weld.servlet
weld-servlet-shaded
- 3.1.9.Final
-
-
-
- org.glassfish.hk2.external
- bean-validator
- 2.5.0-b06
+ 4.0.0.Final
- org.glassfish.hk2
- hk2-locator
- 2.5.0
+ org.glassfish.jersey.inject
+ jersey-cdi2-se
+ 3.0.0
diff --git a/dotCMS/pom.xml b/dotCMS/pom.xml
index 0563719b8027..6b3945f67923 100644
--- a/dotCMS/pom.xml
+++ b/dotCMS/pom.xml
@@ -1411,18 +1411,12 @@
org.jboss.weld.servlet
weld-servlet-shaded
- 3.1.9.Final
+ 4.0.0.Final
- org.glassfish.hk2.external
- bean-validator
- 2.5.0-b06
-
-
-
- org.glassfish.hk2
- hk2-locator
+ org.glassfish.jersey.inject
+ jersey-cdi2-se
diff --git a/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsAPIImpl.java b/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsAPIImpl.java
index 20fe838477ec..cc7ea6018648 100644
--- a/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsAPIImpl.java
+++ b/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsAPIImpl.java
@@ -5,7 +5,7 @@
import com.dotmarketing.util.Logger;
import com.liferay.portal.model.User;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
/**
diff --git a/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsFactoryImpl.java b/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsFactoryImpl.java
index b17cacd3ad98..611dab0eeeec 100644
--- a/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsFactoryImpl.java
+++ b/dotCMS/src/main/java/com/dotcms/analytics/content/ContentAnalyticsFactoryImpl.java
@@ -11,8 +11,7 @@
import com.dotmarketing.exception.DotSecurityException;
import com.dotmarketing.util.Logger;
import com.liferay.portal.model.User;
-
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
diff --git a/dotCMS/src/main/java/com/dotcms/analytics/query/AnalyticsQueryParser.java b/dotCMS/src/main/java/com/dotcms/analytics/query/AnalyticsQueryParser.java
index fb0426549a81..12273b8844d2 100644
--- a/dotCMS/src/main/java/com/dotcms/analytics/query/AnalyticsQueryParser.java
+++ b/dotCMS/src/main/java/com/dotcms/analytics/query/AnalyticsQueryParser.java
@@ -10,8 +10,7 @@
import com.dotmarketing.util.UtilMethods;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.vavr.Tuple2;
-
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/dotCMS/src/main/java/com/dotcms/business/APILocatorProducers.java b/dotCMS/src/main/java/com/dotcms/business/APILocatorProducers.java
deleted file mode 100644
index 631e9b47683d..000000000000
--- a/dotCMS/src/main/java/com/dotcms/business/APILocatorProducers.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dotcms.business;
-
-import com.dotmarketing.business.APILocator;
-import com.dotmarketing.portlets.contentlet.business.HostAPI;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-/**
- * This class is useful to include classes are not into the CDI container but
- * wants to be available to be injected.
- * Most of the {@link com.dotmarketing.business.APILocator} classes will be eventually here.
- * @author jsanca
- */
-@ApplicationScoped
-public class APILocatorProducers {
-
- @Produces
- public HostAPI getHostAPI() {
- return APILocator.getHostAPI();
- }
-}
diff --git a/dotCMS/src/main/java/com/dotcms/business/FactoryLocatorProducers.java b/dotCMS/src/main/java/com/dotcms/business/FactoryLocatorProducers.java
deleted file mode 100644
index 0c2d4cf8fe3a..000000000000
--- a/dotCMS/src/main/java/com/dotcms/business/FactoryLocatorProducers.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dotcms.business;
-
-import com.dotcms.cube.CubeJSClientFactory;
-import com.dotmarketing.business.FactoryLocator;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-/**
- * This class is useful to include classes are not into the CDI container but
- * wants to be available to be injected.
- * Most of the {@link FactoryLocator} classes will be eventually here.
- * @author jsanca
- */
-@ApplicationScoped
-public class FactoryLocatorProducers {
-
-
- @Produces
- public CubeJSClientFactory getCubeJSClientFactory() {
- return FactoryLocator.getCubeJSClientFactory();
- }
-}
diff --git a/dotCMS/src/main/java/com/dotcms/cdi/CDIUtils.java b/dotCMS/src/main/java/com/dotcms/cdi/CDIUtils.java
index 296b09eeab28..b92d5e7382bf 100644
--- a/dotCMS/src/main/java/com/dotcms/cdi/CDIUtils.java
+++ b/dotCMS/src/main/java/com/dotcms/cdi/CDIUtils.java
@@ -2,7 +2,7 @@
import com.dotmarketing.util.Logger;
import java.util.Optional;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDI;
/**
* Utility class to get beans from CDI container
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorFactory.java b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorFactory.java
index 71855f94d630..f0a6be58983a 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorFactory.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorFactory.java
@@ -3,7 +3,7 @@
import com.dotcms.jobs.business.error.JobProcessorInstantiationException;
import com.dotcms.jobs.business.processor.JobProcessor;
import com.dotmarketing.util.Logger;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class JobProcessorFactory {
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorScanner.java b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorScanner.java
index 701f2f06b6af..f34d6a76ec39 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorScanner.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobProcessorScanner.java
@@ -2,12 +2,12 @@
import com.dotcms.jobs.business.processor.JobProcessor;
import com.dotmarketing.util.Logger;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.Index;
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueConfigProducer.java b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueConfigProducer.java
index 8e10fe7e47b9..088f91348bfc 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueConfigProducer.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueConfigProducer.java
@@ -1,9 +1,8 @@
package com.dotcms.jobs.business.api;
import com.dotmarketing.util.Config;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
/**
* This class is responsible for producing the configuration for the Job Queue system. It is
* application-scoped, meaning a single instance is created for the entire application.
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueManagerAPIImpl.java b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueManagerAPIImpl.java
index f3b4186b1af7..7ae0c49ea65a 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueManagerAPIImpl.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueManagerAPIImpl.java
@@ -33,6 +33,7 @@
import com.dotmarketing.exception.DotRuntimeException;
import com.dotmarketing.util.Logger;
import com.google.common.annotations.VisibleForTesting;
+import jakarta.enterprise.context.ApplicationScoped;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Arrays;
@@ -48,7 +49,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
/**
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/EventProducer.java b/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/EventProducer.java
index f6f22e3570f5..85d6d1af4925 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/EventProducer.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/EventProducer.java
@@ -1,9 +1,9 @@
package com.dotcms.jobs.business.api.events;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
/**
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/RealTimeJobMonitor.java b/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/RealTimeJobMonitor.java
index c55466f1f62a..a5d66875e02c 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/RealTimeJobMonitor.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/api/events/RealTimeJobMonitor.java
@@ -1,14 +1,14 @@
package com.dotcms.jobs.business.api.events;
import com.dotcms.jobs.business.job.Job;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Consumer;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
/**
* Manages real-time monitoring of jobs in the system. This class handles registration of job
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/error/CircuitBreaker.java b/dotCMS/src/main/java/com/dotcms/jobs/business/error/CircuitBreaker.java
index ee6b0d3147b7..4926506cf205 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/error/CircuitBreaker.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/error/CircuitBreaker.java
@@ -3,8 +3,8 @@
import com.dotmarketing.util.Config;
import com.dotmarketing.util.Logger;
import com.google.common.annotations.VisibleForTesting;
+import jakarta.enterprise.context.ApplicationScoped;
import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
/**
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/error/RetryStrategyProducer.java b/dotCMS/src/main/java/com/dotcms/jobs/business/error/RetryStrategyProducer.java
index ca3b48b8fb7e..e07e0af440c2 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/error/RetryStrategyProducer.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/error/RetryStrategyProducer.java
@@ -1,8 +1,8 @@
package com.dotcms.jobs.business.error;
import com.dotmarketing.util.Config;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
/**
* This class is responsible for producing the default RetryStrategy used in the application. It is
diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/queue/JobQueueProducer.java b/dotCMS/src/main/java/com/dotcms/jobs/business/queue/JobQueueProducer.java
deleted file mode 100644
index 1596e9fb17d6..000000000000
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/queue/JobQueueProducer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.dotcms.jobs.business.queue;
-
-import com.dotmarketing.util.Config;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-/**
- * This class is responsible for producing the JobQueue implementation used in the application. It
- * is application-scoped, meaning a single instance is created for the entire application.
- */
-@ApplicationScoped
-public class JobQueueProducer {
-
- // The type of job queue implementation to use
- private static final String JOB_QUEUE_IMPLEMENTATION_TYPE = Config.getStringProperty(
- "JOB_QUEUE_IMPLEMENTATION_TYPE", "postgres"
- );
-
- /**
- * Produces a JobQueue instance. This method is called by the CDI container to create a JobQueue
- * instance when it is needed for dependency injection.
- *
- * @return A JobQueue instance
- */
- @Produces
- @ApplicationScoped
- public JobQueue produceJobQueue() {
-
- if (JOB_QUEUE_IMPLEMENTATION_TYPE.equals("postgres")) {
- return new PostgresJobQueue();
- }
-
- throw new IllegalStateException(
- "Unknown job queue implementation type: " + JOB_QUEUE_IMPLEMENTATION_TYPE
- );
- }
-
-}
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/apps/AppsResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/apps/AppsResource.java
index c6a83ec601f3..9442e2db6753 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/apps/AppsResource.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/apps/AppsResource.java
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Optional;
+import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.BeanParam;
@@ -42,6 +43,9 @@
@Path("/v1/apps")
public class AppsResource {
+ @Inject
+ SayHelloBean sayHelloBean;
+
private final WebResource webResource;
private AppsHelper helper;
@@ -74,6 +78,7 @@ public final Response listAvailableApps(@Context final HttpServletRequest reques
@Context final HttpServletResponse response,
@QueryParam("filter") final String filter
) {
+ sayHelloBean.sayHello();
try {
final InitDataObject initData =
new WebResource.InitBuilder(webResource)
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueHelper.java
index cf990ad0fac9..297322a3dbe6 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueHelper.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueHelper.java
@@ -17,6 +17,7 @@
import com.dotmarketing.util.Logger;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.annotations.VisibleForTesting;
+import jakarta.enterprise.context.ApplicationScoped;
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.time.format.DateTimeFormatter;
@@ -27,7 +28,6 @@
import java.util.function.Consumer;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
diff --git a/dotCMS/src/main/java/com/dotcms/rest/config/ContainerReloader.java b/dotCMS/src/main/java/com/dotcms/rest/config/ContainerReloader.java
index 969420976ad0..b94f6a7eb887 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/config/ContainerReloader.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/config/ContainerReloader.java
@@ -2,7 +2,7 @@
import com.dotmarketing.util.Logger;
import java.util.concurrent.atomic.AtomicReference;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import javax.ws.rs.ext.Provider;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.server.spi.AbstractContainerLifecycleListener;
diff --git a/dotCMS/src/main/java/com/dotcms/rest/config/JerseyApplicationEventListener.java b/dotCMS/src/main/java/com/dotcms/rest/config/JerseyApplicationEventListener.java
index 0f0970bed5ab..8f61fb0a2116 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/config/JerseyApplicationEventListener.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/config/JerseyApplicationEventListener.java
@@ -3,7 +3,7 @@
import com.dotmarketing.util.Logger;
import java.util.Objects;
import java.util.Set;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import javax.ws.rs.ext.Provider;
import org.glassfish.jersey.server.monitoring.ApplicationEvent;
import org.glassfish.jersey.server.monitoring.ApplicationEvent.Type;
diff --git a/dotCMS/src/main/webapp/WEB-INF/beans.xml b/dotCMS/src/main/webapp/WEB-INF/beans.xml
index 1675ad7ab74c..ab0aca0b0aa9 100644
--- a/dotCMS/src/main/webapp/WEB-INF/beans.xml
+++ b/dotCMS/src/main/webapp/WEB-INF/beans.xml
@@ -1,9 +1,11 @@
-
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ version="2.0" bean-discovery-mode="all">
+
+
\ No newline at end of file
diff --git a/dotCMS/src/test/resources/META-INF/beans.xml b/dotCMS/src/test/resources/META-INF/beans.xml
index 1675ad7ab74c..ab0aca0b0aa9 100644
--- a/dotCMS/src/test/resources/META-INF/beans.xml
+++ b/dotCMS/src/test/resources/META-INF/beans.xml
@@ -1,9 +1,11 @@
-
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ version="2.0" bean-discovery-mode="all">
+
+
\ No newline at end of file
diff --git a/dotcms-integration/src/test/java/com/dotcms/TestBaseJunit5WeldInitiator.java b/dotcms-integration/src/test/java/com/dotcms/TestBaseJunit5WeldInitiator.java
index b65843c090dc..cd18ba7ec63c 100644
--- a/dotcms-integration/src/test/java/com/dotcms/TestBaseJunit5WeldInitiator.java
+++ b/dotcms-integration/src/test/java/com/dotcms/TestBaseJunit5WeldInitiator.java
@@ -11,7 +11,6 @@
import com.dotcms.jobs.business.error.RetryStrategy;
import com.dotcms.jobs.business.error.RetryStrategyProducer;
import com.dotcms.jobs.business.queue.JobQueue;
-import com.dotcms.jobs.business.queue.JobQueueProducer;
import com.dotcms.rest.api.v1.job.JobQueueHelper;
import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
import org.jboss.weld.junit5.WeldInitiator;
@@ -29,7 +28,7 @@ public class TestBaseJunit5WeldInitiator {
.containerId(RegistrySingletonProvider.STATIC_INSTANCE)
.beanClasses(JobQueueManagerAPIImpl.class, JobQueueConfig.class,
JobQueue.class, RetryStrategy.class, CircuitBreaker.class,
- JobQueueProducer.class, JobQueueConfigProducer.class,
+ JobQueueConfigProducer.class,
RetryStrategyProducer.class, RealTimeJobMonitor.class,
EventProducer.class, JobProcessorFactory.class, JobQueueHelper.class,
JobProcessorScanner.class
diff --git a/dotcms-integration/src/test/java/com/dotcms/jobs/business/api/JobQueueManagerAPITest.java b/dotcms-integration/src/test/java/com/dotcms/jobs/business/api/JobQueueManagerAPITest.java
index 28d1e137bbbc..55f965b1b96a 100644
--- a/dotcms-integration/src/test/java/com/dotcms/jobs/business/api/JobQueueManagerAPITest.java
+++ b/dotcms-integration/src/test/java/com/dotcms/jobs/business/api/JobQueueManagerAPITest.java
@@ -58,7 +58,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
diff --git a/dotcms-integration/src/test/java/com/dotcms/util/IntegrationTestInitService.java b/dotcms-integration/src/test/java/com/dotcms/util/IntegrationTestInitService.java
index 9711a2000a10..a92d3f8d9ecb 100644
--- a/dotcms-integration/src/test/java/com/dotcms/util/IntegrationTestInitService.java
+++ b/dotcms-integration/src/test/java/com/dotcms/util/IntegrationTestInitService.java
@@ -13,7 +13,6 @@
import com.dotcms.jobs.business.error.RetryStrategy;
import com.dotcms.jobs.business.error.RetryStrategyProducer;
import com.dotcms.jobs.business.queue.JobQueue;
-import com.dotcms.jobs.business.queue.JobQueueProducer;
import com.dotcms.repackage.org.apache.struts.Globals;
import com.dotcms.repackage.org.apache.struts.config.ModuleConfig;
import com.dotcms.repackage.org.apache.struts.config.ModuleConfigFactory;
@@ -69,7 +68,6 @@ public void init() throws Exception {
JobQueue.class,
RetryStrategy.class,
CircuitBreaker.class,
- JobQueueProducer.class,
JobQueueConfigProducer.class,
RetryStrategyProducer.class,
RealTimeJobMonitor.class,
diff --git a/dotcms-integration/src/test/resources/META-INF/beans.xml b/dotcms-integration/src/test/resources/META-INF/beans.xml
index 1675ad7ab74c..ab0aca0b0aa9 100644
--- a/dotcms-integration/src/test/resources/META-INF/beans.xml
+++ b/dotcms-integration/src/test/resources/META-INF/beans.xml
@@ -1,9 +1,11 @@
-
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ version="2.0" bean-discovery-mode="all">
+
+
\ No newline at end of file
diff --git a/tools/dotcms-cli/api-data-model/src/main/resources/META-INF/beans.xml b/tools/dotcms-cli/api-data-model/src/main/resources/META-INF/beans.xml
index e6b40014a206..ab0aca0b0aa9 100644
--- a/tools/dotcms-cli/api-data-model/src/main/resources/META-INF/beans.xml
+++ b/tools/dotcms-cli/api-data-model/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,11 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ version="2.0" bean-discovery-mode="all">
+
+
+
+
+
\ No newline at end of file