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 3be1a101249805caa81ffa15abc360b6d8030db0 Author: Mark Struberg <[email protected]> AuthorDate: Sun Nov 12 15:10:35 2023 +0100 DELTASPIKE-1466 move to CDI-3.0 style beans.xml Also explicitly define a bean-discovery-mode to prevent backward compat issues with non backward compatible CDI-4.0 spec changes. --- .../impl-openejb/src/main/resources/META-INF/beans.xml | 6 ++++-- .../cdictrl/impl-owb/src/main/resources/META-INF/beans.xml | 6 ++++-- deltaspike/cdictrl/pom.xml | 4 ++-- deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml | 6 ++++-- deltaspike/core/api/src/main/resources/META-INF/beans.xml | 6 ++++-- .../deltaspike/core/impl/future/FutureableInterceptor.java | 2 ++ .../apache/deltaspike/core/impl/lock/LockedInterceptor.java | 2 ++ .../core/impl/monitoring/InvocationMonitorInterceptor.java | 2 ++ .../core/impl/throttling/ThrottledInterceptor.java | 2 ++ deltaspike/core/impl/src/main/resources/META-INF/beans.xml | 12 ++++-------- deltaspike/core/impl/src/test/resources/META-INF/beans.xml | 6 ++++-- deltaspike/dist/bom/pom.xml | 6 ------ deltaspike/dist/full/pom.xml | 6 ------ .../examples/data-examples/src/main/webapp/WEB-INF/beans.xml | 8 +++++--- .../examples/jpa-examples/src/main/webapp/WEB-INF/beans.xml | 8 +++++--- .../jse-examples/src/main/resources/META-INF/beans.xml | 6 ++++-- .../examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml | 8 +++++--- .../jsf-playground/src/main/resources/META-INF/beans.xml | 6 ++++-- .../jsf-playground/src/main/webapp/WEB-INF/beans.xml | 8 +++++--- .../src/main/resources/META-INF/beans.xml | 6 ++++-- .../src/main/webapp/WEB-INF/beans.xml | 9 +++++---- .../src/main/webapp/WEB-INF/beans.xml | 9 +++++---- .../modules/data/impl/src/main/resources/META-INF/beans.xml | 11 +++++------ .../modules/jpa/api/src/main/resources/META-INF/beans.xml | 6 ++++-- .../jpa/impl/entitymanager/EntityManagerFactoryProducer.java | 2 ++ .../jpa/impl/transaction/TransactionalInterceptor.java | 2 ++ .../modules/jpa/impl/src/main/resources/META-INF/beans.xml | 9 ++++----- .../modules/jpa/impl/src/test/resources/META-INF/beans.xml | 7 ++++--- .../modules/jsf/api/src/main/resources/META-INF/beans.xml | 6 ++++-- .../view/navigation/NavigationParameterInterceptor.java | 2 ++ .../view/navigation/NavigationParameterListInterceptor.java | 2 ++ .../modules/jsf/impl/src/main/resources/META-INF/beans.xml | 10 ++++------ .../ViewAccessScopedWithFViewActionWebAppTest.java | 4 ++-- .../modules/jsf/impl/src/test/resources/META-INF/beans.xml | 7 ++++--- .../partial-bean/api/src/main/resources/META-INF/beans.xml | 7 +++++-- .../partial-bean/impl/src/main/resources/META-INF/beans.xml | 6 ++++-- .../partial-bean/impl/src/test/resources/META-INF/beans.xml | 7 ++++--- .../modules/proxy/api/src/main/resources/META-INF/beans.xml | 7 ++++--- .../proxy/impl-asm/src/main/resources/META-INF/beans.xml | 6 ++++-- .../scheduler/api/src/main/resources/META-INF/beans.xml | 6 ++++-- .../scheduler/impl/src/main/resources/META-INF/beans.xml | 6 ++++-- .../scheduler/impl/src/test/resources/META-INF/beans.xml | 7 ++++--- .../security/api/src/main/resources/META-INF/beans.xml | 7 +++++-- .../security/impl/extension/SecurityInterceptor.java | 2 ++ .../security/impl/src/main/resources/META-INF/beans.xml | 9 ++++----- .../security/impl/src/test/resources/META-INF/beans.xml | 7 ++++--- .../test-control/impl/src/main/resources/META-INF/beans.xml | 6 ++++-- .../test-control/impl/src/test/resources/META-INF/beans.xml | 6 ++++-- deltaspike/pom.xml | 2 +- 49 files changed, 172 insertions(+), 121 deletions(-) diff --git a/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml +++ b/deltaspike/cdictrl/impl-openejb/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml +++ b/deltaspike/cdictrl/impl-owb/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml index 42acb709b..999179d2f 100644 --- a/deltaspike/cdictrl/pom.xml +++ b/deltaspike/cdictrl/pom.xml @@ -44,9 +44,9 @@ <module>api</module> <module>impl-owb</module> <module>impl-weld</module> - <!-- +<!-- <module>impl-openejb</module> - --> +--> <module>tck</module> </modules> </profile> diff --git a/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml b/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml +++ b/deltaspike/cdictrl/tck/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/core/api/src/main/resources/META-INF/beans.xml b/deltaspike/core/api/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/core/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/core/api/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> 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 36dd3bac9..41d71148e 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 @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.impl.future; +import jakarta.annotation.Priority; import org.apache.deltaspike.core.api.future.Futureable; import org.apache.deltaspike.core.spi.future.FutureableStrategy; @@ -29,6 +30,7 @@ import java.io.Serializable; @Interceptor @Futureable +@Priority(1000) public class FutureableInterceptor implements Serializable { @Inject 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 7b30d3b60..2dc63df22 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 @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.impl.lock; +import jakarta.annotation.Priority; import org.apache.deltaspike.core.api.lock.Locked; import org.apache.deltaspike.core.spi.lock.LockedStrategy; @@ -29,6 +30,7 @@ import java.io.Serializable; @Locked @Interceptor +@Priority(1000) public class LockedInterceptor implements Serializable { @Inject 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 f1d3ad6e6..9f5dbde43 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 @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.impl.monitoring; +import jakarta.annotation.Priority; import org.apache.deltaspike.core.api.monitoring.InvocationMonitored; import jakarta.enterprise.context.ContextNotActiveException; @@ -31,6 +32,7 @@ import java.util.logging.Logger; @Interceptor @InvocationMonitored +@Priority(1000) public class InvocationMonitorInterceptor implements Serializable { private static final Logger logger = Logger.getLogger(InvocationMonitorInterceptor.class.getName()); 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 51d363892..d73f2887c 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 @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.impl.throttling; +import jakarta.annotation.Priority; import org.apache.deltaspike.core.api.throttling.Throttled; import org.apache.deltaspike.core.spi.throttling.ThrottledStrategy; @@ -29,6 +30,7 @@ import java.io.Serializable; @Throttled @Interceptor +@Priority(1000) public class ThrottledInterceptor implements Serializable { @Inject diff --git a/deltaspike/core/impl/src/main/resources/META-INF/beans.xml b/deltaspike/core/impl/src/main/resources/META-INF/beans.xml index e3319aa49..b4a51c0da 100644 --- a/deltaspike/core/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/core/impl/src/main/resources/META-INF/beans.xml @@ -17,13 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <interceptors> - <class>org.apache.deltaspike.core.impl.throttling.ThrottledInterceptor</class> - <class>org.apache.deltaspike.core.impl.lock.LockedInterceptor</class> - <class>org.apache.deltaspike.core.impl.future.FutureableInterceptor</class> - <class>org.apache.deltaspike.core.impl.monitoring.InvocationMonitorInterceptor</class> - </interceptors> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/core/impl/src/test/resources/META-INF/beans.xml b/deltaspike/core/impl/src/test/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/core/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/core/impl/src/test/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/dist/bom/pom.xml b/deltaspike/dist/bom/pom.xml index df6f514be..8e714b1b2 100644 --- a/deltaspike/dist/bom/pom.xml +++ b/deltaspike/dist/bom/pom.xml @@ -111,12 +111,6 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-jsf-module-impl-ee6</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> <dependency> <groupId>org.apache.deltaspike.modules</groupId> diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml index 191f877e3..7f8ae6ace 100644 --- a/deltaspike/dist/full/pom.xml +++ b/deltaspike/dist/full/pom.xml @@ -91,12 +91,6 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.deltaspike.modules</groupId> - <artifactId>deltaspike-jsf-module-impl-ee6</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> <dependency> <groupId>org.apache.deltaspike.modules</groupId> diff --git a/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/beans.xml index e9f29b3d7..3ebaaf5c5 100644 --- a/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/beans.xml +++ b/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> -</beans> \ No newline at end of file + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> +</beans> diff --git a/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/beans.xml index e9f29b3d7..3ebaaf5c5 100644 --- a/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/beans.xml +++ b/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> -</beans> \ No newline at end of file + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> +</beans> diff --git a/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml b/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml +++ b/deltaspike/examples/jse-examples/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml index e9f29b3d7..3ebaaf5c5 100644 --- a/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml +++ b/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> -</beans> \ No newline at end of file + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> +</beans> diff --git a/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml b/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml +++ b/deltaspike/examples/jsf-playground/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml index e9f29b3d7..3ebaaf5c5 100644 --- a/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml +++ b/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> -</beans> \ No newline at end of file + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> +</beans> diff --git a/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml b/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml +++ b/deltaspike/examples/scheduler-playground/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml index 3baf2b13d..cadc3b816 100644 --- a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml +++ b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/beans.xml @@ -17,10 +17,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" - http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> <interceptors> <class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class> diff --git a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml index a08d5bbd9..61b137e6a 100644 --- a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml +++ b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" - http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> <interceptors> <class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class> diff --git a/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml index b8919a5a6..f426cff86 100644 --- a/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/data/impl/src/main/resources/META-INF/beans.xml @@ -17,10 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:weld="http://jboss.org/schema/weld/beans"; - xsi:schemaLocation=" - http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd - http://jboss.org/schema/weld/beans http://jboss.org/schema/weld/beans_1_1.xsd";> +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/jpa/api/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java index e0a88766c..e06bd70c1 100644 --- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java +++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/EntityManagerFactoryProducer.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.jpa.impl.entitymanager; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Disposes; import jakarta.enterprise.inject.Produces; @@ -60,6 +61,7 @@ import org.apache.deltaspike.jpa.api.entitymanager.PersistenceUnitName; * } * </pre> */ +@ApplicationScoped public class EntityManagerFactoryProducer { private static final Logger LOG = Logger.getLogger(EntityManagerFactoryProducer.class.getName()); diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java index db5b2afae..d85431ac1 100644 --- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java +++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.jpa.impl.transaction; +import jakarta.annotation.Priority; import org.apache.deltaspike.jpa.api.transaction.Transactional; import org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy; @@ -35,6 +36,7 @@ import java.io.Serializable; */ @Interceptor @Transactional +@Priority(1000) public class TransactionalInterceptor implements Serializable { private static final long serialVersionUID = 8787285444722371172L; diff --git a/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml index be820476b..3ebaaf5c5 100644 --- a/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/jpa/impl/src/main/resources/META-INF/beans.xml @@ -17,10 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <interceptors> - <class>org.apache.deltaspike.jpa.impl.transaction.TransactionalInterceptor</class> - </interceptors> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml index 3de29a52e..3ebaaf5c5 100644 --- a/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/jpa/impl/src/test/resources/META-INF/beans.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan --> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/jsf/api/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterInterceptor.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterInterceptor.java index 6598e3671..5029a5672 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterInterceptor.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterInterceptor.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.jsf.impl.config.view.navigation; +import jakarta.annotation.Priority; import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter; import org.apache.deltaspike.jsf.spi.config.view.navigation.NavigationParameterStrategy; @@ -29,6 +30,7 @@ import java.io.Serializable; @NavigationParameter(key = "", value = "") @Interceptor +@Priority(1000) public class NavigationParameterInterceptor implements Serializable { private static final long serialVersionUID = 1762625956958428994L; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterListInterceptor.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterListInterceptor.java index e557cb856..552a98743 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterListInterceptor.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/navigation/NavigationParameterListInterceptor.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.jsf.impl.config.view.navigation; +import jakarta.annotation.Priority; import org.apache.deltaspike.core.api.config.view.navigation.NavigationParameter; import org.apache.deltaspike.jsf.spi.config.view.navigation.NavigationParameterStrategy; @@ -29,6 +30,7 @@ import java.io.Serializable; @NavigationParameter.List( { } ) @Interceptor +@Priority(1000) public class NavigationParameterListInterceptor implements Serializable { private static final long serialVersionUID = 2762625956958428994L; diff --git a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml index 1ef3594c8..3ebaaf5c5 100644 --- a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/beans.xml @@ -17,11 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <interceptors> - <class>org.apache.deltaspike.jsf.impl.config.view.navigation.NavigationParameterInterceptor</class> - <class>org.apache.deltaspike.jsf.impl.config.view.navigation.NavigationParameterListInterceptor</class> - </interceptors> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java index 80648c858..5a8a79cc5 100644 --- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java +++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/scope/viewaccess/ViewAccessScopedWithFViewActionWebAppTest.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.jsf.impl.scope.viewaccess; import java.net.URL; -import org.apache.deltaspike.test.category.WebEE7ProfileCategory; +import org.apache.deltaspike.test.category.WebEEProfileCategory; import org.apache.deltaspike.test.jsf.impl.scope.viewaccess.beans.ViewAccessScopedBeanX; import org.apache.deltaspike.test.jsf.impl.scope.viewaccess.beans.ViewAccessScopedBeanY; import org.apache.deltaspike.test.jsf.impl.util.ArchiveUtils; @@ -42,7 +42,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; @RunWith(Arquillian.class) -@Category(WebEE7ProfileCategory.class) +@Category(WebEEProfileCategory.class) public class ViewAccessScopedWithFViewActionWebAppTest { @Drone diff --git a/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml index 3de29a52e..3ebaaf5c5 100644 --- a/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/jsf/impl/src/test/resources/META-INF/beans.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan --> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml index 9d341e0cd..3ebaaf5c5 100644 --- a/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/partial-bean/api/src/main/resources/META-INF/beans.xml @@ -17,6 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> +</beans> diff --git a/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/partial-bean/impl/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml index 3de29a52e..3ebaaf5c5 100644 --- a/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/partial-bean/impl/src/test/resources/META-INF/beans.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan --> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml index 08594392c..3ebaaf5c5 100644 --- a/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/proxy/api/src/main/resources/META-INF/beans.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/proxy/impl-asm/src/main/resources/META-INF/beans.xml b/deltaspike/modules/proxy/impl-asm/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/modules/proxy/impl-asm/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/proxy/impl-asm/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/scheduler/api/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml index a2308ffec..3ebaaf5c5 100644 --- a/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/scheduler/impl/src/main/resources/META-INF/beans.xml @@ -17,7 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml index 3de29a52e..3ebaaf5c5 100644 --- a/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/scheduler/impl/src/test/resources/META-INF/beans.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan --> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml b/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml index 9d341e0cd..3ebaaf5c5 100644 --- a/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/security/api/src/main/resources/META-INF/beans.xml @@ -17,6 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> +</beans> diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityInterceptor.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityInterceptor.java index 096164ff8..45ebb11fc 100644 --- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityInterceptor.java +++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/SecurityInterceptor.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.security.impl.extension; +import jakarta.annotation.Priority; import org.apache.deltaspike.security.spi.authorization.SecurityStrategy; import jakarta.inject.Inject; @@ -31,6 +32,7 @@ import java.io.Serializable; */ @SecurityInterceptorBinding @Interceptor +@Priority(1000) public class SecurityInterceptor implements Serializable { private static final long serialVersionUID = -7094673146532371976L; diff --git a/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml index a6d764bd3..3ebaaf5c5 100644 --- a/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/security/impl/src/main/resources/META-INF/beans.xml @@ -17,10 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <interceptors> - <class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class> - </interceptors> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml index 3de29a52e..3ebaaf5c5 100644 --- a/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/security/impl/src/test/resources/META-INF/beans.xml @@ -17,8 +17,9 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> - <!-- DON'T add content to this file - it's >only< needed as marker file for the test-scan --> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> </beans> diff --git a/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml b/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml index 38c978611..fe26f13d1 100644 --- a/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml +++ b/deltaspike/modules/test-control/impl/src/main/resources/META-INF/beans.xml @@ -17,9 +17,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> <decorators> <class>org.apache.deltaspike.testcontrol.impl.request.ContextControlDecorator</class> diff --git a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml index d8353857b..88f29f5fe 100644 --- a/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/test-control/impl/src/test/resources/META-INF/beans.xml @@ -17,9 +17,11 @@ ~ specific language governing permissions and limitations ~ under the License. --> -<beans xmlns="http://java.sun.com/xml/ns/javaee"; +<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; + version="3.0" bean-discovery-mode="all"> + <trim/> <interceptors> <class>org.apache.deltaspike.test.testcontrol.uc011.TestInterceptorImplementation</class> <class>org.apache.deltaspike.test.testcontrol.mock.uc015.TestInterceptorImplementation</class> diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml index 25ff407f3..25353dc25 100644 --- a/deltaspike/pom.xml +++ b/deltaspike/pom.xml @@ -76,8 +76,8 @@ <module>modules</module> <!-- <module>examples</module> - <module>dist</module> --> + <module>dist</module> </modules> <build>
