From cf53c61ed77328ebe5dfa09ecd642cc2e7e204b7 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 31 Mar 2025 20:18:19 +0200
Subject: [PATCH] [jdbc] Upgrade Yank to 3.5.0 (#18472)

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 bundles/org.openhab.persistence.jdbc/pom.xml                | 6 +++---
 .../persistence/jdbc/internal/JdbcPersistenceService.java   | 2 +-
 .../openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java   | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.persistence.jdbc/pom.xml b/bundles/org.openhab.persistence.jdbc/pom.xml
index ab90633cb22..e2f9a2d3d98 100644
--- a/bundles/org.openhab.persistence.jdbc/pom.xml
+++ b/bundles/org.openhab.persistence.jdbc/pom.xml
@@ -20,9 +20,9 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <hikari.version>2.4.7</hikari.version>
-    <dbutils.version>1.6</dbutils.version>
-    <yank.version>3.4.0</yank.version>
+    <hikari.version>5.1.0</hikari.version>
+    <dbutils.version>1.8.1</dbutils.version>
+    <yank.version>3.5.0</yank.version>
 
     <!-- JDBC database driver versions -->
     <derby.version>10.17.1.0</derby.version>
diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
index 86bb3ee79a1..f92ef15a943 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
@@ -266,7 +266,7 @@ public class JdbcPersistenceService extends JdbcMapper implements ModifiablePers
         }
     }
 
-    public void updateConfig(Map<Object, Object> configuration) {
+    private void updateConfig(Map<Object, Object> configuration) {
         logger.debug("JDBC::updateConfig");
 
         conf = new JdbcConfiguration(configuration);
diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java
index 8b43c7468e5..970c5cfde59 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java
@@ -247,7 +247,9 @@ public class JdbcBaseDAO {
     }
 
     public Properties getConnectionProperties() {
-        return new Properties(this.databaseProps);
+        Properties properties = new Properties(databaseProps.size());
+        properties.putAll(databaseProps);
+        return properties;
     }
 
     /**************