Skip to content

Commit 8aa01f9

Browse files
holgerfriedrichmarkus7017
holgerfriedrich
authored and
markus7017
committed
[jdbc] Upgrade dependencies (openhab#20722)
* [jdbc] Upgrade dependencies * Upgrade postgresql from 42.7.9 to 42.7.11 * Upgrade hikari from 5.1.0 to 7.0.2 (lifting req. to Java 11) * Upgrade mariadb from 5.3.7 to 5.3.8 * Upgrade mysql from 9.5.0 to 9.7.0 * Upgrade sqlite from 3.51.1.0 to 3.53.1.0 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 1890dfd commit 8aa01f9

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎bundles/org.openhab.persistence.jdbc/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ The following databases are currently supported and tested:
1414
| [Apache Derby](https://db.apache.org/derby/) | [derby-10.17.1.0.jar](https://mvnrepository.com/artifact/org.apache.derby/derby) |
1515
| [H2](https://www.h2database.com/) | [h2-2.4.240.jar](https://mvnrepository.com/artifact/com.h2database/h2) |
1616
| [HSQLDB](http://hsqldb.org/) | [hsqldb-2.7.4.jar](https://mvnrepository.com/artifact/org.hsqldb/hsqldb) |
17-
| [MariaDB](https://mariadb.org/) | [mariadb-java-client-3.5.7.jar](https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client) |
18-
| [MySQL](https://www.mysql.com/) | [mysql-connector-j-9.5.0.jar](https://mvnrepository.com/artifact/com.mysql/mysql-connector-j) |
19-
| [PostgreSQL](https://www.postgresql.org/) | [postgresql-42.7.9.jar](https://mvnrepository.com/artifact/org.postgresql/postgresql) |
20-
| [SQLite](https://www.sqlite.org/) | [sqlite-jdbc-3.51.1.0.jar](https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc) |
21-
| [TimescaleDB](https://www.timescale.com/) | [postgresql-42.7.9.jar](https://mvnrepository.com/artifact/org.postgresql/postgresql) |
17+
| [MariaDB](https://mariadb.org/) | [mariadb-java-client-3.5.8.jar](https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client) |
18+
| [MySQL](https://www.mysql.com/) | [mysql-connector-j-9.7.0.jar](https://mvnrepository.com/artifact/com.mysql/mysql-connector-j) |
19+
| [PostgreSQL](https://www.postgresql.org/) | [postgresql-42.7.11.jar](https://mvnrepository.com/artifact/org.postgresql/postgresql) |
20+
| [SQLite](https://www.sqlite.org/) | [sqlite-jdbc-3.53.1.0.jar](https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc) |
21+
| [TimescaleDB](https://www.timescale.com/) | [postgresql-42.7.11.jar](https://mvnrepository.com/artifact/org.postgresql/postgresql) |
2222
| [OracleDB](https://www.oracle.com/database/) | [com.oracle.database.jdbc.ojdbc11-23.5.0.2407.jar](https://mvnrepository.com/artifact/org.openhab.osgiify/com.oracle.database.jdbc.ojdbc11) |
2323

2424
## Table of Contents

‎bundles/org.openhab.persistence.jdbc/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<name>openHAB Add-ons :: Bundles :: Persistence Service :: JDBC</name>
1616

1717
<properties>
18-
<bnd.importpackage>!org.osgi.service.jdbc.*,!sun.security.*,!org.apache.lucene.*,!org.apache.logging.log4j,!waffle.windows.auth.*,!org.hibernate.*,!org.jboss.*,!org.codehaus.groovy.*,!com.codahale.metrics.*,!com.google.protobuf.*,!com.ibm.db2.jcc,!com.ibm.icu.*,!com.ibm.jvm.*,!com.mchange.*,!com.sun.*,!com.vividsolutions.*,!io.prometheus.*,com.mysql.*;resolution:=optional,org.apache.derby.*;resolution:=optional,org.h2.*;resolution:=optional,org.hsqldb;resolution:=optional,org.hsqldb.jdbc;resolution:=optional,org.mariadb.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.sqlite;resolution:=optional,org.sqlite.jdbc4;resolution:=optional,oracle.*;resolution:=optional,javassist*;resolution:=optional</bnd.importpackage>
18+
<bnd.importpackage>!io.dropwizard.metrics5.*,!org.osgi.service.jdbc.*,!sun.security.*,!org.apache.lucene.*,!org.apache.logging.log4j,!waffle.windows.auth.*,!org.hibernate.*,!org.jboss.*,!org.codehaus.groovy.*,!com.codahale.metrics.*,!com.google.protobuf.*,!com.ibm.db2.jcc,!com.ibm.icu.*,!com.ibm.jvm.*,!com.mchange.*,!com.sun.*,!com.vividsolutions.*,!io.prometheus.*,com.mysql.*;resolution:=optional,org.apache.derby.*;resolution:=optional,org.h2.*;resolution:=optional,org.hsqldb;resolution:=optional,org.hsqldb.jdbc;resolution:=optional,org.mariadb.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.sqlite;resolution:=optional,org.sqlite.jdbc4;resolution:=optional,oracle.*;resolution:=optional,javassist*;resolution:=optional</bnd.importpackage>
1919
<dep.noembedding>derby,h2,hsqldb,mariadb-java-client,mysql-connector-j,postgresql,sqlite-jdbc,com.oracle.database.jdbc.ojdbc11</dep.noembedding>
2020

2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23-
<hikari.version>5.1.0</hikari.version>
23+
<hikari.version>7.0.2</hikari.version>
2424
<!-- updating dbutils beyond 1.6 is causing issues, see #18821 -->
2525
<dbutils.version>1.6</dbutils.version>
2626
<yank.version>3.5.0</yank.version>
@@ -29,10 +29,10 @@
2929
<derby.version>10.17.1.0</derby.version>
3030
<h2.version>2.4.240</h2.version>
3131
<hsqldb.version>2.7.4</hsqldb.version>
32-
<mariadb.version>3.5.7</mariadb.version>
33-
<mysql.version>9.5.0</mysql.version>
34-
<postgresql.version>42.7.9</postgresql.version>
35-
<sqlite.version>3.51.1.0</sqlite.version>
32+
<mariadb.version>3.5.8</mariadb.version>
33+
<mysql.version>9.7.0</mysql.version>
34+
<postgresql.version>42.7.11</postgresql.version>
35+
<sqlite.version>3.53.1.0</sqlite.version>
3636
<oracle.version>23.5.0.2407</oracle.version>
3737
</properties>
3838

‎bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,28 @@
2929
<feature name="openhab-persistence-jdbc-mariadb" description="JDBC Persistence MariaDB" version="${project.version}">
3030
<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
3131
<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
32-
<bundle start-level="80">mvn:org.mariadb.jdbc/mariadb-java-client/3.5.7</bundle>
32+
<bundle start-level="80">mvn:org.mariadb.jdbc/mariadb-java-client/3.5.8</bundle>
3333
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
3434
</feature>
3535

3636
<feature name="openhab-persistence-jdbc-mysql" description="JDBC Persistence MySQL" version="${project.version}">
3737
<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
3838
<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
39-
<bundle start-level="80">mvn:com.mysql/mysql-connector-j/9.5.0</bundle>
39+
<bundle start-level="80">mvn:com.mysql/mysql-connector-j/9.7.0</bundle>
4040
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
4141
</feature>
4242

4343
<feature name="openhab-persistence-jdbc-postgresql" description="JDBC Persistence PostgreSQL" version="${project.version}">
4444
<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
4545
<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
46-
<bundle start-level="80">mvn:org.postgresql/postgresql/42.7.9</bundle>
46+
<bundle start-level="80">mvn:org.postgresql/postgresql/42.7.11</bundle>
4747
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
4848
</feature>
4949

5050
<feature name="openhab-persistence-jdbc-sqlite" description="JDBC Persistence SQLite" version="${project.version}">
5151
<configfile finalname="${openhab.conf}/services/jdbc.cfg" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc</configfile>
5252
<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
53-
<bundle start-level="80">mvn:org.xerial/sqlite-jdbc/3.51.1.0</bundle>
53+
<bundle start-level="80">mvn:org.xerial/sqlite-jdbc/3.53.1.0</bundle>
5454
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
5555
</feature>
5656

‎bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,16 +330,16 @@ private void testJDBCDriver(String driver) {
330330
warn += "\tHSQLDB: version >= 2.7.4 from https://mvnrepository.com/artifact/org.hsqldb/hsqldb\n";
331331
break;
332332
case "mariadb":
333-
warn += "\tMariaDB: version >= 3.5.7 from https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client\n";
333+
warn += "\tMariaDB: version >= 3.5.8 from https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client\n";
334334
break;
335335
case "mysql":
336-
warn += "\tMySQL: version >= 9.5.0 from https://mvnrepository.com/artifact/com.mysql/mysql-connector-j\n";
336+
warn += "\tMySQL: version >= 9.7.0 from https://mvnrepository.com/artifact/com.mysql/mysql-connector-j\n";
337337
break;
338338
case "postgresql":
339-
warn += "\tPostgreSQL:version >= 42.7.9 from https://mvnrepository.com/artifact/org.postgresql/postgresql\n";
339+
warn += "\tPostgreSQL:version >= 42.7.11 from https://mvnrepository.com/artifact/org.postgresql/postgresql\n";
340340
break;
341341
case "sqlite":
342-
warn += "\tSQLite: version >= 3.51.1.0 from https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc\n";
342+
warn += "\tSQLite: version >= 3.53.1.0 from https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc\n";
343343
break;
344344
case "oracle":
345345
warn += "\tOracle: version >= 23.5.0.0 from https://mvnrepository.com/artifact/org.openhab.osgiify/com.oracle.database.jdbc.ojdbc11\n";

0 commit comments

Comments
 (0)