Skip to content

Commit 0d25391

Browse files
holgerfriedricholemr
authored andcommitted
[mongodb] Upgrade dependencies (openhab#20725)
* Upgrade mongodb-client from 4.11.1 to 5.4. * Upgrade test dependencies and helper libraries. Not that this upgrade lifts the minmum database version to 4.0. Signed-off-by: Holger Friedrich <mail@holger-friedrich.de> Signed-off-by: olemr <olemr@olemr.com>
1 parent 0259780 commit 0d25391

2 files changed

Lines changed: 16 additions & 11 deletions

File tree

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

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

1717
<properties>
18-
<bnd.importpackage>!sun.nio.ch;!org.bson.codecs.kotlin*;!jnr.unixsocket*;!javax.annotation*;!com.google*;!io.netty*;com.oracle*;resolution:=optional;com.aayushatharva*;resolution:=optional;com.mongodb.crypt*;resolution:=optional;com.amazon*;resolution:=optional;software.amazon*;resolution:=optional</bnd.importpackage>
18+
<bnd.importpackage>!sun.nio.ch;!org.bson.codecs.kotlin*;!jnr.unixsocket*;!javax.annotation*;!com.google*;!io.netty*;com.oracle*;resolution:=optional;com.aayushatharva*;resolution:=optional;com.mongodb.crypt*;resolution:=optional;com.mongodb.internal.crypt*;resolution:=optional;com.amazon*;resolution:=optional;software.amazon*;resolution:=optional</bnd.importpackage>
19+
<!-- driver >5.4.x requires mongodb 4.2 / wire 8 interface which cannot be provided
20+
by mongo-java-server test framework (only used when Docker is unavailable)
21+
-->
22+
<mongodb.version>5.4.0</mongodb.version>
1923
</properties>
2024

2125
<dependencies>
2226
<dependency>
2327
<groupId>org.mongodb</groupId>
2428
<artifactId>mongodb-driver-sync</artifactId>
25-
<version>4.11.1</version>
29+
<version>${mongodb.version}</version>
2630
<scope>compile</scope>
2731
</dependency>
2832
<dependency>
2933
<groupId>org.mongodb</groupId>
3034
<artifactId>bson</artifactId>
31-
<version>4.11.1</version>
35+
<version>${mongodb.version}</version>
3236
<scope>compile</scope>
3337
</dependency>
3438
<dependency>
3539
<groupId>org.mongodb</groupId>
3640
<artifactId>mongodb-driver-core</artifactId>
37-
<version>4.11.1</version>
41+
<version>${mongodb.version}</version>
3842
<scope>compile</scope>
3943
</dependency>
4044
<dependency>
4145
<groupId>org.xerial.snappy</groupId>
4246
<artifactId>snappy-java</artifactId>
43-
<version>1.1.10.3</version>
47+
<version>1.1.10.8</version>
4448
<scope>compile</scope>
4549
</dependency>
4650
<dependency>
4751
<groupId>com.github.luben</groupId>
4852
<artifactId>zstd-jni</artifactId>
49-
<version>1.5.5-3</version>
53+
<version>1.5.7-8</version>
5054
<scope>compile</scope>
5155
</dependency>
5256
<dependency>
5357
<groupId>org.mongodb</groupId>
5458
<artifactId>bson-record-codec</artifactId>
55-
<version>4.11.1</version>
59+
<version>${mongodb.version}</version>
5660
<scope>compile</scope>
5761
</dependency>
5862

5963
<!-- Test dependencies -->
6064
<dependency>
6165
<groupId>de.bwaldvogel</groupId>
6266
<artifactId>mongo-java-server</artifactId>
63-
<version>1.44.0</version>
67+
<!-- going beyond 1.46.x requires netty >= 4.2 -->
68+
<version>1.46.0</version>
6469
<scope>test</scope>
6570
</dependency>
6671
<dependency>
6772
<groupId>org.testcontainers</groupId>
6873
<artifactId>mongodb</artifactId>
69-
<version>1.19.4</version>
74+
<version>1.21.4</version>
7075
<scope>test</scope>
7176
</dependency>
7277
<dependency>
7378
<groupId>org.apache.commons</groupId>
7479
<artifactId>commons-lang3</artifactId>
75-
<version>3.14.0</version>
80+
<version>3.20.0</version>
7681
<scope>test</scope>
7782
</dependency>
7883
</dependencies>

bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public static Stream<Arguments> provideDatabaseBackends() {
264264
// Create a DatabaseTestContainer with a MemoryBackend
265265
Arguments.of(new DatabaseTestContainer(new MemoryBackend())),
266266
// Create DatabaseTestContainers with MongoDBContainers of specific versions
267-
Arguments.of(new DatabaseTestContainer("mongo:3.6")),
267+
Arguments.of(new DatabaseTestContainer("mongo:4.0")),
268268
Arguments.of(new DatabaseTestContainer("mongo:4.4")),
269269
Arguments.of(new DatabaseTestContainer("mongo:5.0")),
270270
Arguments.of(new DatabaseTestContainer("mongo:6.0")));

0 commit comments

Comments
 (0)