Skip to content

Commit 099b845

Browse files
authored
Update derby (openhab#18292)
Signed-off-by: Leo Siepel <[email protected]>
1 parent d3b3db3 commit 099b845

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The following databases are currently supported and tested:
1111

1212
| Database | Tested Driver / Version |
1313
| -------------------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------|
14-
| [Apache Derby](https://db.apache.org/derby/) | [derby-10.14.2.0.jar](https://mvnrepository.com/artifact/org.apache.derby/derby) |
14+
| [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.2.224.jar](https://mvnrepository.com/artifact/com.h2database/h2) |
1616
| [HSQLDB](http://hsqldb.org/) | [hsqldb-2.3.3.jar](https://mvnrepository.com/artifact/org.hsqldb/hsqldb) |
1717
| [MariaDB](https://mariadb.org/) | [mariadb-java-client-3.0.8.jar](https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client) |

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
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.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>!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>
@@ -25,7 +25,7 @@
2525
<yank.version>3.4.0</yank.version>
2626

2727
<!-- JDBC database driver versions -->
28-
<derby.version>10.14.2.0</derby.version>
28+
<derby.version>10.17.1.0</derby.version>
2929
<h2.version>2.2.224</h2.version>
3030
<hsqldb.version>2.3.3</hsqldb.version>
3131
<mariadb.version>3.0.8</mariadb.version>
@@ -64,6 +64,11 @@
6464
<artifactId>derby</artifactId>
6565
<version>${derby.version}</version>
6666
</dependency>
67+
<dependency>
68+
<groupId>org.apache.derby</groupId>
69+
<artifactId>derbytools</artifactId>
70+
<version>${derby.version}</version>
71+
</dependency>
6772
<dependency>
6873
<groupId>com.h2database</groupId>
6974
<artifactId>h2</artifactId>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<feature name="openhab-persistence-jdbc-derby" description="JDBC Persistence Apache Derby" version="${project.version}">
99
<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>
1010
<feature prerequisite="false" dependency="false">openhab-runtime-base</feature>
11-
<bundle start-level="80">mvn:org.apache.derby/derby/10.14.2.0</bundle>
11+
<bundle start-level="80">mvn:org.apache.derby/derby/10.17.1.0</bundle>
1212
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}</bundle>
1313
</feature>
1414

0 commit comments

Comments
 (0)