From cb394cade4192c22755e22ae39a7289c57fd196f Mon Sep 17 00:00:00 2001 From: Kai Hudalla Date: Sat, 7 Oct 2023 12:43:00 +0200 Subject: [PATCH] [#3540] Use Mongo 6.0 by default Unit and integration tests have been changed to use Mongo 6.0 by default. CI workflow has been adapted to test against Mongo versions 4.4, 5.0, 6.0 and 7.0. Support for Mongo 4.4 has been deprecated. Fixes #3540 --- .github/workflows/ci.yml | 13 +++++++++---- bom/pom.xml | 2 +- .../mongodb/service/MongoDbTestUtils.java | 4 ++-- .../admin-guide/mongodb-device-registry-config.md | 7 +++++-- site/homepage/content/release-notes.md | 10 ++++++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2a7267067..eaff288fec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation +# Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -24,20 +24,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - device-registry-name: [file,jdbc,mongodb-4.4,mongodb-5.0,mongodb-6.0] + device-registry-name: [file,jdbc,mongodb-4.4,mongodb-5.0,mongodb-6.0,mongodb-7.0] include: # Use Quarkus JVM images: file registry, AMQP messaging, Command Router with embedded cache - device-registry-name: file device-registry: file commandrouting-cache: embedded messaging-type: amqp - mongodb-image-name: mongo:4.4 + mongodb-image-name: mongo:6.0 # Use Quarkus JVM images: jdbc registry, Kafka messaging, Command Router with embedded cache - device-registry-name: jdbc device-registry: jdbc commandrouting-cache: embedded messaging-type: kafka - mongodb-image-name: mongo:4.4 + mongodb-image-name: mongo:6.0 # Use Quarkus JVM images: mongodb registry Kafka messaging, Command Router with data grid - device-registry-name: mongodb-4.4 device-registry: mongodb @@ -54,6 +54,11 @@ jobs: commandrouting-cache: server messaging-type: kafka mongodb-image-name: mongo:6.0 + - device-registry-name: mongodb-7.0 + device-registry: mongodb + commandrouting-cache: server + messaging-type: kafka + mongodb-image-name: mongo:7.0 name: "Use ${{ matrix.device-registry-name }} registry, ${{ matrix.messaging-type }} messaging with ${{ matrix.commandrouting-cache }} cache" steps: diff --git a/bom/pom.xml b/bom/pom.xml index 0e2ec24fb8..c4ad24f76f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ 3.3.2 docker.io/confluentinc/cp-kafka:7.3.5 1.2.11 - docker.io/library/mongo:4.4 + docker.io/library/mongo:6.0 quay.io/quarkus/quarkus-micro-image:2.0 mandrel 4.1.94.Final diff --git a/services/device-registry-mongodb/src/test/java/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbTestUtils.java b/services/device-registry-mongodb/src/test/java/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbTestUtils.java index b20cc0e238..fea8b3455b 100644 --- a/services/device-registry-mongodb/src/test/java/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbTestUtils.java +++ b/services/device-registry-mongodb/src/test/java/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbTestUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation + * Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -33,7 +33,7 @@ public final class MongoDbTestUtils { private static final MongoDBContainer MONGO_DB_CONTAINER; - private static final String MONGO_DB_IMAGE_NAME = System.getProperty("mongoDbImageName", "mongo:4.4"); + private static final String MONGO_DB_IMAGE_NAME = System.getProperty("mongoDbImageName", "mongo:6.0"); private static final Logger LOG = LoggerFactory.getLogger(MongoDbTestUtils.class); static { diff --git a/site/documentation/content/admin-guide/mongodb-device-registry-config.md b/site/documentation/content/admin-guide/mongodb-device-registry-config.md index 3dd70db913..32136274cc 100644 --- a/site/documentation/content/admin-guide/mongodb-device-registry-config.md +++ b/site/documentation/content/admin-guide/mongodb-device-registry-config.md @@ -21,9 +21,12 @@ The registry is compatible and known to work with following MongoDB versions: * [MongoDB 4.4](https://www.mongodb.com/docs/v4.4/release-notes/4.4/) * [MongoDB 5.0](https://www.mongodb.com/docs/v5.0/release-notes/5.0/) * [MongoDB 6.0](https://www.mongodb.com/docs/v6.0/release-notes/6.0/) +* [MongoDB 7.0](https://www.mongodb.com/docs/v7.0/release-notes/7.0/) -{{% notice info %}} -The registry had originally been implemented as a Spring Boot application. That variant has been removed in Hono 2.0.0. +{{% notice warning %}} +According to the [Mongo DB Software Lifecycle Schedule](https://www.mongodb.com/support-policy/lifecycles) support +for Mongo DB 4.4 will end Feb 2024. Consequently, support for Mongo 4.4 in Hono has been deprecated and will be removed +in a future version altogether. Users are encouraged to migrate to Mongo DB 6.0 or later. {{% /notice %}} ## Service Configuration diff --git a/site/homepage/content/release-notes.md b/site/homepage/content/release-notes.md index 4f921b2509..78ecebe2cf 100644 --- a/site/homepage/content/release-notes.md +++ b/site/homepage/content/release-notes.md @@ -4,6 +4,16 @@ title = "What is new & noteworthy in Hono?" description = "Information about changes in recent Hono releases. Includes new features, fixes, enhancements and API changes." +++ +## 2.5.0 (not released yet) + +### Deprecations + +* According to the [Mongo DB Software Lifecycle Schedule](https://www.mongodb.com/support-policy/lifecycles) support + for Mongo DB 4.4 will end Feb 2024. + Until that date the Mongo based Device Registry will be tested with MongoDB 4.4, 5.0, 6.0 and 7.0 in the CI workflows. + However, support for Mongo 4.4 in Hono has been deprecated and will be removed in a future version altogether. + Users are encouraged to migrate to Mongo DB 6.0 or later. + ## 2.4.0 ### New features