This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch unomi-3-dev in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 113b2a18e1f5991e7e0654c52562b8c61fa032eb Merge: 2bc649ce6 f9e9877fc Author: Serge Huber <[email protected]> AuthorDate: Mon Jan 5 15:49:10 2026 +0100 Merge remote-tracking branch 'origin/master' into merge-master-into-unomi-3-dev bom/artifacts/pom.xml | 14 +- distribution/pom.xml | 229 ++++++++++++++++++ distribution/src/main/feature/feature.xml | 128 ++++++++++ docker/README.md | 72 ++++-- docker/src/main/docker/docker-compose-build-es.yml | 5 +- docker/src/main/docker/docker-compose-build-os.yml | 3 +- docker/src/main/docker/docker-compose-es.yml | 5 +- docker/src/main/docker/docker-compose-os.yml | 3 +- docker/src/main/docker/entrypoint.sh | 107 ++++----- extensions/healthcheck/pom.xml | 11 +- .../provider/ElasticSearchHealthCheckProvider.java | 135 ++++++----- .../provider/OpenSearchHealthCheckProvider.java | 150 +++++++----- .../provider/PersistenceEngineHealthProvider.java | 37 --- .../provider/PersistenceHealthCheckProvider.java | 66 ------ .../org.apache.unomi.healthcheck-elasticsearch.cfg | 12 +- ...=> org.apache.unomi.healthcheck-opensearch.cfg} | 9 +- .../test/java/org/apache/unomi/itests/BaseIT.java | 22 +- .../org/apache/unomi/itests/HealthCheckIT.java | 7 +- kar/src/main/feature/feature.xml | 11 +- .../apache/unomi/lifecycle/BundleWatcherImpl.java | 4 +- manual/src/main/asciidoc/5-min-quickstart.adoc | 17 +- manual/src/main/asciidoc/configuration.adoc | 261 +++++++++++++-------- manual/src/main/asciidoc/graphql.adoc | 14 +- .../asciidoc/migrations/migrate-2.x-to-3.0.adoc | 12 +- manual/src/main/asciidoc/shell-commands.adoc | 9 +- manual/src/main/asciidoc/writing-plugins.adoc | 91 +++++-- package/pom.xml | 10 + pom.xml | 1 + src/main/feature/feature.xml | 75 ++++++ tools/shell-commands/pom.xml | 12 +- .../unomi/shell/actions/{Stop.java => Setup.java} | 15 +- .../java/org/apache/unomi/shell/actions/Start.java | 14 +- .../java/org/apache/unomi/shell/actions/Stop.java | 1 - .../shell/services/UnomiManagementService.java | 27 ++- .../UnomiManagementServiceConfiguration.java | 52 ---- .../internal/UnomiManagementServiceImpl.java | 198 +++++++--------- .../unomi/shell/services/internal/UnomiSetup.java | 77 ++++++ .../src/main/resources/org.apache.unomi.start.cfg | 18 -- 38 files changed, 1228 insertions(+), 706 deletions(-) diff --cc bom/artifacts/pom.xml index 047e255bc,ecc78948d..46a432227 --- a/bom/artifacts/pom.xml +++ b/bom/artifacts/pom.xml @@@ -76,6 -66,11 +76,11 @@@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.unomi</groupId> + <artifactId>unomi-persistence-opensearch-core</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> ++<dependency> <groupId>org.apache.unomi</groupId> <artifactId>unomi-persistence-opensearch-conditions</artifactId> <version>${project.version}</version> diff --cc docker/src/main/docker/docker-compose-build-es.yml index 2c75c0f97,454e10364..5e6ca97e1 --- a/docker/src/main/docker/docker-compose-build-es.yml +++ b/docker/src/main/docker/docker-compose-build-es.yml @@@ -34,9 -34,9 +34,10 @@@ services node-1: build: . image: apache/unomi:${project.version} + container_name: unomi environment: - - UNOMI_AUTO_START=elasticsearch + - UNOMI_AUTO_START=true + - UNOMI_DISTRIBUTION=unomi-distribution-elasticsearch - UNOMI_ELASTICSEARCH_ADDRESSES=elasticsearch:9200 # Debug settings - KARAF_DEBUG=${DEBUG:-false} diff --cc docker/src/main/docker/docker-compose-es.yml index 66471c1a0,43f3bbba5..eaefcfd1c --- a/docker/src/main/docker/docker-compose-es.yml +++ b/docker/src/main/docker/docker-compose-es.yml @@@ -40,9 -40,9 +40,10 @@@ services node-1: image: apache/unomi:${project.version} + container_name: unomi environment: - - UNOMI_AUTO_START=elasticsearch + - UNOMI_AUTO_START=true + - UNOMI_DISTRIBUTION=unomi-distribution-elasticsearch - UNOMI_ELASTICSEARCH_ADDRESSES=elasticsearch:9200 # Debug settings - KARAF_DEBUG=${DEBUG:-false} diff --cc manual/src/main/asciidoc/5-min-quickstart.adoc index 37a6b5873,c78e21078..62c562851 --- a/manual/src/main/asciidoc/5-min-quickstart.adoc +++ b/manual/src/main/asciidoc/5-min-quickstart.adoc @@@ -73,9 -73,9 +73,9 @@@ services - 9600:9600 unomi: - image: apache/unomi:3.0.0 + image: apache/unomi:3.1.0 environment: - - UNOMI_AUTO_START=opensearch + - UNOMI_DISTRIBUTION=unomi-distribution-opensearch - UNOMI_OPENSEARCH_ADDRESSES=opensearch-node1:9200 - UNOMI_OPENSEARCH_USERNAME=admin - UNOMI_OPENSEARCH_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD:-admin} diff --cc manual/src/main/asciidoc/configuration.adoc index 460eda76f,4d923ad88..3b8839144 --- a/manual/src/main/asciidoc/configuration.adoc +++ b/manual/src/main/asciidoc/configuration.adoc @@@ -1551,11 -1107,12 +1628,12 @@@ For Docker deployments, you can declar version: '3.8' services: unomi: - image: apache/unomi:3.0.0 + image: apache/unomi:3.1.0 volumes: - - ./custom-start.cfg:/opt/apache-unomi/etc/org.apache.unomi.start.cfg + - ./unomi-custom-distribution-features.xml:/opt/apache-unomi/features/unomi-custom-distribution-features.xml environment: - - UNOMI_AUTO_START=elasticsearch-prod # or opensearch-prod + - KARAF_FEATURES_REPOSITORIES=file:/opt/apache-unomi/features/unomi-custom-distribution-features.xml + - UNOMI_DISTRIBUTION=unomi-distribution-custom depends_on: - elasticsearch elasticsearch: diff --cc package/pom.xml index 758945657,02d045d84..a0a3f90da --- a/package/pom.xml +++ b/package/pom.xml @@@ -356,8 -374,8 +363,11 @@@ <feature>unomi-groovy-actions</feature> <feature>unomi-web-applications</feature> <feature>unomi-rest-ui</feature> - <feature>unomi-distribution-elasticsearch</feature> + <feature>unomi-healthcheck</feature> + <feature>cdp-graphql-feature</feature> ++ ++<feature>unomi-distribution-elasticsearch</feature> + <feature>unomi-distribution-opensearch</feature> </installedFeatures> <javase>17</javase> </configuration>
