diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 337c243424..4a05d56d92 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -47,6 +47,7 @@
+
@@ -113,10 +114,12 @@
+
+
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index 565952672d..2ff13275ea 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -47,6 +47,7 @@
+
@@ -131,10 +132,12 @@
+
+
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 690b740641..9b6f95ef0c 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -48,6 +48,7 @@
+
@@ -131,10 +132,12 @@
+
+
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index 9e34daf031..1594cf600d 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -48,6 +48,7 @@
+
@@ -132,10 +133,12 @@
+
+
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index a86b211ad3..5aa7ec9b3c 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -48,6 +48,7 @@
+
@@ -131,10 +132,12 @@
+
+
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index 05a8e8e415..9d9f110d18 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -45,6 +45,7 @@
+
@@ -115,10 +116,12 @@
+
+
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index ef2dda271a..e02604af15 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -45,6 +45,7 @@
+
@@ -112,10 +113,12 @@
+
+
diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch
index 678731a143..d2389e4a25 100644
--- a/org.adempiere.install/install.silent.app.launch
+++ b/org.adempiere.install/install.silent.app.launch
@@ -45,6 +45,7 @@
+
@@ -112,10 +113,12 @@
+
+
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index cf72d561b5..d5dfea8978 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -119,6 +119,7 @@
+
@@ -258,7 +259,7 @@
-
+
@@ -358,6 +359,7 @@
+
@@ -371,6 +373,7 @@
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 3e8abce8a1..fa333efbf3 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -119,6 +119,7 @@
+
@@ -358,6 +359,7 @@
+
@@ -371,6 +373,7 @@
+
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index c47926f1d1..dfb3ea3a6b 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -102,7 +102,10 @@ osgi.bundles=org.apache.felix.scr@1:start,\
org.osgi.util.promise,\
org.osgi.util.pushstream,\
org.osgi.util.tracker,\
- org.osgi.util.xml
+ org.osgi.util.xml,\
+ org.postgresql.jdbc,\
+ com.zaxxer.HikariCP,\
+ wrapped.com.oracle.database.jdbc.ojdbc10
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4
osgi.compatibility.bootdelegation=true
diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath
index 0dd01a1ded..5508535a40 100755
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -3,7 +3,5 @@
-
-
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index a75fd9f17c..33d19b428e 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Version: 11.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
- org.adempiere.install;bundle-version="0.0.0";resolution:=optional
-Bundle-ClassPath: .,
- lib/HikariCP.jar,
- lib/ojdbc10.jar
+ org.adempiere.install;bundle-version="0.0.0";resolution:=optional,
+ com.zaxxer.HikariCP;bundle-version="5.0.1",
+ wrapped.com.oracle.database.jdbc.ojdbc10;bundle-version="19.16.0"
+Bundle-ClassPath: .
Import-Package: org.osgi.framework,
org.slf4j;version="1.7.2"
Bundle-ActivationPolicy: lazy
diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties
index 05fc296998..593dc60566 100644
--- a/org.compiere.db.oracle.provider/build.properties
+++ b/org.compiere.db.oracle.provider/build.properties
@@ -3,8 +3,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/oracleprovider.xml,\
- OSGI-INF/,\
- lib/ojdbc10.jar,\
- lib/HikariCP.jar
+ OSGI-INF/
source.. = src/
jre.compilation.profile = JavaSE-17
diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml
index ff2675293c..edfa93d50a 100644
--- a/org.compiere.db.oracle.provider/pom.xml
+++ b/org.compiere.db.oracle.provider/pom.xml
@@ -9,39 +9,4 @@
org.compiere.db.oracle.provider
eclipse-plugin
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- validate
-
- copy
-
-
-
-
- com.zaxxer
- HikariCP
- 5.0.1
-
-
- com.oracle.database.jdbc
- ojdbc10
- 19.16.0.0
-
-
- lib
- true
- true
- true
-
-
-
-
-
-
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index 9c48c5fa92..5933dd2d11 100755
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -7,7 +7,5 @@
-
-
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index b98902f8f5..5166e58504 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
Bundle-Version: 11.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
-Bundle-ClassPath: .,
- lib/postgresql.jar,
- lib/HikariCP.jar
+Bundle-ClassPath: .
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
- org.adempiere.install;bundle-version="0.0.0";resolution:=optional
+ org.adempiere.install;bundle-version="0.0.0";resolution:=optional,
+ com.zaxxer.HikariCP;bundle-version="5.0.1",
+ org.postgresql.jdbc;bundle-version="42.6.0"
Import-Package: org.osgi.framework,
org.slf4j;version="1.7.2"
Bundle-ActivationPolicy: lazy
diff --git a/org.compiere.db.postgresql.provider/build.properties b/org.compiere.db.postgresql.provider/build.properties
index 823649b6a2..3439e38840 100644
--- a/org.compiere.db.postgresql.provider/build.properties
+++ b/org.compiere.db.postgresql.provider/build.properties
@@ -3,8 +3,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/pgprovider.xml,\
- OSGI-INF/,\
- lib/postgresql.jar,\
- lib/HikariCP.jar
+ OSGI-INF/
source.. = src/
jre.compilation.profile = JavaSE-17
diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml
index eceaa7ecca..78a7421f83 100644
--- a/org.compiere.db.postgresql.provider/pom.xml
+++ b/org.compiere.db.postgresql.provider/pom.xml
@@ -9,39 +9,4 @@
org.compiere.db.postgresql.provider
eclipse-plugin
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- validate
-
- copy
-
-
-
-
- com.zaxxer
- HikariCP
- 5.0.1
-
-
- org.postgresql
- postgresql
- 42.5.0
-
-
- lib
- true
- true
- true
-
-
-
-
-
-
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index 68a816d183..10b2fb748f 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -31,4 +31,25 @@
version="0.0.0"
unpack="false"/>
+
+
+
+
+
+
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index e0cc723a45..f687b225e1 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1496,4 +1496,29 @@ Export-Package: *;version="${version}";-noimport:=true
4.5.13
jar
+
+
+ com.zaxxer
+ HikariCP
+ 5.0.1
+
+
+ org.postgresql
+ postgresql
+ 42.6.0
+
+
+ com.oracle.database.jdbc
+ ojdbc10
+ 19.21.0.0
+ jar
+
+
+
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
index dbbf48fb2c..93e06ea07c 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
@@ -364,5 +364,8 @@
+
+
+
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index cd5d5b9039..bc624d7d53 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,7 +1,7 @@
-
+
@@ -1642,5 +1642,30 @@ Export-Package: *;version="${version}";-noimport:=true
4.5.13
jar
+
+
+ com.zaxxer
+ HikariCP
+ 5.0.1
+
+
+ org.postgresql
+ postgresql
+ 42.6.0
+
+
+ com.oracle.database.jdbc
+ ojdbc10
+ 19.21.0.0
+ jar
+
+
+
diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch
index f5deb51a37..b7ccd15953 100644
--- a/org.idempiere.test/idempiere.unit.test.launch
+++ b/org.idempiere.test/idempiere.unit.test.launch
@@ -106,6 +106,7 @@
+
@@ -347,6 +348,7 @@
+
@@ -360,6 +362,7 @@
+
diff --git a/org.idempiere.test/idempiere.unit.test.parallel.launch b/org.idempiere.test/idempiere.unit.test.parallel.launch
index 383bce992d..f7a2ae53da 100644
--- a/org.idempiere.test/idempiere.unit.test.parallel.launch
+++ b/org.idempiere.test/idempiere.unit.test.parallel.launch
@@ -106,6 +106,7 @@
+
@@ -347,6 +348,7 @@
+
@@ -360,6 +362,7 @@
+
diff --git a/utils_dev/oomph/idempiere.setup b/utils_dev/oomph/idempiere.setup
index 9cb878a9fb..67321c4649 100755
--- a/utils_dev/oomph/idempiere.setup
+++ b/utils_dev/oomph/idempiere.setup
@@ -10,7 +10,7 @@
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Maven.ecore http://www.eclipse.org/oomph/setup/pde/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore"
- name="idempiere.11.230620"
+ name="idempiere.11.231107"
label="iDempiere 11">