You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/10/13 07:30:56 UTC
[karaf] branch main updated: [KARAF-7574] Upgrade to jakarta.el-api 3.0.3
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 423a721a04 [KARAF-7574] Upgrade to jakarta.el-api 3.0.3
new 5e708feef4 Merge pull request #1647 from jbonofre/KARAF-7574
423a721a04 is described below
commit 423a721a045a94fa29b428adc608483d393fff3e
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Oct 12 11:15:09 2022 +0200
[KARAF-7574] Upgrade to jakarta.el-api 3.0.3
---
assemblies/features/enterprise/src/main/feature/feature.xml | 2 +-
itests/test/src/test/java/org/apache/karaf/itests/JtaTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index ca389ddc90..44b1f2a85c 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -33,7 +33,7 @@
<feature name="transaction-api" version="1.2.0">
<bundle dependency="true">mvn:javax.interceptor/javax.interceptor-api/1.2.2</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_3</bundle>
- <bundle dependency="true">mvn:javax.el/javax.el-api/3.0.0</bundle>
+ <bundle dependency="true">mvn:jakarta.el/jakarta.el-api/3.0.3</bundle>
<bundle dependency="true">mvn:javax.enterprise/cdi-api/1.2</bundle>
<bundle>mvn:javax.transaction/javax.transaction-api/1.2</bundle>
<feature>pax-transx-tm-api</feature>
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/JtaTest.java b/itests/test/src/test/java/org/apache/karaf/itests/JtaTest.java
index a8f0e3e341..b1511c33ca 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/JtaTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/JtaTest.java
@@ -192,7 +192,7 @@ public class JtaTest extends BaseTest {
// of javax.transaction-api/1.2
bundleContext.installBundle("mvn:javax.interceptor/javax.interceptor-api/1.2");
bundleContext.installBundle("mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2");
- bundleContext.installBundle("mvn:javax.el/javax.el-api/3.0.0");
+ bundleContext.installBundle("mvn:jakarta.el/jakarta.el-api/3.0.3");
bundleContext.installBundle("mvn:javax.enterprise/cdi-api/1.2");
// this bundle doesn't have Require-Bundle: system.bundle, but javax.transaction package (the 3 exception
// classes provided by JDK8) is still bootdelegated by Karaf