Skip to content

Commit 5d40ad5

Browse files
[timescaledb] Upgrade libraries and make Docker test optional (#20721)
* 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) * Make Docker test optional to avoid failure if Docker is not available * Small adaptions Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 191aca2 commit 5d40ad5

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

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

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

1717
<properties>
18-
<bnd.importpackage>!com.codahale.metrics.*,!io.prometheus.*,!org.checkerframework.*,!org.jetbrains.annotations.*,!org.hibernate.*,!waffle.windows.auth.*,!org.osgi.service.jdbc.*,!com.sun.jna.*,!javassist.*,!com.google.errorprone.annotations.*,!sun.misc.*</bnd.importpackage>
19-
<postgresql.version>42.7.9</postgresql.version>
20-
<hikari.version>5.1.0</hikari.version>
18+
<bnd.importpackage>!io.dropwizard.metrics5.*,!com.codahale.metrics.*,!io.prometheus.*,!org.checkerframework.*,!org.jetbrains.annotations.*,!org.hibernate.*,!waffle.windows.auth.*,!org.osgi.service.jdbc.*,!com.sun.jna.*,!javassist.*,!com.google.errorprone.annotations.*,!sun.misc.*</bnd.importpackage>
19+
<postgresql.version>42.7.11</postgresql.version>
20+
<hikari.version>7.0.2</hikari.version>
2121
</properties>
2222

2323
<dependencies>
@@ -45,13 +45,13 @@
4545
<dependency>
4646
<groupId>org.testcontainers</groupId>
4747
<artifactId>testcontainers-postgresql</artifactId>
48-
<version>2.0.3</version>
48+
<version>2.0.5</version>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.testcontainers</groupId>
5353
<artifactId>testcontainers-junit-jupiter</artifactId>
54-
<version>2.0.3</version>
54+
<version>2.0.5</version>
5555
<scope>test</scope>
5656
</dependency>
5757
<dependency>

bundles/org.openhab.persistence.timescaledb/src/test/java/org/openhab/persistence/timescaledb/internal/TimescaleDBContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
* @author René Ulbricht - Initial contribution
9191
*/
9292
@Tag("integration")
93-
@Testcontainers
93+
@Testcontainers(disabledWithoutDocker = true)
9494
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
9595
@NonNullByDefault({ DefaultLocation.RETURN_TYPE, DefaultLocation.PARAMETER })
9696
@SuppressWarnings("null")

0 commit comments

Comments
 (0)