This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 7913453e4 javax -> jakarta
7913453e4 is described below
commit 7913453e48393cb702fa92ef2660c2fa3745c090
Author: tandraschko <[email protected]>
AuthorDate: Thu Jan 11 17:13:39 2024 +0100
javax -> jakarta
---
.../deltaspike/core/spi/InterceptorStrategy.java | 2 +-
.../interceptor/GlobalInterceptorExtension.java | 1 -
.../core/impl/util/AnnotationInstanceUtils.java | 60 ----------------------
deltaspike/modules/data/api/pom.xml | 2 +-
.../deltaspike/data/api/EntityGraphType.java | 4 +-
.../deltaspike/data/api/EntityManagerDelegate.java | 58 ++++++++++-----------
.../data/api/EntityPersistenceRepository.java | 10 ++--
.../deltaspike/data/api/EntityRepository.java | 4 +-
.../org/apache/deltaspike/data/api/Modifying.java | 4 +-
.../deltaspike/data/api/SingleResultType.java | 4 +-
.../data/api/criteria/CriteriaSupport.java | 38 +++++++-------
.../api/mapping/SimpleQueryInOutMapperBase.java | 3 +-
deltaspike/modules/data/impl/pom.xml | 2 +-
deltaspike/modules/jpa/api/pom.xml | 2 +-
.../jpa/api/transaction/Transactional.java | 12 ++---
deltaspike/modules/jpa/impl/pom.xml | 2 +-
.../PersistenceConfigurationProviderImpl.java | 2 +-
.../BeanManagedUserTransactionStrategy.java | 2 +-
.../ResourceLocalTransactionStrategy.java | 2 +-
.../EntityManagerFactoryProducerTest.java | 2 +-
.../PersistenceConfigurationProviderTest.java | 8 +--
.../META-INF/apache-deltaspike.properties | 4 +-
.../test/resources/persistence-MyUnit.properties | 4 +-
.../impl/PartialBeanBindingExtension.java | 4 +-
.../DeltaSpikeProxyInvocationContext.java | 2 +-
.../DeltaSpikeProxyInvocationWrapperException.java | 2 +-
.../api/authorization/AccessDecisionVoter.java | 2 +-
.../authorization/AccessDecisionVoterContext.java | 2 +-
.../security/impl/util/SecurityUtils.java | 4 +-
.../impl/jsf/MockedJsf2TestContainer.java | 2 +-
.../impl/jsf/MyFacesContainerAdapter.java | 2 +-
.../testcontrol/impl/mock/DefaultMockFilter.java | 4 +-
32 files changed, 101 insertions(+), 155 deletions(-)
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 894cd6226..85a587e48 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
@@ -28,7 +28,7 @@ import java.io.Serializable;
public interface InterceptorStrategy extends Serializable
{
/**
- * Method which will be invoked by the interceptor method annotated with
{@link javax.interceptor.AroundInvoke}
+ * Method which will be invoked by the interceptor method annotated with
{@link jakarta.interceptor.AroundInvoke}
* @param invocationContext current invocation-context
* @return result of the intercepted method
* @throws Exception exception which might be thrown by the intercepted
method
diff --git
a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
index f1796f3e9..3e7cfecc2 100644
---
a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
+++
b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
@@ -19,7 +19,6 @@
package org.apache.deltaspike.core.impl.interceptor;
import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
-import org.apache.deltaspike.core.impl.util.AnnotationInstanceUtils;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
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
deleted file mode 100644
index 541e529f5..000000000
---
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/AnnotationInstanceUtils.java
+++ /dev/null
@@ -1,60 +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.util;
-
-import org.apache.deltaspike.core.util.ClassUtils;
-import org.apache.deltaspike.core.util.metadata.AnnotationInstanceProvider;
-
-import jakarta.enterprise.inject.Typed;
-import java.lang.annotation.Annotation;
-import java.util.HashMap;
-import java.util.Map;
-
-@Typed()
-public abstract class AnnotationInstanceUtils
-{
- private AnnotationInstanceUtils()
- {
- // prevent instantiation
- }
-
- /**
- * @return a new instance of {@link javax.annotation.Priority} with the
given value
- * if the annotation-class is available in a cdi 1.1+ based
environment, null otherwise
- */
- public static Annotation getPriorityAnnotationInstance(int priorityValue)
- {
- Annotation priorityAnnotationInstance = null;
-
- Class<? extends Annotation> priorityAnnotationClass =
- ClassUtils.tryToLoadClassForName("javax.annotation.Priority");
-
- //check for @Priority and CDI v1.1+
- if (priorityAnnotationClass != null &&
-
ClassUtils.tryToLoadClassForName("jakarta.enterprise.inject.spi.AfterTypeDiscovery")
!= null)
- {
- Map<String, Object> defaultValueMap = new HashMap<String,
Object>();
- defaultValueMap.put("value", priorityValue);
- priorityAnnotationInstance =
AnnotationInstanceProvider.of(priorityAnnotationClass, defaultValueMap);
- }
-
- return priorityAnnotationInstance;
- }
-}
diff --git a/deltaspike/modules/data/api/pom.xml
b/deltaspike/modules/data/api/pom.xml
index 226a23602..f42f13818 100755
--- a/deltaspike/modules/data/api/pom.xml
+++ b/deltaspike/modules/data/api/pom.xml
@@ -36,7 +36,7 @@
org.apache.deltaspike.data.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
- javax.persistence*;version="[1.1,3)",
+ jakarta.persistence.*,
!org.apache.deltaspike.data.*,
*
</deltaspike.osgi.import>
diff --git
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityGraphType.java
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityGraphType.java
index 9385a5186..7c515c589 100644
---
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityGraphType.java
+++
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityGraphType.java
@@ -25,10 +25,10 @@ package org.apache.deltaspike.data.api;
public enum EntityGraphType
{
/** Fetch graph. */
- FETCH("javax.persistence.fetchgraph"),
+ FETCH("jakarta.persistence.fetchgraph"),
/** Load graph. */
- LOAD("javax.persistence.loadgraph");
+ LOAD("jakarta.persistence.loadgraph");
private String hintName;
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 5e155671a..f2a6473b3 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
@@ -29,7 +29,7 @@ import jakarta.persistence.metamodel.Metamodel;
/**
- * Expose {@link javax.persistence.EntityManager} methods not present on
repository base interfaces.
+ * Expose {@link jakarta.persistence.EntityManager} methods not present on
repository base interfaces.
* Calls the corresponding method on the repository EntityManager.
*
* @param <E> The Entity type.
@@ -37,142 +37,142 @@ import jakarta.persistence.metamodel.Metamodel;
public interface EntityManagerDelegate<E>
{
/**
- * See {@link javax.persistence.EntityManager#persist(Object)}.
+ * See {@link jakarta.persistence.EntityManager#persist(Object)}.
*/
void persist(E entity);
/**
- * See {@link javax.persistence.EntityManager#merge(Object)}.
+ * See {@link jakarta.persistence.EntityManager#merge(Object)}.
*/
E merge(E entity);
/**
- * See {@link javax.persistence.EntityManager#find(Class, Object,
java.util.Map)}.
+ * See {@link jakarta.persistence.EntityManager#find(Class, Object,
java.util.Map)}.
*/
E find(Object primaryKey, Map<String, Object> properties);
/**
- * See {@link javax.persistence.EntityManager#find(Class, Object,
LockModeType)}.
+ * See {@link jakarta.persistence.EntityManager#find(Class, Object,
LockModeType)}.
*/
E find(Object primaryKey, LockModeType lockMode);
/**
- * See {@link javax.persistence.EntityManager#find(Class, Object,
LockModeType, Map)}.
+ * See {@link jakarta.persistence.EntityManager#find(Class, Object,
LockModeType, Map)}.
*/
E find(Object primaryKey, LockModeType lockMode, Map<String, Object>
properties);
/**
- * See {@link javax.persistence.EntityManager#getReference(Class, Object)}.
+ * See {@link jakarta.persistence.EntityManager#getReference(Class,
Object)}.
*/
E getReference(Object primaryKey);
/**
- * See {@link javax.persistence.EntityManager#setFlushMode(FlushModeType)}.
+ * See {@link
jakarta.persistence.EntityManager#setFlushMode(FlushModeType)}.
*/
void setFlushMode(FlushModeType flushMode);
/**
- * See {@link javax.persistence.EntityManager#getFlushMode()}.
+ * See {@link jakarta.persistence.EntityManager#getFlushMode()}.
*/
FlushModeType getFlushMode();
/**
- * See {@link javax.persistence.EntityManager#lock(Object, LockModeType)}.
+ * See {@link jakarta.persistence.EntityManager#lock(Object,
LockModeType)}.
*/
void lock(Object entity, LockModeType lockMode);
/**
- * See {@link javax.persistence.EntityManager#lock(Object, LockModeType,
Map)}.
+ * See {@link jakarta.persistence.EntityManager#lock(Object, LockModeType,
Map)}.
*/
void lock(Object entity, LockModeType lockMode, Map<String, Object>
properties);
/**
- * See {@link javax.persistence.EntityManager#refresh(Object, Map)}.
+ * See {@link jakarta.persistence.EntityManager#refresh(Object, Map)}.
*/
void refresh(E entity, Map<String, Object> properties);
/**
- * See {@link javax.persistence.EntityManager#refresh(Object,
LockModeType)}.
+ * See {@link jakarta.persistence.EntityManager#refresh(Object,
LockModeType)}.
*/
void refresh(E entity, LockModeType lockMode);
/**
- * See {@link javax.persistence.EntityManager#refresh(Object,
LockModeType, Map)}.
+ * See {@link jakarta.persistence.EntityManager#refresh(Object,
LockModeType, Map)}.
*/
void refresh(E entity, LockModeType lockMode, Map<String, Object>
properties);
/**
- * See {@link javax.persistence.EntityManager#clear()}.
+ * See {@link jakarta.persistence.EntityManager#clear()}.
*/
void clear();
/**
- * See {@link javax.persistence.EntityManager#detach(Object)}.
+ * See {@link jakarta.persistence.EntityManager#detach(Object)}.
*/
void detach(E entity);
/**
- * See {@link javax.persistence.EntityManager#contains(Object)}.
+ * See {@link jakarta.persistence.EntityManager#contains(Object)}.
*/
boolean contains(E entity);
/**
- * See {@link javax.persistence.EntityManager#getLockMode(Object)}.
+ * See {@link jakarta.persistence.EntityManager#getLockMode(Object)}.
*/
LockModeType getLockMode(E entity);
/**
- * See {@link javax.persistence.EntityManager#setProperty(String, Object)}.
+ * See {@link jakarta.persistence.EntityManager#setProperty(String,
Object)}.
*/
void setProperty(String propertyName, Object value);
/**
- * See {@link javax.persistence.EntityManager#getProperties()}.
+ * See {@link jakarta.persistence.EntityManager#getProperties()}.
*/
Map<String, Object> getProperties();
/**
- * See {@link javax.persistence.EntityManager#joinTransaction()}.
+ * See {@link jakarta.persistence.EntityManager#joinTransaction()}.
*/
void joinTransaction();
/**
- * See {@link javax.persistence.EntityManager#unwrap(Class)}.
+ * See {@link jakarta.persistence.EntityManager#unwrap(Class)}.
*/
<T> T unwrap(Class<T> cls);
/**
- * See {@link javax.persistence.EntityManager#getDelegate()}.
+ * See {@link jakarta.persistence.EntityManager#getDelegate()}.
*/
Object getDelegate();
/**
- * See {@link javax.persistence.EntityManager#close()}.
+ * See {@link jakarta.persistence.EntityManager#close()}.
*/
void close();
/**
- * See {@link javax.persistence.EntityManager#isOpen()}.
+ * See {@link jakarta.persistence.EntityManager#isOpen()}.
*/
boolean isOpen();
/**
- * See {@link javax.persistence.EntityManager#getTransaction()}.
+ * See {@link jakarta.persistence.EntityManager#getTransaction()}.
*/
EntityTransaction getTransaction();
/**
- * See {@link javax.persistence.EntityManager#getEntityManagerFactory()}.
+ * See {@link jakarta.persistence.EntityManager#getEntityManagerFactory()}.
*/
EntityManagerFactory getEntityManagerFactory();
/**
- * See {@link javax.persistence.EntityManager#getCriteriaBuilder()}.
+ * See {@link jakarta.persistence.EntityManager#getCriteriaBuilder()}.
*/
CriteriaBuilder getCriteriaBuilder();
/**
- * See {@link javax.persistence.EntityManager#getMetamodel()}.
+ * See {@link jakarta.persistence.EntityManager#getMetamodel()}.
*/
Metamodel getMetamodel();
diff --git
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityPersistenceRepository.java
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityPersistenceRepository.java
index 4e3af767e..9edff3f23 100644
---
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityPersistenceRepository.java
+++
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/EntityPersistenceRepository.java
@@ -52,33 +52,33 @@ public interface EntityPersistenceRepository<E, PK extends
Serializable> extends
E saveAndFlushAndRefresh(E entity);
/**
- * Convenience access to {@link
javax.persistence.EntityManager#remove(Object)}.
+ * Convenience access to {@link
jakarta.persistence.EntityManager#remove(Object)}.
* @param entity Entity to remove.
*/
void remove(E entity);
/**
- * Convenience access to {@link
javax.persistence.EntityManager#remove(Object)}
+ * Convenience access to {@link
jakarta.persistence.EntityManager#remove(Object)}
* with a following flush.
* @param entity Entity to remove.
*/
void removeAndFlush(E entity);
/**
- * Convenience access to {@link
javax.persistence.EntityManager#remove(Object)}
+ * Convenience access to {@link
jakarta.persistence.EntityManager#remove(Object)}
* with an detached entity.
* @param entity Entity to remove.
*/
void attachAndRemove(E entity);
/**
- * Convenience access to {@link
javax.persistence.EntityManager#refresh(Object)}.
+ * Convenience access to {@link
jakarta.persistence.EntityManager#refresh(Object)}.
* @param entity Entity to refresh.
*/
void refresh(E entity);
/**
- * Convenience access to {@link javax.persistence.EntityManager#flush()}.
+ * Convenience access to {@link jakarta.persistence.EntityManager#flush()}.
*/
void flush();
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 dd03d04ec..f31b73fd2 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
@@ -36,7 +36,7 @@ public interface EntityRepository<E, PK extends Serializable>
extends EntityPers
/**
* Entity lookup by primary key. Convenicence method around
- * {@link javax.persistence.EntityManager#find(Class, Object)}.
+ * {@link jakarta.persistence.EntityManager#find(Class, Object)}.
* @param primaryKey DB primary key.
* @return Entity identified by primary or null if it
does not exist.
*/
@@ -44,7 +44,7 @@ public interface EntityRepository<E, PK extends Serializable>
extends EntityPers
/**
* Entity lookup by primary key. Convenicence method around
- * {@link javax.persistence.EntityManager#find(Class, Object)}.
+ * {@link jakarta.persistence.EntityManager#find(Class, Object)}.
* @param primaryKey DB primary key.
* @return Entity identified by primary or null if it
does not exist, wrapped by Optional.
*/
diff --git
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Modifying.java
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Modifying.java
index a57ad652b..33cd90e48 100644
---
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Modifying.java
+++
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Modifying.java
@@ -25,8 +25,8 @@ import java.lang.annotation.Target;
/**
* Marks a query method to be modifying. This will execute the
- * {@link javax.persistence.Query#executeUpdate()} method instead of
- * {@link javax.persistence.Query#getResultList()} (or the corresponding
single result method).
+ * {@link jakarta.persistence.Query#executeUpdate()} method instead of
+ * {@link jakarta.persistence.Query#getResultList()} (or the corresponding
single result method).
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
diff --git
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/SingleResultType.java
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/SingleResultType.java
index e2315c219..ce19339a9 100644
---
a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/SingleResultType.java
+++
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/SingleResultType.java
@@ -25,8 +25,8 @@ public enum SingleResultType
{
/**
- * Expects a single result, throws a {@link
javax.persistence.NoResultException} or
- * {@link javax.persistence.NonUniqueResultException} otherwise. This is
the JPA
+ * Expects a single result, throws a {@link
jakarta.persistence.NoResultException} or
+ * {@link jakarta.persistence.NonUniqueResultException} otherwise. This is
the JPA
* default behavior.
*/
JPA,
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 4537b947f..d4e980239 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
@@ -69,7 +69,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#abs(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#abs(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -79,7 +79,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#avg(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#avg(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -89,7 +89,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#count(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#count(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -99,7 +99,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#countDistinct(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#countDistinct(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -109,7 +109,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#max(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#max(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -119,7 +119,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#min(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#min(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -129,7 +129,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#neg(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#neg(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -139,7 +139,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#sum(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#sum(jakarta.persistence.criteria.Expression)}
* over an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -149,7 +149,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#mod(javax.persistence.criteria.Expression,
Integer)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#mod(jakarta.persistence.criteria.Expression,
Integer)}
* for an attribute.
*
* @param attribute Attribute to use in the aggregate.
@@ -160,7 +160,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#upper(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#upper(jakarta.persistence.criteria.Expression)}
* over a String attribute.
*
* @param attribute Attribute to uppercase.
@@ -170,7 +170,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#lower(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#lower(jakarta.persistence.criteria.Expression)}
* over a String attribute.
*
* @param attribute Attribute to lowercase.
@@ -180,7 +180,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#substring(javax.persistence.criteria.Expression,
int)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#substring(jakarta.persistence.criteria.Expression,
int)}
* over a String attribute.
*
* @param attribute Attribute to create a substring from.
@@ -191,7 +191,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#substring(javax.persistence.criteria.Expression,
int, int)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#substring(jakarta.persistence.criteria.Expression,
int, int)}
* over a String attribute.
*
* @param attribute Attribute to create a substring from.
@@ -203,7 +203,7 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#trim(javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#trim(jakarta.persistence.criteria.Expression)}
* over a String attribute.
*
* @param attribute Attribute to apply trim.
@@ -213,8 +213,8 @@ public interface CriteriaSupport<E>
/**
* Create a query selection for the
- * {@link
javax.persistence.criteria.CriteriaBuilder#trim(javax.persistence.criteria.CriteriaBuilder.Trimspec,
- * javax.persistence.criteria.Expression)}
+ * {@link
jakarta.persistence.criteria.CriteriaBuilder#trim(jakarta.persistence.criteria.CriteriaBuilder.Trimspec,
+ * jakarta.persistence.criteria.Expression)}
* over a String attribute.
*
* @param trimspec Used to specify how strings are trimmed.
@@ -225,21 +225,21 @@ public interface CriteriaSupport<E>
/**
- * Create a query selection for the {@link
javax.persistence.criteria.CriteriaBuilder#currentDate()}.
+ * Create a query selection for the {@link
jakarta.persistence.criteria.CriteriaBuilder#currentDate()}.
*
* @return {@link QuerySelection} part of a {@link Criteria#select(Class,
QuerySelection...)} call.
*/
QuerySelection<E, Date> currDate();
/**
- * Create a query selection for the {@link
javax.persistence.criteria.CriteriaBuilder#currentTime()}.
+ * Create a query selection for the {@link
jakarta.persistence.criteria.CriteriaBuilder#currentTime()}.
*
* @return {@link QuerySelection} part of a {@link Criteria#select(Class,
QuerySelection...)} call.
*/
QuerySelection<E, Time> currTime();
/**
- * Create a query selection for the {@link
javax.persistence.criteria.CriteriaBuilder#currentTimestamp()}.
+ * Create a query selection for the {@link
jakarta.persistence.criteria.CriteriaBuilder#currentTimestamp()}.
*
* @return {@link QuerySelection} part of a {@link Criteria#select(Class,
QuerySelection...)} call.
*/
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 d15c0790e..8c87a270b 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
@@ -93,7 +93,8 @@ public abstract class SimpleQueryInOutMapperBase<Entity, Dto>
implements QueryIn
return false;
}
final String name = parameter.getClass().getName();
- return Object.class.isInstance(parameter) &&
!(name.startsWith("java.") || name.startsWith("javax."));
+ return Object.class.isInstance(parameter)
+ && !(name.startsWith("java.") || name.startsWith("javax.") ||
name.startsWith("jakarta."));
}
@Override
diff --git a/deltaspike/modules/data/impl/pom.xml
b/deltaspike/modules/data/impl/pom.xml
index 1f2c99600..427057410 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -36,7 +36,7 @@
org.apache.deltaspike.data.impl.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
- javax.persistence*;version="[1.1,3)",
+ jakarta.persistence.*,
org.apache.deltaspike.jpa.impl.transaction,
!org.apache.deltaspike.data.impl.*,
*
diff --git a/deltaspike/modules/jpa/api/pom.xml
b/deltaspike/modules/jpa/api/pom.xml
index ca764e6da..9474fb35f 100644
--- a/deltaspike/modules/jpa/api/pom.xml
+++ b/deltaspike/modules/jpa/api/pom.xml
@@ -37,7 +37,7 @@
org.apache.deltaspike.jpa.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
- javax.persistence*;version="[1.1,3)",
+ jakarta.persistence.*,
jakarta.enterprise.inject,
!org.apache.deltaspike.jpa.*,
*
diff --git
a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/transaction/Transactional.java
b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/transaction/Transactional.java
index 9478d5ed2..ce2a28a5e 100644
---
a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/transaction/Transactional.java
+++
b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/api/transaction/Transactional.java
@@ -46,16 +46,16 @@ public @interface Transactional
{
/**
* Optional qualifier/s which allow/s to start only specific transactions
instead of one
- * for the injected {@link javax.persistence.EntityManager}s.
- * Default-value is {@link Any} which means any injected {@link
javax.persistence.EntityManager}s
- * should be detected automatically and transactions for all injected
{@link javax.persistence.EntityManager}s
- * will be started. Or the {@link jakarta.enterprise.inject.Default}
{@link javax.persistence.EntityManager}
- * will be used, if no qualifier and no {@link
javax.persistence.EntityManager} was found (in the annotated class)
+ * for the injected {@link jakarta.persistence.EntityManager}s.
+ * Default-value is {@link Any} which means any injected {@link
jakarta.persistence.EntityManager}s
+ * should be detected automatically and transactions for all injected
{@link jakarta.persistence.EntityManager}s
+ * will be started. Or the {@link jakarta.enterprise.inject.Default}
{@link jakarta.persistence.EntityManager}
+ * will be used, if no qualifier and no {@link
jakarta.persistence.EntityManager} was found (in the annotated class)
* (see DELTASPIKE-320).
*
* This qualifier can also be used for integrating other frameworks,
* which follow a different style (see DELTASPIKE-319) as well as the
usage of
- * {@link javax.persistence.EntityManager}s with qualifiers in a called
method (of a different bean)
+ * {@link jakarta.persistence.EntityManager}s with qualifiers in a called
method (of a different bean)
* which isn't {@link Transactional} itself.
*
* @return target persistence-unit identifier
diff --git a/deltaspike/modules/jpa/impl/pom.xml
b/deltaspike/modules/jpa/impl/pom.xml
index 6b595bd19..3c6253730 100644
--- a/deltaspike/modules/jpa/impl/pom.xml
+++ b/deltaspike/modules/jpa/impl/pom.xml
@@ -37,7 +37,7 @@
org.apache.deltaspike.jpa.impl.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
- javax.persistence*;version="[1.1,3)",
+ jakarta.persistence.*,
!org.apache.deltaspike.jpa.impl.*,
*
</deltaspike.osgi.import>
diff --git
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.java
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.java
index 31d3cd830..6f55fec17 100644
---
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.java
+++
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/entitymanager/PersistenceConfigurationProviderImpl.java
@@ -67,7 +67,7 @@ public class PersistenceConfigurationProviderImpl implements
PersistenceConfigur
unitProperties = addConfigProperties(unitProperties,
persistenceUnitName);
// add spec expected attributes
- unitProperties.put("javax.persistence.bean.manager",
BeanManagerProvider.getInstance().getBeanManager());
+ unitProperties.put("jakarta.persistence.bean.manager",
BeanManagerProvider.getInstance().getBeanManager());
return unitProperties;
}
diff --git
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/BeanManagedUserTransactionStrategy.java
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/BeanManagedUserTransactionStrategy.java
index af352b5f6..f384976c5 100644
---
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/BeanManagedUserTransactionStrategy.java
+++
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/BeanManagedUserTransactionStrategy.java
@@ -157,7 +157,7 @@ public class BeanManagedUserTransactionStrategy extends
ResourceLocalTransaction
* and {@link
BeanManagedUserTransactionStrategy.UserTransactionAdapter#isActive()}
* can only use the status information of the {@link UserTransaction} and
therefore
* {@link
BeanManagedUserTransactionStrategy.UserTransactionAdapter#begin()}
- * will only executed once, but {@link
javax.persistence.EntityManager#joinTransaction()}
+ * will only executed once, but {@link
jakarta.persistence.EntityManager#joinTransaction()}
* needs to be called for every {@link EntityManager}.
* @param invocationContext current invocation-context
* @param entityManagerEntry entry of the current entity-manager
diff --git
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
index e9c2e1e8e..62e720a17 100644
---
a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
+++
b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/ResourceLocalTransactionStrategy.java
@@ -48,7 +48,7 @@ import
org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy;
* It supports nested Transactions with the MANDATORY behaviour.</p>
*
* <p>The outermost @Transactional interceptor for the given
- * {@link jakarta.inject.Qualifier} will open an {@link
javax.persistence.EntityTransaction}
+ * {@link jakarta.inject.Qualifier} will open an {@link
jakarta.persistence.EntityTransaction}
* and the outermost @Transactional interceptor for <b>all</b>
* EntityManagers will flush and subsequently close all open transactions.</p>
*
diff --git
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.java
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.java
index 8cbaed346..c7a3ca577 100644
---
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.java
+++
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/EntityManagerFactoryProducerTest.java
@@ -55,7 +55,7 @@ public class EntityManagerFactoryProducerTest
.addPackage(EntityManagerFactoryProducerTest.class.getPackage().getName())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource(new
StringAsset(TestPersistenceProviderResolver.class.getName()),
-
"META-INF/services/javax.persistence.spi.PersistenceProviderResolver");
+
"META-INF/services/jakarta.persistence.spi.PersistenceProviderResolver");
return ShrinkWrap.create(WebArchive.class)
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
diff --git
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProviderTest.java
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProviderTest.java
index f788faf9f..399d2b95b 100644
---
a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProviderTest.java
+++
b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/PersistenceConfigurationProviderTest.java
@@ -68,9 +68,9 @@ public class PersistenceConfigurationProviderTest
{
Properties myUnitConfig =
persistenceConfigurationProvider.getEntityManagerFactoryConfiguration("MyUnit");
Assert.assertEquals(4, myUnitConfig.size());
-
Assert.assertEquals(BeanManagerProvider.getInstance().getBeanManager(),
myUnitConfig.get("javax.persistence.bean.manager"));
- Assert.assertEquals("blub",
myUnitConfig.get("javax.persistence.jdbc.password"));
- Assert.assertEquals("sa",
myUnitConfig.get("javax.persistence.jdbc.user"));
- Assert.assertEquals("some.jdbc.Driver",
myUnitConfig.get("javax.persistence.jdbc.driver"));
+
Assert.assertEquals(BeanManagerProvider.getInstance().getBeanManager(),
myUnitConfig.get("jakarta.persistence.bean.manager"));
+ Assert.assertEquals("blub",
myUnitConfig.get("jakarta.persistence.jdbc.password"));
+ Assert.assertEquals("sa",
myUnitConfig.get("jakarta.persistence.jdbc.user"));
+ Assert.assertEquals("some.jdbc.Driver",
myUnitConfig.get("jakarta.persistence.jdbc.driver"));
}
}
diff --git
a/deltaspike/modules/jpa/impl/src/test/resources/META-INF/apache-deltaspike.properties
b/deltaspike/modules/jpa/impl/src/test/resources/META-INF/apache-deltaspike.properties
index 303b45680..48baecfac 100644
---
a/deltaspike/modules/jpa/impl/src/test/resources/META-INF/apache-deltaspike.properties
+++
b/deltaspike/modules/jpa/impl/src/test/resources/META-INF/apache-deltaspike.properties
@@ -18,7 +18,7 @@
#
# overwriting the original value from bla to blub
-deltaspike.persistence.config.MyUnit.javax.persistence.jdbc.password=blub
+deltaspike.persistence.config.MyUnit.jakarta.persistence.jdbc.password=blub
# and a new config entry
-deltaspike.persistence.config.MyUnit.javax.persistence.jdbc.driver=some.jdbc.Driver
\ No newline at end of file
+deltaspike.persistence.config.MyUnit.jakarta.persistence.jdbc.driver=some.jdbc.Driver
\ No newline at end of file
diff --git
a/deltaspike/modules/jpa/impl/src/test/resources/persistence-MyUnit.properties
b/deltaspike/modules/jpa/impl/src/test/resources/persistence-MyUnit.properties
index ffdab84ad..6a4724f96 100644
---
a/deltaspike/modules/jpa/impl/src/test/resources/persistence-MyUnit.properties
+++
b/deltaspike/modules/jpa/impl/src/test/resources/persistence-MyUnit.properties
@@ -17,5 +17,5 @@
# under the License.
#
-javax.persistence.jdbc.user=sa
-javax.persistence.jdbc.password=bla
\ No newline at end of file
+jakarta.persistence.jdbc.user=sa
+jakarta.persistence.jdbc.password=bla
\ No newline at end of file
diff --git
a/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java
b/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java
index b7e06baca..7b392b6ac 100644
---
a/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java
+++
b/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java
@@ -213,7 +213,9 @@ public class PartialBeanBindingExtension implements
Extension, Deactivatable
{
for (Class interfaceClass : currentClass.getInterfaces())
{
- if (interfaceClass.getName().startsWith("java.") ||
interfaceClass.getName().startsWith("javax."))
+ if (interfaceClass.getName().startsWith("java.")
+ || interfaceClass.getName().startsWith("javax.")
+ || interfaceClass.getName().startsWith("jakarta."))
{
continue;
}
diff --git
a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
index 7b0e1ad92..685699a4c 100644
---
a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
+++
b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
@@ -29,7 +29,7 @@ import jakarta.enterprise.inject.spi.Interceptor;
import org.apache.deltaspike.core.util.interceptor.AbstractInvocationContext;
/**
- * {@link javax.interceptor.InvocationContext} implementation to support
interceptor invocation
+ * {@link jakarta.interceptor.InvocationContext} implementation to support
interceptor invocation
* before proceed with the original method or delegation.
*/
@Typed
diff --git
a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationWrapperException.java
b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationWrapperException.java
index be2e86769..983441fc5 100644
---
a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationWrapperException.java
+++
b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationWrapperException.java
@@ -20,7 +20,7 @@ package org.apache.deltaspike.proxy.spi.invocation;
/**
* Wrapper exception to wrap and pass trough the original {@link Throwable}
because
- * the {@link javax.interceptor.InvocationContext#proceed()} method only
declares "throws Exception".
+ * the {@link jakarta.interceptor.InvocationContext#proceed()} method only
declares "throws Exception".
*/
public class DeltaSpikeProxyInvocationWrapperException extends Exception
{
diff --git
a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoter.java
b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoter.java
index defaa758a..f525e7453 100644
---
a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoter.java
+++
b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoter.java
@@ -37,7 +37,7 @@ import java.util.Set;
public interface AccessDecisionVoter extends Serializable
{
/**
- * Checks the permission for the given {@link
javax.interceptor.InvocationContext}.
+ * Checks the permission for the given {@link
jakarta.interceptor.InvocationContext}.
* If a violation is detected, it should be added to a set which gets
returned by the method.
*
* @param accessDecisionVoterContext current access-decision-voter-context
diff --git
a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoterContext.java
b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoterContext.java
index fc875d57c..6d1755ced 100644
---
a/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoterContext.java
+++
b/deltaspike/modules/security/api/src/main/java/org/apache/deltaspike/security/api/authorization/AccessDecisionVoterContext.java
@@ -41,7 +41,7 @@ public interface AccessDecisionVoterContext
/**
* TODO review it (this method is new)
- * Exposes the source e.g. {@link javax.interceptor.InvocationContext}
+ * Exposes the source e.g. {@link jakarta.interceptor.InvocationContext}
* @return the source which triggered the
*/
<T> T getSource();
diff --git
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java
index affc03352..a342ca5cd 100644
---
a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java
+++
b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java
@@ -129,7 +129,9 @@ public abstract class SecurityUtils
for (Annotation annotation : annotations)
{
annotationName = annotation.annotationType().getName();
- if (annotationName.startsWith("java.") ||
annotationName.startsWith("javax."))
+ if (annotationName.startsWith("java.")
+ || annotationName.startsWith("javax.")
+ || annotationName.startsWith("jakarta."))
{
continue;
}
diff --git
a/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
b/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
index 3af536174..25c3d19f6 100644
---
a/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
+++
b/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
@@ -87,7 +87,7 @@ public class MockedJsf2TestContainer implements
ExternalContainer
containerConfig = new HashMap<String, String>();
for (Map.Entry<String, String> entry :
ConfigResolver.getAllProperties().entrySet())
{
- if (entry.getKey().startsWith("org.apache.myfaces.") ||
entry.getKey().startsWith("javax.faces.") ||
+ if (entry.getKey().startsWith("org.apache.myfaces.") ||
entry.getKey().startsWith("jakarta.faces.") ||
entry.getKey().startsWith("facelets."))
{
containerConfig.put(entry.getKey(), entry.getValue());
diff --git
a/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MyFacesContainerAdapter.java
b/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MyFacesContainerAdapter.java
index 85650f1ab..4aadfed51 100644
---
a/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MyFacesContainerAdapter.java
+++
b/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MyFacesContainerAdapter.java
@@ -109,7 +109,7 @@ public class MyFacesContainerAdapter implements TestAware,
ExternalContainer
containerConfig = new HashMap<String, String>();
for (Map.Entry<String, String> entry :
ConfigResolver.getAllProperties().entrySet())
{
- if (entry.getKey().startsWith("org.apache.myfaces.") ||
entry.getKey().startsWith("javax.faces.") ||
+ if (entry.getKey().startsWith("org.apache.myfaces.") ||
entry.getKey().startsWith("jakarta.faces.") ||
entry.getKey().startsWith("facelets."))
{
containerConfig.put(entry.getKey(), entry.getValue());
diff --git
a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
index 360632b29..be64734c5 100644
---
a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
+++
b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/DefaultMockFilter.java
@@ -41,6 +41,7 @@ public class DefaultMockFilter implements MockFilter
private static final String DS_BASE_PACKAGE = "org.apache.deltaspike.";
private static final String JAVA_BASE_PACKAGE = "java.";
private static final String JAVAX_BASE_PACKAGE = "javax.";
+ private static final String JAKARTA_BASE_PACKAGE = "jakarta.";
private static final String EJB_BASE_PACKAGE = "javax.ejb.";
private static final String OWB_BASE_PACKAGE = "org.apache.webbeans.";
private static final String WELD_BASE_PACKAGE = "org.jboss.weld.";
@@ -154,7 +155,8 @@ public class DefaultMockFilter implements MockFilter
protected boolean isStandardAnnotation(Annotation annotation)
{
return
annotation.annotationType().getName().startsWith(JAVA_BASE_PACKAGE) ||
-
annotation.annotationType().getName().startsWith(JAVAX_BASE_PACKAGE);
+
annotation.annotationType().getName().startsWith(JAVAX_BASE_PACKAGE) ||
+
annotation.annotationType().getName().startsWith(JAKARTA_BASE_PACKAGE);
}
protected boolean isInternalPackage(String packageName)
