diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 790782fdff..26098cebe3 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -351,13 +351,6 @@
version="0.0.0"
unpack="false"/>
-
-
+
+
diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 213fe3ccc9..92519e6a46 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index 3b416a2547..99cae03665 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index f9f5fa65ce..e16fcc8624 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index bc231f8dd0..81c8e223e6 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index d164700bb7..161f2f3ad9 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index 436c7c6d48..59ed8e5772 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -24,7 +24,7 @@
-
+
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 73cf7a940b..addecca52c 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -24,7 +24,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 29f4e1baa4..50f794609b 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 9077da2154..555d81ae77 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index e6036ab506..f5b54b17f4 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -370,40 +370,12 @@
version="0.0.0"
unpack="false"/>
-
-
-
-
-
-
-
-
+
+
+
+
-
+
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 caeba240f8..337367352a 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
@@ -10,7 +10,7 @@
org.idempiere.maven.to.p2
pom
- https://sourceforge.net/project/zk1/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip
+ https://iweb.dl.sourceforge.net/project/zk1/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip
9.4.14.v20181114
1.1.3.v20160715
@@ -26,7 +26,7 @@
5.0.3
20171018
1.7.25
- 2.3.1
+ 2.3.2
2.4
3.2.6
3.1.17
@@ -427,12 +427,15 @@
+
com.sun.activation:jakarta.activation:jar:${activation.version}
false
- javax.xml.bind:jaxb-api:jar:${xml.ws.version}
+
+ jakarta.xml.bind:jakarta.xml.bind-api:jar:${xml.ws.version}
false
@@ -452,34 +455,10 @@
false
- javax.xml.ws:jaxws-api:jar:${xml.ws.version}
+
+ com.sun.xml.bind:jaxb-osgi:jar:${xml.ws.version}
false
- true
-
- jaxws-api
- ${xml.ws.version}
-
- javax.xml.ws;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.bind.anno
- tation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,j
- avax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom",javax.xml.ws.handl
- er;version="${xml.ws.export.version}";uses:="javax.xml.namespace,javax.xml.ws",javax.xml.ws.handler.soap
- ;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.w
- s.handler",javax.xml.ws.http;version="${xml.ws.export.version}";uses:="javax.xml.ws",javax.xml.ws.soap;version="${xml.ws.export.version}";u
- ses:="javax.xml.soap,javax.xml.ws,javax.xml.ws.spi",javax.xml.ws.spi;version="${xml.ws.export.version}";
- uses:="javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.x
- ml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom",jav
- ax.xml.ws.spi.http;version="${xml.ws.export.version}",javax.xml.ws.wsaddressing;version="${xml.ws.export.version}";uses:="javax.xml.bind.an
- notation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c
- .dom"
-
- org.glassfish.hk2.osgiresourcelocator
-
- javax.xml.bind;version="[2.3,3)",javax.xml.bind.annota
- tion;version="[2.3,3)",javax.xml.namespace,javax.xml.soap;version="[1
- .4,2)",javax.xml.transform,javax.xml.transform.stream,org.w3c.dom
- osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9.0))"
-
javax.interceptor:javax.interceptor-api:jar:1.2.2
@@ -632,12 +611,13 @@
false
- jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.5
false
- javax.jws:javax.jws-api:jar:1.1
+
+ jakarta.jws:jakarta.jws-api:jar:1.1.1
false
@@ -647,12 +627,14 @@
false
+
jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3
false
- jakarta.persistence:jakarta.persistence-api:jar:2.2.1
+
+ jakarta.persistence:jakarta.persistence-api:jar:2.2.2
false
@@ -797,24 +779,7 @@
org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}
- false
-
+ falses
org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 72f3694b64..6b66fec459 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,4 +1,4 @@
-
+
@@ -879,6 +879,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -934,10 +981,12 @@
-
-
-
-
+
+
+
+
+
+
@@ -974,36 +1023,34 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -1113,6 +1160,7 @@
+
@@ -1301,54 +1349,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index b436dc804c..28db788636 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -88,10 +88,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.springframework.spring-jcl;bundle-version="5.1.1",
org.apache.servicemix.bundles.spring-web,
org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17",
- javax.xml.soap-api;bundle-version="1.4.0",
org.apache.axis;bundle-version="1.4.0",
javax.xml.soap;bundle-version="1.3.0",
- jaxws-api;bundle-version="2.3.1",
javax.annotation-api;bundle-version="1.3.2",
org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1",
org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6",
@@ -100,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.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",
- javax.ws.rs-api;bundle-version="2.1.3"
+ jakarta.ws.rs-api;bundle-version="2.1.5",
+ jakarta.xml.ws-api;bundle-version="2.3.2"
Bundle-ClassPath: .,
WEB-INF/lib/idempiere-xmlbeans.jar
Export-Package: org.compiere.model,