From ce5edc84fdb274c3b91fb5f654bc8b40f890a575 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Thu, 28 Dec 2023 15:02:44 +0100
Subject: [PATCH] IDEMPIERE-5969 Upgrade DB libraries (#2163)

* IDEMPIERE-5969 Upgrade DB libraries

- postgresql 42.6.0 -> 42.7.1 (Dec 06, 2023)
- hikaricp 5.0.1 -> 5.1.0 (Nov 04, 2023)

* - update utils_dev/oomph/idempiere.setup
---
 org.compiere.db.oracle.provider/META-INF/MANIFEST.MF       | 4 ++--
 org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF   | 4 ++--
 org.idempiere.p2.targetplatform/maven.locations.xml        | 4 ++--
 .../org.idempiere.p2.targetplatform.target                 | 7 ++++---
 utils_dev/oomph/idempiere.setup                            | 6 +++---
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 33d19b428e..62883e0d96 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ 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,
- com.zaxxer.HikariCP;bundle-version="5.0.1",
- wrapped.com.oracle.database.jdbc.ojdbc10;bundle-version="19.16.0"
+ com.zaxxer.HikariCP;bundle-version="5.1.0",
+ wrapped.com.oracle.database.jdbc.ojdbc10;bundle-version="19.21.0.0"
 Bundle-ClassPath: .
 Import-Package: org.osgi.framework,
  org.slf4j;version="1.7.2"
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 5166e58504..ffcbceb03a 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
 Bundle-ClassPath: .
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  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"
+ com.zaxxer.HikariCP;bundle-version="5.1.0",
+ org.postgresql.jdbc;bundle-version="42.7.1"
 Import-Package: org.osgi.framework,
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index f687b225e1..ee4fe3efbb 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1500,12 +1500,12 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="error" type="Maven">
 		<groupId>com.zaxxer</groupId>
 	    <artifactId>HikariCP</artifactId>
-	    <version>5.0.1</version>
+	    <version>5.1.0</version>
 	</location>
 	<location includeSource="true" missingManifest="error" type="Maven">
 	    <groupId>org.postgresql</groupId>
     	<artifactId>postgresql</artifactId>
-    	<version>42.6.0</version>
+    	<version>42.7.1</version>
     </location>
     <location includeSource="true" missingManifest="generate" type="Maven">
     	<groupId>com.oracle.database.jdbc</groupId>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index bc624d7d53..345c07452d 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="idempiere-231107" sequenceNumber="1688978989">
+<!-- when changing target name please change accordingly in the file utils_dev/oomph/idempiere.setup -->
+<target name="idempiere-231227" sequenceNumber="1688978990">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="zcommon" version="9.6.4"/>
@@ -1646,12 +1647,12 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="error" type="Maven">
 		<groupId>com.zaxxer</groupId>
 	    <artifactId>HikariCP</artifactId>
-	    <version>5.0.1</version>
+	    <version>5.1.0</version>
 	</location>
 	<location includeSource="true" missingManifest="error" type="Maven">
 	    <groupId>org.postgresql</groupId>
     	<artifactId>postgresql</artifactId>
-    	<version>42.6.0</version>
+    	<version>42.7.1</version>
     </location>
         <location includeSource="true" missingManifest="generate" type="Maven">
     	<groupId>com.oracle.database.jdbc</groupId>
diff --git a/utils_dev/oomph/idempiere.setup b/utils_dev/oomph/idempiere.setup
index 67321c4649..963f25b52a 100755
--- a/utils_dev/oomph/idempiere.setup
+++ b/utils_dev/oomph/idempiere.setup
@@ -10,8 +10,8 @@
     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.231107"
-    label="iDempiere 11">
+    name="idempiere.12.231227"
+    label="iDempiere 12">
   <setupTask
       xsi:type="setup:PreferenceTask"
       key="/instance/org.eclipse.oomph.setup.ui/preference.recorder.target"
@@ -26,7 +26,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="idempiere.target.platform"
-      defaultValue="idempiere-231107"
+      defaultValue="idempiere-231227"
       storageURI="scope://Workspace"
       label="Target Platform"/>
   <setupTask