You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/06/17 11:16:52 UTC
[myfaces] branch 3.0.x updated: jakarta EJB
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new 7fc4332 jakarta EJB
7fc4332 is described below
commit 7fc4332c78c19a122e376a3d4b8b0095320b3a2f
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Jun 17 13:16:43 2020 +0200
jakarta EJB
---
impl/pom.xml | 4 ++--
.../myfaces/config/annotation/AllAnnotationLifecycleProvider.java | 2 +-
.../myfaces/config/annotation/DefaultLifecycleProviderFactory.java | 2 +-
.../org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java | 2 +-
.../apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java | 2 +-
parent/pom.xml | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/impl/pom.xml b/impl/pom.xml
index 8d5b215..6ce85ab 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -1168,8 +1168,8 @@
<!-- ejb 3.0 - needed in AllAnnotationLifecycleProvider -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
index 6e10595..f4162c1 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.config.annotation;
import javax.naming.NamingException;
import javax.naming.Context;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.PersistenceUnit;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
index 6d49f46..9ffb3e8 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
@@ -275,7 +275,7 @@ public class DefaultLifecycleProviderFactory extends LifecycleProviderFactory
context = new InitialContext();
try
{
- ClassUtils.classForName("javax.ejb.EJB");
+ ClassUtils.classForName("jakarta.ejb.EJB");
// Asume full JEE 5 container
return new AllAnnotationLifecycleProvider(context);
}
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
index 82de1c6..24bc3b1 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.spi.impl;
import javax.naming.NamingException;
import javax.naming.Context;
import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.PersistenceUnit;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
index 711bc38..32d80a1 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
@@ -301,7 +301,7 @@ public class DefaultInjectionProviderFactory extends InjectionProviderFactory
context = new InitialContext();
try
{
- ClassUtils.classForName("javax.ejb.EJB");
+ ClassUtils.classForName("jakarta.ejb.EJB");
// Asume full JEE 5 container
return new AllAnnotationInjectionProvider(context);
}
diff --git a/parent/pom.xml b/parent/pom.xml
index da39207..6679392 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -493,9 +493,9 @@
<!-- ejb 3.0 - needed in AllAnnotationLifecycleProvider -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0.1</version>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ <version>4.0.0-RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>