diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 18b199739e..7fa0d38e15 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -93,13 +93,6 @@
install-size="0"
version="0.0.0"/>
-
-
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 27d3d82a87..d0568a4cb9 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 7512798c27..a04de95291 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -13,8 +13,12 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.adempiere.install,\
org.restlet,\
org.apache.servicemix.bundles.cglib,\
- com.sun.mail.javax.mail,\
- com.sun.activation.javax.activation,\
+ com.sun.mail.gimap,\
+ com.sun.mail.imap,\
+ com.sun.mail.jakarta.mail,\
+ com.sun.mail.smtp,\
+ jakarta.mail.api,\
+ com.sun.activation.jakarta.activation,\
org.apache.commons.collections,\
org.apache.ant,\
javax.jms,\
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 437704be16..7d437fe28d 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -314,13 +314,6 @@
version="0.0.0"
unpack="false"/>
-
-
+
+
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 16477482fe..c231b1a7be 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -159,7 +159,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
com.itextpdf;bundle-version="0.0.0",
org.atmosphere.runtime;bundle-version="0.0.0",
zkwebfragment,
- com.sun.activation.javax.activation;bundle-version="1.2.0"
+ com.sun.activation.jakarta.activation;bundle-version="1.2.1"
Bundle-Activator: org.adempiere.webui.WebUIActivator
Eclipse-ExtensibleAPI: true
Web-ContextPath: webui
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 5a30d4da4a..1bcbc33a3c 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -31,10 +31,11 @@
2.4
3.2.6
3.1.17
- 1.2.0
- 1.3.2
+ 1.2.1
+ 1.3.3
7.0
2.4.1
+ 1.6.3
@@ -127,13 +128,32 @@
false
- javax.annotation:javax.annotation-api:jar:${annotation.version}
+ jakarta.annotation:jakarta.annotation-api:jar:${annotation.version}
false
-
- com.sun.mail:javax.mail:jar:1.6.2
+ com.sun.mail:jakarta.mail:jar:${javamail.version}
+
+ false
+
+
+ com.sun.mail:smtp:jar:${javamail.version}
+
+ false
+
+
+ com.sun.mail:mailapi:jar:${javamail.version}
+
+ false
+
+
+ com.sun.mail:imap:jar:${javamail.version}
+
+ false
+
+
+ com.sun.mail:gimap:jar:${javamail.version}
false
@@ -414,7 +434,7 @@
- com.sun.activation:javax.activation:jar:${activation.version}
+ com.sun.activation:jakarta.activation:jar:${activation.version}
false
@@ -619,7 +639,7 @@
false
- javax.ws.rs:javax.ws.rs-api:jar:2.1.1
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3
false
@@ -634,7 +654,12 @@
false
- javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1
+ jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3
+
+ false
+
+
+ jakarta.persistence:jakarta.persistence-api:jar:2.2.1
false
@@ -1834,7 +1859,7 @@ it also resolve issue confilic between eclipse runtime and tycho build
- ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar
+ ${url.file.srv}/extra.jar/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar
false
${project.build.directory}/repository/plugins
true
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 7763295307..eaeea91a72 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -431,12 +431,6 @@
-
-
-
-
-
-
@@ -928,10 +922,6 @@
-
-
-
-
@@ -974,8 +964,8 @@
-
-
+
+
@@ -988,12 +978,12 @@
-
-
+
+
-
-
+
+
@@ -1277,27 +1267,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 4301d2754b..72475ada12 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -78,7 +78,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6",
org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17",
org.apache.xmlbeans;bundle-version="3.0.1",
- javax.ws.rs-api;bundle-version="2.1.99",
org.apache.servicemix.bundles.spring-aop,
org.apache.servicemix.bundles.spring-beans,
org.apache.servicemix.bundles.spring-context,
@@ -99,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.glassfish.hk2.api;bundle-version="2.5.0",
org.glassfish.hk2.locator;bundle-version="2.5.0",
org.glassfish.hk2.utils;bundle-version="2.5.0",
- org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1"
+ org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1",
+ javax.ws.rs-api;bundle-version="2.1.3"
Bundle-ClassPath: .,
WEB-INF/lib/idempiere-xmlbeans.jar
Export-Package: org.compiere.model,